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