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