Parse into an intermediate tree
Complete the parser
Merge branch 'tree-intermediate'