re #8924 cppcheck and doxygen fixes