Fix: some templates in Forbidden Extensions needed explicit paths.

src/function-forms/forbidden-extensions/bullet-one/arrow-function.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/arrow-function/
+path: language/expressions/arrow-function/forbidden-ext/b1/arrow-function-
 name: arrow function expression
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
 info: |
@@ -12,7 +12,7 @@ var callCount = 0;
 var f;
 f = (/*{ params }*/) => {
   /*{ function-body }*/
-  callCount = callCount + 1;
+  callCount++;
 };
 
 assert.throws(/*{ error }*/, function() {

src/function-forms/forbidden-extensions/bullet-one/async-arrow-function.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-arrow-function/
+path: language/expressions/async-arrow-function/forbidden-ext/b1/async-arrow-function-
 name: async arrow function expression
 esid: sec-async-arrow-function-definitions
 info: |
@@ -21,7 +21,7 @@ var callCount = 0;
 var f;
 f = async (/*{ params }*/) => {
   /*{ function-body }*/
-  callCount = callCount + 1;
+  callCount++;
 };
 
 f(/*{ args }*/)

src/function-forms/forbidden-extensions/bullet-one/async-func-decl.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/async-function/
+path: language/statements/async-function/forbidden-ext/b1/async-func-decl-
 name: async function declaration
 esid: sec-async-function-definitions
 info: |
@@ -15,7 +15,7 @@ features: [async-functions]
 var callCount = 0;
 async function f(/*{ params }*/) {
   /*{ function-body }*/
-  callCount = callCount + 1;
+  callCount++;
 }
 
 f(/*{ args }*/)

src/function-forms/forbidden-extensions/bullet-one/async-func-expr-named.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-function/named-
+path: language/expressions/async-function/forbidden-ext/b1/async-func-expr-named-
 name: async function named expression
 esid: sec-async-function-definitions
 info: |
@@ -15,7 +15,7 @@ features: [async-functions]
 var callCount = 0;
 var f = async function f(/*{ params }*/) {
   /*{ function-body }*/
-  callCount = callCount + 1;
+  callCount++;
 }
 
 f(/*{ args }*/)

src/function-forms/forbidden-extensions/bullet-one/async-func-expr-nameless.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-function/nameless-
+path: language/expressions/async-function/forbidden-ext/b1/async-func-expr-nameless-
 name: async function nameless expression
 esid: sec-async-function-definitions
 info: |
@@ -15,7 +15,7 @@ features: [async-functions]
 var callCount = 0;
 var f = async function(/*{ params }*/) {
   /*{ function-body }*/
-  callCount = callCount + 1;
+  callCount++;
 }
 
 f(/*{ args }*/)

src/function-forms/forbidden-extensions/bullet-one/async-gen-func-decl.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/async-generator/
+path: language/statements/async-generator/forbidden-ext/b1/async-gen-func-decl-
 name: async generator function declaration
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
 info: |
@@ -16,7 +16,7 @@ flags: [async]
 var callCount = 0;
 async function* f(/*{ params }*/) {
   /*{ function-body }*/
-  callCount = callCount + 1;
+  callCount++;
 }
 
 f(/*{ args }*/).next()

src/function-forms/forbidden-extensions/bullet-one/async-gen-func-expr.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/
+path: language/expressions/async-generator/forbidden-ext/b1/async-gen-func-expr-
 name: async generator function expression
 esid: sec-asyncgenerator-definitions-evaluation
 info: |
@@ -17,7 +17,7 @@ var callCount = 0;
 var f;
 f = async function*(/*{ params }*/) {
   /*{ function-body }*/
-  callCount = callCount + 1;
+  callCount++;
 };
 
 f(/*{ args }*/).next()

src/function-forms/forbidden-extensions/bullet-one/async-gen-meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/async-gen-meth-
+path: language/expressions/object/method-definition/forbidden-ext/b1/async-gen-meth-
 name: async generator method
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
 info: |
@@ -17,7 +17,7 @@ var callCount = 0;
 var obj = {
   async *method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-one/async-gen-named-func-expr.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/named-
+path: language/expressions/async-generator/forbidden-ext/b1/async-gen-named-func-expr-
 name: async generator named function expression
 esid: sec-asyncgenerator-definitions-evaluation
 info: |
@@ -17,7 +17,7 @@ var callCount = 0;
 var f;
 f = async function* g(/*{ params }*/) {
   /*{ function-body }*/
-  callCount = callCount + 1;
+  callCount++;
 };
 
 f(/*{ args }*/).next()

src/function-forms/forbidden-extensions/bullet-one/async-meth.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/object/method-definition/async-meth-
+path: language/expressions/object/method-definition/forbidden-ext/b1/async-meth-
 name: async method
 esid: sec-async-function-definitions
 info: |
@@ -17,7 +17,7 @@ var callCount = 0;
 var obj = {
   async method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-one/cls-decl-async-gen-meth-static.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-gen-method-static/
+path: language/statements/class/async-gen-method-static/forbidden-ext/b1/cls-decl-async-gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
@@ -15,7 +15,7 @@ var callCount = 0;
 class C {
   static async *method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 }
 

src/function-forms/forbidden-extensions/bullet-one/cls-decl-async-gen-meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/async-gen-method/
+path: language/statements/class/async-gen-method/forbidden-ext/b1/cls-decl-async-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -14,7 +14,7 @@ var callCount = 0;
 class C {
   async *method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 }
 

src/function-forms/forbidden-extensions/bullet-one/cls-decl-async-meth-static.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-method-static/
+path: language/statements/class/async-method-static/forbidden-ext/b1/cls-decl-async-meth-static-
 name: static class declaration async method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
@@ -15,7 +15,7 @@ var callCount = 0;
 class C {
   static async method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 }
 

src/function-forms/forbidden-extensions/bullet-one/cls-decl-async-meth.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-method/
+path: language/statements/class/async-method/forbidden-ext/b1/cls-decl-async-meth-
 name: class declaration async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -15,7 +15,7 @@ var callCount = 0;
 class C {
   async method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 }
 

src/function-forms/forbidden-extensions/bullet-one/cls-decl-gen-meth-static.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-method-static/
+path: language/statements/class/gen-method-static/forbidden-ext/b1/cls-decl-gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
@@ -13,7 +13,7 @@ var callCount = 0;
 class C {
   static *method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 }
 

src/function-forms/forbidden-extensions/bullet-one/cls-decl-gen-meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-method/
+path: language/statements/class/gen-method/forbidden-ext/b1/cls-decl-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -13,7 +13,7 @@ var callCount = 0;
 class C {
   *method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 }
 

src/function-forms/forbidden-extensions/bullet-one/cls-decl-meth-static.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/method-static/
+path: language/statements/class/method-static/forbidden-ext/b1/cls-decl-meth-static-
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
@@ -12,7 +12,7 @@ var callCount = 0;
 class C {
   static method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 }
 

src/function-forms/forbidden-extensions/bullet-one/cls-decl-meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/method/
+path: language/statements/class/method/forbidden-ext/b1/cls-decl-meth-
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
@@ -12,7 +12,7 @@ var callCount = 0;
 class C {
   method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 }
 

src/function-forms/forbidden-extensions/bullet-one/cls-expr-async-gen-meth-static.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/async-gen-method-static/
+path: language/expressions/class/async-gen-method-static/forbidden-ext/b1/cls-expr-async-gen-meth-static-
 name: static class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -14,7 +14,7 @@ var callCount = 0;
 var C = class {
   static async *method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-one/cls-expr-async-gen-meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/async-gen-method/
+path: language/expressions/class/async-gen-method/forbidden-ext/b1/cls-expr-async-gen-meth-
 name: class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -14,7 +14,7 @@ var callCount = 0;
 var C = class {
   async *method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-one/cls-expr-async-meth-static.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-method-static/
+path: language/expressions/class/async-method-static/forbidden-ext/b1/cls-expr-async-meth-static-
 name: static class expression async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -16,7 +16,7 @@ var callCount = 0;
 var C = class {
   static async method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-one/cls-expr-async-meth.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-method/
+path: language/expressions/class/async-method/forbidden-ext/b1/cls-expr-async-meth-
 name: class expression async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -15,7 +15,7 @@ var callCount = 0;
 var C = class {
   async method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-one/cls-expr-gen-meth-static.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-method-static/
+path: language/expressions/class/gen-method-static/forbidden-ext/b1/cls-expr-gen-meth-static-
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -13,7 +13,7 @@ var callCount = 0;
 var C = class {
   static *method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-one/cls-expr-gen-meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-method/
+path: language/expressions/class/gen-method/forbidden-ext/b1/cls-expr-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -13,7 +13,7 @@ var callCount = 0;
 var C = class {
   *method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-one/cls-expr-meth-static.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/method-static/
+path: language/expressions/class/method-static/forbidden-ext/b1/cls-expr-meth-static-
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -12,7 +12,7 @@ var callCount = 0;
 var C = class {
   static method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-one/cls-expr-meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/method/
+path: language/expressions/class/method/forbidden-ext/b1/cls-expr-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -12,7 +12,7 @@ var callCount = 0;
 var C = class {
   method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-one/func-decl-strict.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/function/
+path: language/statements/function/forbidden-ext/b1/cls-expr-meth-
 name: function declaration
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
 info: |
@@ -13,7 +13,7 @@ var callCount = 0;
 function f(/*{ params }*/) {
   "use strict";
   /*{ function-body }*/
-  callCount = callCount + 1;
+  callCount++;
 }
 assert.throws(/*{ error }*/, function() {
   f(/*{ args }*/);

src/function-forms/forbidden-extensions/bullet-one/func-decl.template

@@ -1,9 +1,10 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/function/
+path: language/statements/function/forbidden-ext/b1/func-decl-
 name: function declaration
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
+desc: In non-strict code, f.caller is not forbidden
 info: |
     FunctionDeclaration :
         function BindingIdentifier ( FormalParameters ) { FunctionBody }
@@ -12,7 +13,7 @@ info: |
 var callCount = 0;
 function f(/*{ params }*/) {
   /*{ function-body }*/
-  callCount = callCount + 1;
+  callCount++;
 }
 f(/*{ args }*/);
-assert.sameValue(callCount, 0, 'function was evaluated');
+assert.sameValue(callCount, 1, 'function was evaluated');

src/function-forms/forbidden-extensions/bullet-one/func-expr-strict.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/function/
+path: language/expressions/function/forbidden-ext/b1/func-expr-strict-
 name: function expression
 esid: sec-function-definitions-runtime-semantics-evaluation
 info: |
@@ -13,7 +13,7 @@ var f;
 f = function(/*{ params }*/) {
   "use strict";
   /*{ function-body }*/
-  callCount = callCount + 1;
+  callCount++;
 };
 assert.throws(/*{ error }*/, function() {
   f(/*{ args }*/);

src/function-forms/forbidden-extensions/bullet-one/func-expr.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/function/
+path: language/expressions/function/forbidden-ext/b1/func-expr-
 name: function expression
 esid: sec-function-definitions-runtime-semantics-evaluation
 info: |
@@ -12,7 +12,7 @@ var callCount = 0;
 var f;
 f = function(/*{ params }*/) {
   /*{ function-body }*/
-  callCount = callCount + 1;
+  callCount++;
 };
 f(/*{ args }*/);
 

src/function-forms/forbidden-extensions/bullet-one/gen-func-decl.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/generators/
+path: language/statements/generators/forbidden-ext/b1/gen-func-decl-
 name: generator function declaration
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 info: |
@@ -12,7 +12,7 @@ features: [generators]
 var callCount = 0;
 function* f(/*{ params }*/) {
   /*{ function-body }*/
-  callCount = callCount + 1;
+  callCount++;
 }
 
 assert.throws(/*{ error }*/, function() {

src/function-forms/forbidden-extensions/bullet-one/gen-func-expr.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/generators/
+path: language/expressions/generators/forbidden-ext/b1/gen-func-expr-
 name: generator function expression
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 info: |
@@ -13,7 +13,7 @@ var callCount = 0;
 var f;
 f = function*(/*{ params }*/) {
   /*{ function-body }*/
-  callCount = callCount + 1;
+  callCount++;
 };
 
 assert.throws(/*{ error }*/, function() {

src/function-forms/forbidden-extensions/bullet-one/gen-meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/gen-meth-
+path: language/expressions/object/method-definition/forbidden-ext/b1/gen-meth-
 name: generator method
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 info: |
@@ -15,7 +15,7 @@ var callCount = 0;
 var obj = {
   *method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-one/meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/meth-
+path: language/expressions/object/method-definition/forbidden-ext/b1/meth-
 name: method
 esid: sec-runtime-semantics-definemethod
 info: |
@@ -12,7 +12,7 @@ var callCount = 0;
 var obj = {
   method(/*{ params }*/) {
     /*{ method-body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-two/arrow-function.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/arrow-function/
+path: language/expressions/arrow-function/forbidden-ext/b2/arrow-function-
 name: arrow function expression
 esid: sec-arrow-definitions-runtime-semantics-evaluation
 info: |
@@ -13,7 +13,7 @@ var f;
 f = (/*{ params }*/) => {
   "use strict";
   /*{ body }*/
-  callCount = callCount + 1;
+  callCount++;
 };
 
 assert.throws(/*{ error }*/, function() {

src/function-forms/forbidden-extensions/bullet-two/async-arrow-function.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-arrow-function/
+path: language/expressions/async-arrow-function/forbidden-ext/b2/async-arrow-function-
 name: async arrow function expression
 esid: sec-async-arrow-definitions
 info: |
@@ -22,7 +22,7 @@ var f;
 f = async (/*{ params }*/) => {
   "use strict";
   /*{ body }*/
-  callCount = callCount + 1;
+  callCount++;
 };
 
 f(/*{ args }*/)

src/function-forms/forbidden-extensions/bullet-two/async-func-decl.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/async-function/
+path: language/statements/async-function/forbidden-ext/b2/async-func-decl-
 name: async function declaration
 esid: sec-async-definitions
 info: |
@@ -16,7 +16,7 @@ var callCount = 0;
 async function f(/*{ params }*/) {
   "use strict";
   /*{ body }*/
-  callCount = callCount + 1;
+  callCount++;
 }
 
 f(/*{ args }*/)

src/function-forms/forbidden-extensions/bullet-two/async-func-expr-named.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-function/named-
+path: language/expressions/async-function/forbidden-ext/b2/async-func-expr-named-
 name: async function named expression
 esid: sec-async-definitions
 info: |
@@ -16,7 +16,7 @@ var callCount = 0;
 var f = async function f(/*{ params }*/) {
   "use strict";
   /*{ body }*/
-  callCount = callCount + 1;
+  callCount++;
 }
 
 f(/*{ args }*/)

src/function-forms/forbidden-extensions/bullet-two/async-func-expr-nameless.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-function/nameless-
+path: language/expressions/async-function/forbidden-ext/b2/async-func-expr-nameless-
 name: async function nameless expression
 esid: sec-async-definitions
 info: |
@@ -16,7 +16,7 @@ var callCount = 0;
 var f = async function(/*{ params }*/) {
   "use strict";
   /*{ body }*/
-  callCount = callCount + 1;
+  callCount++;
 }
 
 f(/*{ args }*/)

src/function-forms/forbidden-extensions/bullet-two/async-gen-func-decl.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/async-generator/
+path: language/statements/async-generator/forbidden-ext/b2/async-gen-func-decl-
 name: async generator function declaration
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
 info: |
@@ -17,7 +17,7 @@ var callCount = 0;
 async function* f(/*{ params }*/) {
   "use strict";
   /*{ body }*/
-  callCount = callCount + 1;
+  callCount++;
 }
 
 f(/*{ args }*/).next()

src/function-forms/forbidden-extensions/bullet-two/async-gen-func-expr.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/
+path: language/expressions/async-generator/forbidden-ext/b2/async-gen-func-expr-
 name: async generator function expression
 esid: sec-asyncgenerator-definitions-evaluation
 info: |
@@ -18,7 +18,7 @@ var f;
 f = async function*(/*{ params }*/) {
   "use strict";
   /*{ body }*/
-  callCount = callCount + 1;
+  callCount++;
 };
 
 f(/*{ args }*/).next()

src/function-forms/forbidden-extensions/bullet-two/async-gen-meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/async-gen-meth-
+path: language/expressions/object/method-definition/forbidden-ext/b2/async-gen-meth-
 name: async generator method
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
 info: |
@@ -18,7 +18,7 @@ var obj = {
   async *method(/*{ params }*/) {
     "use strict";
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-two/async-gen-named-func-expr.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/named-
+path: language/expressions/async-generator/forbidden-ext/b2/async-gen-named-func-expr-
 name: async generator named function expression
 esid: sec-asyncgenerator-definitions-evaluation
 info: |
@@ -18,7 +18,7 @@ var f;
 f = async function* g(/*{ params }*/) {
   "use strict";
   /*{ body }*/
-  callCount = callCount + 1;
+  callCount++;
 };
 
 f(/*{ args }*/).next()

src/function-forms/forbidden-extensions/bullet-two/async-meth.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/object/method-definition/async-meth-
+path: language/expressions/object/method-definition/forbidden-ext/b2/async-meth-
 name: async method
 esid: sec-async-definitions
 info: |
@@ -18,7 +18,7 @@ var obj = {
   async method(/*{ params }*/) {
     "use strict";
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-two/cls-decl-async-gen-meth-static.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-gen-method-static/
+path: language/statements/class/async-gen-method-static/forbidden-ext/b2/cls-decl-async-gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
@@ -16,7 +16,7 @@ class C {
   static async *method(/*{ params }*/) {
     /* implicit strict */
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 }
 

src/function-forms/forbidden-extensions/bullet-two/cls-decl-async-gen-meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/async-gen-method/
+path: language/statements/class/async-gen-method/forbidden-ext/b2/cls-decl-async-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -15,7 +15,7 @@ class C {
   async *method(/*{ params }*/) {
     /* implicit strict */
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 }
 

src/function-forms/forbidden-extensions/bullet-two/cls-decl-async-meth-static.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-method-static/
+path: language/statements/class/async-method-static/forbidden-ext/b2/cls-decl-async-meth-static-
 name: static class declaration async method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
@@ -16,7 +16,7 @@ class C {
   static async method(/*{ params }*/) {
     /* implicit strict */
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 }
 

src/function-forms/forbidden-extensions/bullet-two/cls-decl-async-meth.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-method/
+path: language/statements/class/async-method/forbidden-ext/b2/cls-decl-async-meth-
 name: class declaration async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -16,7 +16,7 @@ class C {
   async method(/*{ params }*/) {
     /* implicit strict */
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 }
 

src/function-forms/forbidden-extensions/bullet-two/cls-decl-gen-meth-static.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-method-static/
+path: language/statements/class/gen-method-static/forbidden-ext/b2/cls-decl-gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
@@ -14,7 +14,7 @@ class C {
   static *method(/*{ params }*/) {
     /* implicit strict */
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 }
 

src/function-forms/forbidden-extensions/bullet-two/cls-decl-gen-meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-method/
+path: language/statements/class/gen-method/forbidden-ext/b2/cls-decl-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -14,7 +14,7 @@ class C {
   *method(/*{ params }*/) {
     /* implicit strict */
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 }
 

src/function-forms/forbidden-extensions/bullet-two/cls-decl-meth-static.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/method-static/
+path: language/statements/class/method-static/forbidden-ext/b2/cls-decl-meth-static-
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
@@ -13,7 +13,7 @@ class C {
   static method(/*{ params }*/) {
     /* implicit strict */
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 }
 

src/function-forms/forbidden-extensions/bullet-two/cls-decl-meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/method/
+path: language/statements/class/method/forbidden-ext/b2/cls-decl-meth-
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
@@ -13,7 +13,7 @@ class C {
   method(/*{ params }*/) {
     /* implicit strict */
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 }
 

src/function-forms/forbidden-extensions/bullet-two/cls-expr-async-gen-meth-static.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/async-gen-method-static/
+path: language/expressions/class/async-gen-method-static/forbidden-ext/b2/cls-expr-async-gen-meth-static-
 name: static class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -15,7 +15,7 @@ var C = class {
   static async *method(/*{ params }*/) {
     /* implicit strict */
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-two/cls-expr-async-gen-meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/async-gen-method/
+path: language/expressions/class/async-gen-method/forbidden-ext/b2/cls-expr-async-gen-meth-
 name: class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -15,7 +15,7 @@ var C = class {
   async *method(/*{ params }*/) {
     /* implicit strict */
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-two/cls-expr-async-meth-static.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-method-static/
+path: language/expressions/class/async-method-static/forbidden-ext/b2/cls-expr-async-meth-static-
 name: static class expression async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -17,7 +17,7 @@ var C = class {
   static async method(/*{ params }*/) {
     /* implicit strict */
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-two/cls-expr-async-meth.template

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-method/
+path: language/expressions/class/async-method/forbidden-ext/b2/cls-expr-async-meth-
 name: class expression async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -16,7 +16,7 @@ var C = class {
   async method(/*{ params }*/) {
     /* implicit strict */
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-two/cls-expr-gen-meth-static.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-method-static/
+path: language/expressions/class/gen-method-static/forbidden-ext/b2/cls-expr-gen-meth-static-
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -14,7 +14,7 @@ var C = class {
   static *method(/*{ params }*/) {
     /* implicit strict */
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-two/cls-expr-gen-meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-method/
+path: language/expressions/class/gen-method/forbidden-ext/b2/cls-expr-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -14,7 +14,7 @@ var C = class {
   *method(/*{ params }*/) {
     /* implicit strict */
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-two/cls-expr-meth-static.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/method-static/
+path: language/expressions/class/method-static/forbidden-ext/b2/cls-expr-meth-static-
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -13,7 +13,7 @@ var C = class {
   static method(/*{ params }*/) {
     /* implicit strict */
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-two/cls-expr-meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/method/
+path: language/expressions/class/method/forbidden-ext/b2/cls-expr-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
@@ -13,7 +13,7 @@ var C = class {
   method(/*{ params }*/) {
     /* implicit strict */
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-two/func-decl.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/function/
+path: language/statements/function/forbidden-ext/b2/func-decl-
 name: function declaration
 esid: sec-definitions-runtime-semantics-instantiatefunctionobject
 info: |
@@ -13,7 +13,7 @@ var callCount = 0;
 function f(/*{ params }*/) {
   "use strict";
   /*{ body }*/
-  callCount = callCount + 1;
+  callCount++;
 }
 assert.throws(/*{ error }*/, function() {
   f(/*{ args }*/);

src/function-forms/forbidden-extensions/bullet-two/func-expr.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/function/
+path: language/expressions/function/forbidden-ext/b2/func-expr-
 name: function expression
 esid: sec-definitions-runtime-semantics-evaluation
 info: |
@@ -13,7 +13,7 @@ var f;
 f = function(/*{ params }*/) {
   "use strict";
   /*{ body }*/
-  callCount = callCount + 1;
+  callCount++;
 };
 assert.throws(/*{ error }*/, function() {
   f(/*{ args }*/);

src/function-forms/forbidden-extensions/bullet-two/gen-func-decl.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/generators/
+path: language/statements/generators/forbidden-ext/b2/gen-func-decl-
 name: generator function declaration
 esid: sec-generator-definitions-runtime-semantics-instantiatefunctionobject
 info: |
@@ -13,7 +13,7 @@ var callCount = 0;
 function* f(/*{ params }*/) {
   "use strict";
   /*{ body }*/
-  callCount = callCount + 1;
+  callCount++;
 }
 
 assert.throws(/*{ error }*/, function() {

src/function-forms/forbidden-extensions/bullet-two/gen-func-expr.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/generators/
+path: language/expressions/generators/forbidden-ext/b2/gen-func-expr-
 name: generator function expression
 esid: sec-generator-definitions-runtime-semantics-evaluation
 info: |
@@ -14,7 +14,7 @@ var f;
 f = function*(/*{ params }*/) {
   "use strict";
   /*{ body }*/
-  callCount = callCount + 1;
+  callCount++;
 };
 
 assert.throws(/*{ error }*/, function() {

src/function-forms/forbidden-extensions/bullet-two/gen-meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/gen-meth-
+path: language/expressions/object/method-definition/forbidden-ext/b2/gen-meth-
 name: generator method
 esid: sec-generator-definitions-runtime-semantics-propertydefinitionevaluation
 info: |
@@ -16,7 +16,7 @@ var obj = {
   *method(/*{ params }*/) {
     "use strict";
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };
 

src/function-forms/forbidden-extensions/bullet-two/meth.template

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/meth-
+path: language/expressions/object/method-definition/forbidden-ext/b2/meth-
 name: method
 esid: sec-runtime-semantics-definemethod
 info: |
@@ -13,7 +13,7 @@ var obj = {
   method(/*{ params }*/) {
     "use strict";
     /*{ body }*/
-    callCount = callCount + 1;
+    callCount++;
   }
 };