Some cleanup tweaks.