[forge-commits] [forge/core] 72c83d: Minor refactoring