CPP: Fixed #undef failing on TOK_EOF and cleaned up MacroDTBuf.cpp.