Merge "Define more things to improve doxygen generation."