Made changes to the tree parsing grammer to fix the observed issues.