Moved brace matching functionality to use the new syntax tree

Is this needed?