A bit of cleanup before merge