Clean up cppcheck style diagnostic.
Clean up cppcheck 1.60.1 reported performance diagnostics.
Clean up cppcheck 1.60.1 diagnostics.
Fix syntax error found by cppcheck 1.60.1.
Fix copy-paste typo found with cppcheck 1.60.1.