cleaning up cppcheck violations for issue #506