Minor cleanup before cogs stage.