Clean up some warnings from -Weverything.  Just because