[forge-commits] [forge/core] eabda5: Minor cleanup