A few more ParseTreePatternMatcher fixes.

Only one more semantic issue left.