Some more cppcheck cleanup/updates