Some more doxygen work; doxygen is no longer reporting any errors.