Further cleanup of doxygen code examples