Reworking parser to use standard parse tree.