Tiny tweaks, mainly cleanup.