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