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