[forge-commits] [forge/core] 220b66: Minor refactoring