[forge-commits] [forge/core] 408393: Minor refactoring