Also eliminate OUTPUT_DEF_IDENTIFIER as separate token
LGTM, although I'm not sure I could identify weakness in such a patch. The idea is good. I like the structure and the comments.