A couple minor cleanup tweaks.