Re #10442 Attempting to fix cppcheck_develop errors