[#1404] even more cppcheck fixes