Upgrading ecma scopes and fixing comprehension expression confusion