Last swath of cppcheck warnings fixes