A bit of this and that. Mostly cleanups.