Upgrade: Switch to using Esprima for attaching comments (fixes #730)