Some minor changes to make Doxygen happier