Style and Cppcheck fixes.