Work with ParseTreePatternMatcher.

Not sure I like the way I hacked up the assignment into the
vector<Token>.  Using vector<Token*> seems like it’s bad for memory
management.

Also, probably need to sort the headers at some point, but that's a job for future cleanup.