Cleanup cppcheck (part 1)