Moved brace matching functionality to use the new syntax tree

Sounds reasonable. I can move it back in, although, I'd like to temporarily continue the review like this so people can contextually compare side by side.