Re #9261 fixing cppcheck