Progress towards replacing parser with Esprima (to support ES6 generator syntax)