Cleared up doxygen weirdness caused by commented-out #define statements.