More progress on replacing parser with Esprima