Re #9341. Do the doxygen documentation right this time.