Move unfinished grammar functionality to branch.