Improved building of parse tree.
Refactoring.
Refactoring.