More Doxygen restored.