diff --git a/src/function-forms/forbidden-extensions/bullet-one/arrow-function.template b/src/function-forms/forbidden-extensions/bullet-one/arrow-function.template
index 0f481f5d7f..7d21248e7a 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/arrow-function.template
+++ b/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() {
diff --git a/src/function-forms/forbidden-extensions/bullet-one/async-arrow-function.template b/src/function-forms/forbidden-extensions/bullet-one/async-arrow-function.template
index 56ad9fa2fd..ee2d111fd6 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/async-arrow-function.template
+++ b/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 }*/)
diff --git a/src/function-forms/forbidden-extensions/bullet-one/async-func-decl.template b/src/function-forms/forbidden-extensions/bullet-one/async-func-decl.template
index 5cb65bb561..cef62fdffd 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/async-func-decl.template
+++ b/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 }*/)
diff --git a/src/function-forms/forbidden-extensions/bullet-one/async-func-expr-named.template b/src/function-forms/forbidden-extensions/bullet-one/async-func-expr-named.template
index 07d336b2d5..076c65b572 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/async-func-expr-named.template
+++ b/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 }*/)
diff --git a/src/function-forms/forbidden-extensions/bullet-one/async-func-expr-nameless.template b/src/function-forms/forbidden-extensions/bullet-one/async-func-expr-nameless.template
index 927ade9793..d4eecd0e35 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/async-func-expr-nameless.template
+++ b/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 }*/)
diff --git a/src/function-forms/forbidden-extensions/bullet-one/async-gen-func-decl.template b/src/function-forms/forbidden-extensions/bullet-one/async-gen-func-decl.template
index 1b0fbf0e63..d1de68d029 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/async-gen-func-decl.template
+++ b/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()
diff --git a/src/function-forms/forbidden-extensions/bullet-one/async-gen-func-expr.template b/src/function-forms/forbidden-extensions/bullet-one/async-gen-func-expr.template
index 14448ca291..4418c66cc2 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/async-gen-func-expr.template
+++ b/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()
diff --git a/src/function-forms/forbidden-extensions/bullet-one/async-gen-meth.template b/src/function-forms/forbidden-extensions/bullet-one/async-gen-meth.template
index 5c789fb5b1..8423967fa8 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/async-gen-meth.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/async-gen-named-func-expr.template b/src/function-forms/forbidden-extensions/bullet-one/async-gen-named-func-expr.template
index 6819cb6351..db93fb7aa5 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/async-gen-named-func-expr.template
+++ b/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()
diff --git a/src/function-forms/forbidden-extensions/bullet-one/async-meth.template b/src/function-forms/forbidden-extensions/bullet-one/async-meth.template
index 44df728aba..1c6f58eb8a 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/async-meth.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/cls-decl-async-gen-meth-static.template b/src/function-forms/forbidden-extensions/bullet-one/cls-decl-async-gen-meth-static.template
index 9d0a59409e..8ae840c2ba 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/cls-decl-async-gen-meth-static.template
+++ b/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++;
   }
 }
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/cls-decl-async-gen-meth.template b/src/function-forms/forbidden-extensions/bullet-one/cls-decl-async-gen-meth.template
index b315f02424..aef39be3d2 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/cls-decl-async-gen-meth.template
+++ b/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++;
   }
 }
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/cls-decl-async-meth-static.template b/src/function-forms/forbidden-extensions/bullet-one/cls-decl-async-meth-static.template
index 18f9f0cff7..7553add107 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/cls-decl-async-meth-static.template
+++ b/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++;
   }
 }
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/cls-decl-async-meth.template b/src/function-forms/forbidden-extensions/bullet-one/cls-decl-async-meth.template
index 14edb0ed5f..d73b151f9d 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/cls-decl-async-meth.template
+++ b/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++;
   }
 }
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/cls-decl-gen-meth-static.template b/src/function-forms/forbidden-extensions/bullet-one/cls-decl-gen-meth-static.template
index c2f5e09c12..a1b0a4fe74 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/cls-decl-gen-meth-static.template
+++ b/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++;
   }
 }
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/cls-decl-gen-meth.template b/src/function-forms/forbidden-extensions/bullet-one/cls-decl-gen-meth.template
index 565e564847..2740c1e0f9 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/cls-decl-gen-meth.template
+++ b/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++;
   }
 }
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/cls-decl-meth-static.template b/src/function-forms/forbidden-extensions/bullet-one/cls-decl-meth-static.template
index 06bded848c..bb4d8b3605 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/cls-decl-meth-static.template
+++ b/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++;
   }
 }
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/cls-decl-meth.template b/src/function-forms/forbidden-extensions/bullet-one/cls-decl-meth.template
index 3f95dd6f45..d642ad9d3c 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/cls-decl-meth.template
+++ b/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++;
   }
 }
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/cls-expr-async-gen-meth-static.template b/src/function-forms/forbidden-extensions/bullet-one/cls-expr-async-gen-meth-static.template
index cdc93e1d78..fe33b8e8fe 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/cls-expr-async-gen-meth-static.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/cls-expr-async-gen-meth.template b/src/function-forms/forbidden-extensions/bullet-one/cls-expr-async-gen-meth.template
index 1b5a42bce2..6243aa2956 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/cls-expr-async-gen-meth.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/cls-expr-async-meth-static.template b/src/function-forms/forbidden-extensions/bullet-one/cls-expr-async-meth-static.template
index 69a065149a..623e575795 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/cls-expr-async-meth-static.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/cls-expr-async-meth.template b/src/function-forms/forbidden-extensions/bullet-one/cls-expr-async-meth.template
index cf2620a597..3ed379baab 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/cls-expr-async-meth.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/cls-expr-gen-meth-static.template b/src/function-forms/forbidden-extensions/bullet-one/cls-expr-gen-meth-static.template
index acd704b910..0005511802 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/cls-expr-gen-meth-static.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/cls-expr-gen-meth.template b/src/function-forms/forbidden-extensions/bullet-one/cls-expr-gen-meth.template
index e5996918ab..e071751fa8 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/cls-expr-gen-meth.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/cls-expr-meth-static.template b/src/function-forms/forbidden-extensions/bullet-one/cls-expr-meth-static.template
index dcb43c0195..29166ae650 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/cls-expr-meth-static.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/cls-expr-meth.template b/src/function-forms/forbidden-extensions/bullet-one/cls-expr-meth.template
index e2f0e507c5..a60f2281d0 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/cls-expr-meth.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/func-decl-strict.template b/src/function-forms/forbidden-extensions/bullet-one/func-decl-strict.template
index ef8940dcff..5747b045d1 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/func-decl-strict.template
+++ b/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 }*/);
diff --git a/src/function-forms/forbidden-extensions/bullet-one/func-decl.template b/src/function-forms/forbidden-extensions/bullet-one/func-decl.template
index 12976b73e8..8a502fae43 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/func-decl.template
+++ b/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');
diff --git a/src/function-forms/forbidden-extensions/bullet-one/func-expr-strict.template b/src/function-forms/forbidden-extensions/bullet-one/func-expr-strict.template
index 9d11f8ab7a..1d604549c0 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/func-expr-strict.template
+++ b/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 }*/);
diff --git a/src/function-forms/forbidden-extensions/bullet-one/func-expr.template b/src/function-forms/forbidden-extensions/bullet-one/func-expr.template
index 697794a767..0e0b7cb903 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/func-expr.template
+++ b/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 }*/);
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/gen-func-decl.template b/src/function-forms/forbidden-extensions/bullet-one/gen-func-decl.template
index 7cee8069b9..bdd15ba469 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/gen-func-decl.template
+++ b/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() {
diff --git a/src/function-forms/forbidden-extensions/bullet-one/gen-func-expr.template b/src/function-forms/forbidden-extensions/bullet-one/gen-func-expr.template
index c83f75a8e5..c21288160e 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/gen-func-expr.template
+++ b/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() {
diff --git a/src/function-forms/forbidden-extensions/bullet-one/gen-meth.template b/src/function-forms/forbidden-extensions/bullet-one/gen-meth.template
index eaf360ef1b..91f11c6b53 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/gen-meth.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-one/meth.template b/src/function-forms/forbidden-extensions/bullet-one/meth.template
index 69a5b4e715..f56f5a2ddf 100644
--- a/src/function-forms/forbidden-extensions/bullet-one/meth.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/arrow-function.template b/src/function-forms/forbidden-extensions/bullet-two/arrow-function.template
index 51cf2d739b..63c7242f55 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/arrow-function.template
+++ b/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() {
diff --git a/src/function-forms/forbidden-extensions/bullet-two/async-arrow-function.template b/src/function-forms/forbidden-extensions/bullet-two/async-arrow-function.template
index 257ac4a44c..402eecd6df 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/async-arrow-function.template
+++ b/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 }*/)
diff --git a/src/function-forms/forbidden-extensions/bullet-two/async-func-decl.template b/src/function-forms/forbidden-extensions/bullet-two/async-func-decl.template
index c4d3a0e15f..f97ad290d6 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/async-func-decl.template
+++ b/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 }*/)
diff --git a/src/function-forms/forbidden-extensions/bullet-two/async-func-expr-named.template b/src/function-forms/forbidden-extensions/bullet-two/async-func-expr-named.template
index a65d8cf0c0..015d05c2bf 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/async-func-expr-named.template
+++ b/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 }*/)
diff --git a/src/function-forms/forbidden-extensions/bullet-two/async-func-expr-nameless.template b/src/function-forms/forbidden-extensions/bullet-two/async-func-expr-nameless.template
index 67685244f3..d70d4c9b45 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/async-func-expr-nameless.template
+++ b/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 }*/)
diff --git a/src/function-forms/forbidden-extensions/bullet-two/async-gen-func-decl.template b/src/function-forms/forbidden-extensions/bullet-two/async-gen-func-decl.template
index 949ee88312..cea1c22800 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/async-gen-func-decl.template
+++ b/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()
diff --git a/src/function-forms/forbidden-extensions/bullet-two/async-gen-func-expr.template b/src/function-forms/forbidden-extensions/bullet-two/async-gen-func-expr.template
index b314cb44f6..1690b3bf64 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/async-gen-func-expr.template
+++ b/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()
diff --git a/src/function-forms/forbidden-extensions/bullet-two/async-gen-meth.template b/src/function-forms/forbidden-extensions/bullet-two/async-gen-meth.template
index eb415c7319..b61033f878 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/async-gen-meth.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/async-gen-named-func-expr.template b/src/function-forms/forbidden-extensions/bullet-two/async-gen-named-func-expr.template
index 1b196da17c..d608d2a731 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/async-gen-named-func-expr.template
+++ b/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()
diff --git a/src/function-forms/forbidden-extensions/bullet-two/async-meth.template b/src/function-forms/forbidden-extensions/bullet-two/async-meth.template
index d0d1e0b7f6..05529a1a6c 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/async-meth.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/cls-decl-async-gen-meth-static.template b/src/function-forms/forbidden-extensions/bullet-two/cls-decl-async-gen-meth-static.template
index 8fb20f7552..799f53c6e1 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/cls-decl-async-gen-meth-static.template
+++ b/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++;
   }
 }
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/cls-decl-async-gen-meth.template b/src/function-forms/forbidden-extensions/bullet-two/cls-decl-async-gen-meth.template
index 8b560c4fbc..d7cd9cc0f8 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/cls-decl-async-gen-meth.template
+++ b/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++;
   }
 }
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/cls-decl-async-meth-static.template b/src/function-forms/forbidden-extensions/bullet-two/cls-decl-async-meth-static.template
index a79e9507b6..84d4cbed07 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/cls-decl-async-meth-static.template
+++ b/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++;
   }
 }
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/cls-decl-async-meth.template b/src/function-forms/forbidden-extensions/bullet-two/cls-decl-async-meth.template
index e30087e526..9e979a835a 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/cls-decl-async-meth.template
+++ b/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++;
   }
 }
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/cls-decl-gen-meth-static.template b/src/function-forms/forbidden-extensions/bullet-two/cls-decl-gen-meth-static.template
index f858a0681c..497d0cb54b 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/cls-decl-gen-meth-static.template
+++ b/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++;
   }
 }
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/cls-decl-gen-meth.template b/src/function-forms/forbidden-extensions/bullet-two/cls-decl-gen-meth.template
index 4228e67f44..f0383e016b 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/cls-decl-gen-meth.template
+++ b/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++;
   }
 }
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/cls-decl-meth-static.template b/src/function-forms/forbidden-extensions/bullet-two/cls-decl-meth-static.template
index 42141e1ad4..ebcbdfab5e 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/cls-decl-meth-static.template
+++ b/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++;
   }
 }
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/cls-decl-meth.template b/src/function-forms/forbidden-extensions/bullet-two/cls-decl-meth.template
index 042d2fbd28..5bb5840c76 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/cls-decl-meth.template
+++ b/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++;
   }
 }
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/cls-expr-async-gen-meth-static.template b/src/function-forms/forbidden-extensions/bullet-two/cls-expr-async-gen-meth-static.template
index 08ae9b8f43..25d6c0ff10 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/cls-expr-async-gen-meth-static.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/cls-expr-async-gen-meth.template b/src/function-forms/forbidden-extensions/bullet-two/cls-expr-async-gen-meth.template
index 623b8e9c10..968654ec3b 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/cls-expr-async-gen-meth.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/cls-expr-async-meth-static.template b/src/function-forms/forbidden-extensions/bullet-two/cls-expr-async-meth-static.template
index 710cb84f11..b5ba869676 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/cls-expr-async-meth-static.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/cls-expr-async-meth.template b/src/function-forms/forbidden-extensions/bullet-two/cls-expr-async-meth.template
index 9fac04f687..56ae9c2ef9 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/cls-expr-async-meth.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/cls-expr-gen-meth-static.template b/src/function-forms/forbidden-extensions/bullet-two/cls-expr-gen-meth-static.template
index 694d16e877..a1d21fc1ee 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/cls-expr-gen-meth-static.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/cls-expr-gen-meth.template b/src/function-forms/forbidden-extensions/bullet-two/cls-expr-gen-meth.template
index 2d539fffb3..d2de50015b 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/cls-expr-gen-meth.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/cls-expr-meth-static.template b/src/function-forms/forbidden-extensions/bullet-two/cls-expr-meth-static.template
index cb890e8e61..39fd84eb38 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/cls-expr-meth-static.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/cls-expr-meth.template b/src/function-forms/forbidden-extensions/bullet-two/cls-expr-meth.template
index 868ed97ebe..4d89f84b75 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/cls-expr-meth.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/func-decl.template b/src/function-forms/forbidden-extensions/bullet-two/func-decl.template
index ad96c8641e..d6c458f5ad 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/func-decl.template
+++ b/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 }*/);
diff --git a/src/function-forms/forbidden-extensions/bullet-two/func-expr.template b/src/function-forms/forbidden-extensions/bullet-two/func-expr.template
index fb67c7b397..0c69cec221 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/func-expr.template
+++ b/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 }*/);
diff --git a/src/function-forms/forbidden-extensions/bullet-two/gen-func-decl.template b/src/function-forms/forbidden-extensions/bullet-two/gen-func-decl.template
index 1bc7918838..ed3c7641e7 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/gen-func-decl.template
+++ b/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() {
diff --git a/src/function-forms/forbidden-extensions/bullet-two/gen-func-expr.template b/src/function-forms/forbidden-extensions/bullet-two/gen-func-expr.template
index 873958ec8b..dfb472e2b6 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/gen-func-expr.template
+++ b/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() {
diff --git a/src/function-forms/forbidden-extensions/bullet-two/gen-meth.template b/src/function-forms/forbidden-extensions/bullet-two/gen-meth.template
index 83989f232a..d066d5dffa 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/gen-meth.template
+++ b/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++;
   }
 };
 
diff --git a/src/function-forms/forbidden-extensions/bullet-two/meth.template b/src/function-forms/forbidden-extensions/bullet-two/meth.template
index 9ef34e7002..2f722cb113 100644
--- a/src/function-forms/forbidden-extensions/bullet-two/meth.template
+++ b/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++;
   }
 };