Hand-fixes some cppcheck warnings, this was work prior to fixing the
cppcheck target.