Begun rewriting parser with help of esrap.