Tweaks to pass lint.  (Gotta set up Travis!)