Update: Switch to use Espree (fixes #1595)