cppcheck cleanup.  All regression tests pass.
Version bump for 1.17.