Re #9336 Fix Doxygen warnings