Minor cleanup of some messy bits.