Minor cleanup tweaks.