Persnickety fixes

Minor renaming, warning suppression, and general nit pickery.