cppcheck 1.63 fixes for RHEL6