A bit of misc cleanup.