accommodating cppcheck concerns