[forge-commits] [forge/roaster] 1f3cdd: Minor refactoring