[forge-commits] [forge/core] 3a9b8f: Minor refactoring