fixup! fixup! Reduce cppcheck warnings (style) in src subdirectory.