Fixing up some build warnings I introduced.

Now running basic code analysis.
I think this warrants a version increment.  Boop.