More cppcheck fixes.