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