Changed some Doxygen stuff back.