Some more work on Esprima.
Fixes