[forge-commits] [forge/core] 77a551: Minor refactoring