Updates to work with esprima PR287