Mostly OCD fixes.