diff --git a/packages/@jsii/go-runtime/build-tools/.eslintrc.yaml b/packages/@jsii/go-runtime/.eslintrc.yaml
similarity index 90%
rename from packages/@jsii/go-runtime/build-tools/.eslintrc.yaml
rename to packages/@jsii/go-runtime/.eslintrc.yaml
index adc30f56f6..308d08c432 100644
--- a/packages/@jsii/go-runtime/build-tools/.eslintrc.yaml
+++ b/packages/@jsii/go-runtime/.eslintrc.yaml
@@ -1,5 +1,5 @@
 ---
-extends: ../../../../eslint-config.yaml
+extends: ../../../eslint-config.yaml
 rules:
   'import/no-extraneous-dependencies':
     - error
diff --git a/packages/@jsii/go-runtime/.gitignore b/packages/@jsii/go-runtime/.gitignore
index 8d293c96e0..deeeb002ec 100644
--- a/packages/@jsii/go-runtime/.gitignore
+++ b/packages/@jsii/go-runtime/.gitignore
@@ -1,2 +1,5 @@
 /jsii-calc/
 *.generated.go
+
+*.js
+*.d.ts
diff --git a/packages/@jsii/go-runtime/build-tools/tsconfig.json b/packages/@jsii/go-runtime/build-tools/tsconfig.json
deleted file mode 100644
index e286e0804d..0000000000
--- a/packages/@jsii/go-runtime/build-tools/tsconfig.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "extends": "../../../../tsconfig-base",
-  "include": [
-    "**/*.ts"
-  ]
-}
diff --git a/packages/@jsii/go-runtime/lib/index.ts b/packages/@jsii/go-runtime/lib/index.ts
new file mode 100644
index 0000000000..85ed26e4c4
--- /dev/null
+++ b/packages/@jsii/go-runtime/lib/index.ts
@@ -0,0 +1,3 @@
+import * as path from 'path';
+
+export const runtimePath = path.resolve(__dirname, '..', 'jsii-runtime-go');
diff --git a/packages/@jsii/go-runtime/package.json b/packages/@jsii/go-runtime/package.json
index 13f3f0b5c6..9a3d30bc5e 100644
--- a/packages/@jsii/go-runtime/package.json
+++ b/packages/@jsii/go-runtime/package.json
@@ -3,12 +3,12 @@
   "version": "0.0.0",
   "private": true,
   "description": "",
-  "main": "index.js",
+  "main": "lib/index.js",
   "scripts": {
-    "build": "npm run gen:rt && (cd ./jsii-runtime-go && go build)",
+    "build": "tsc --build && npm run gen:rt && (cd ./jsii-runtime-go && go build)",
     "fmt": "go fmt ./... && (cd ./jsii-runtime-go && go fmt)",
-    "gen:calc": "ts-node build-tools/gen-calc.ts",
-    "gen:rt": "ts-node build-tools/gen.ts",
+    "gen:calc": "node build-tools/gen-calc.js",
+    "gen:rt": "node build-tools/gen.js",
     "generate": "npm run gen:rt && npm run gen:calc",
     "lint": "go vet ./... && (cd ./jsii-runtime-go && go vet)",
     "lint:fix": "yarn lint --fix",
diff --git a/packages/@jsii/go-runtime/tsconfig.json b/packages/@jsii/go-runtime/tsconfig.json
new file mode 100644
index 0000000000..5228b0f5a3
--- /dev/null
+++ b/packages/@jsii/go-runtime/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../../tsconfig-base",
+  "include": ["**/*.ts"]
+}
diff --git a/packages/@scope/jsii-calc-base/lib/index.ts b/packages/@scope/jsii-calc-base/lib/index.ts
index 284de8c438..45e66cddf8 100644
--- a/packages/@scope/jsii-calc-base/lib/index.ts
+++ b/packages/@scope/jsii-calc-base/lib/index.ts
@@ -1,21 +1,34 @@
-import { IVeryBaseInterface, VeryBaseProps } from '@scope/jsii-calc-base-of-base';
+import {
+  IVeryBaseInterface,
+  VeryBaseProps,
+  StaticConsumer as StaticConsumerBase,
+} from '@scope/jsii-calc-base-of-base';
 
 /**
  * A base class.
  */
 export abstract class Base {
-    /**
-     * @returns the name of the class (to verify native type names are created for derived classes).
-     */
-    public typeName() {
-        return (this.constructor as any).name;
-    }
+  /**
+   * @returns the name of the class (to verify native type names are created for derived classes).
+   */
+  public typeName() {
+    return (this.constructor as any).name;
+  }
 }
 
 export interface BaseProps extends VeryBaseProps {
-    readonly bar: string;
+  readonly bar: string;
 }
 
 export interface IBaseInterface extends IVeryBaseInterface {
-    bar(): void;
-}
\ No newline at end of file
+  bar(): void;
+}
+
+/**
+ * Hides the transitive dependency of base-of-base
+ */
+export class StaticConsumer {
+  public static consume(...args: any[]) {
+    return StaticConsumerBase.consume(...args);
+  }
+}
diff --git a/packages/@scope/jsii-calc-base/test/assembly.jsii b/packages/@scope/jsii-calc-base/test/assembly.jsii
index 40a2fe2ec6..26f02103e8 100644
--- a/packages/@scope/jsii-calc-base/test/assembly.jsii
+++ b/packages/@scope/jsii-calc-base/test/assembly.jsii
@@ -93,7 +93,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/index.ts",
-        "line": 6
+        "line": 10
       },
       "methods": [
         {
@@ -102,7 +102,7 @@
           },
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 10
+            "line": 14
           },
           "name": "typeName",
           "returns": {
@@ -124,7 +124,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/index.ts",
-        "line": 15
+        "line": 19
       },
       "name": "BaseProps",
       "properties": [
@@ -133,7 +133,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 16
+            "line": 20
           },
           "name": "bar",
           "type": {
@@ -151,21 +151,55 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/index.ts",
-        "line": 19
+        "line": 23
       },
       "methods": [
         {
           "abstract": true,
           "locationInModule": {
             "filename": "lib/index.ts",
-            "line": 20
+            "line": 24
           },
           "name": "bar"
         }
       ],
       "name": "IBaseInterface"
+    },
+    "@scope/jsii-calc-base.StaticConsumer": {
+      "assembly": "@scope/jsii-calc-base",
+      "docs": {
+        "summary": "Hides the transitive dependency of base-of-base."
+      },
+      "fqn": "@scope/jsii-calc-base.StaticConsumer",
+      "initializer": {},
+      "kind": "class",
+      "locationInModule": {
+        "filename": "lib/index.ts",
+        "line": 30
+      },
+      "methods": [
+        {
+          "locationInModule": {
+            "filename": "lib/index.ts",
+            "line": 31
+          },
+          "name": "consume",
+          "parameters": [
+            {
+              "name": "args",
+              "type": {
+                "primitive": "any"
+              },
+              "variadic": true
+            }
+          ],
+          "static": true,
+          "variadic": true
+        }
+      ],
+      "name": "StaticConsumer"
     }
   },
   "version": "0.0.0",
-  "fingerprint": "Ajk3MslkfbYCrArr+xpk4fCqUsDaJMcCWIRdaVGDWDo="
+  "fingerprint": "nk3lZyZihw8+X5KKk4nmX16b78gkSh2KmOCC72ZlkYk="
 }
diff --git a/packages/jsii-calc/lib/compliance.ts b/packages/jsii-calc/lib/compliance.ts
index 9a396fa4b1..94c433094c 100644
--- a/packages/jsii-calc/lib/compliance.ts
+++ b/packages/jsii-calc/lib/compliance.ts
@@ -1,5 +1,4 @@
 import * as base from '@scope/jsii-calc-base';
-import { StaticConsumer } from '@scope/jsii-calc-base-of-base';
 import {
   EnumFromScopedModule,
   IDoublable,
@@ -291,7 +290,7 @@ export class RuntimeTypeChecking {
    * Used to verify verification of number of method arguments.
    */
   public methodWithOptionalArguments(arg1: number, arg2: string, arg3?: Date) {
-    StaticConsumer.consume(arg1, arg2, arg3);
+    base.StaticConsumer.consume(arg1, arg2, arg3);
   }
 
   public methodWithDefaultedArguments(
@@ -299,11 +298,11 @@ export class RuntimeTypeChecking {
     arg2?: string,
     arg3: Date = new Date(),
   ) {
-    StaticConsumer.consume(arg1, arg2, arg3);
+    base.StaticConsumer.consume(arg1, arg2, arg3);
   }
 
   public methodWithOptionalAnyArgument(arg?: any) {
-    StaticConsumer.consume(arg);
+    base.StaticConsumer.consume(arg);
   }
 }
 
diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json
index 801131b35f..0388913eeb 100644
--- a/packages/jsii-calc/package.json
+++ b/packages/jsii-calc/package.json
@@ -37,18 +37,16 @@
     "watch": "jsii --project-references -w",
     "lint": "eslint . --ext .js,.ts --ignore-path=.gitignore",
     "lint:fix": "yarn lint --fix",
-    "test": "node test/test.calc.js && diff-test test/assembly.jsii .jsii",
+    "test": "(ls test/test.*.js | xargs -n1 node) && diff-test test/assembly.jsii .jsii",
     "test:update": "npm run build && UPDATE_DIFF=1 npm run test"
   },
   "dependencies": {
     "@fixtures/jsii-calc-bundled": "file:../@fixtures/jsii-calc-bundled",
     "@scope/jsii-calc-base": "^0.0.0",
-    "@scope/jsii-calc-base-of-base": "^0.0.0",
     "@scope/jsii-calc-lib": "^0.0.0"
   },
   "peerDependencies": {
     "@scope/jsii-calc-base": "^0.0.0",
-    "@scope/jsii-calc-base-of-base": "^0.0.0",
     "@scope/jsii-calc-lib": "^0.0.0"
   },
   "devDependencies": {
diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii
index 5811672acc..a4cfa423d0 100644
--- a/packages/jsii-calc/test/assembly.jsii
+++ b/packages/jsii-calc/test/assembly.jsii
@@ -38,7 +38,6 @@
   ],
   "dependencies": {
     "@scope/jsii-calc-base": "^0.0.0",
-    "@scope/jsii-calc-base-of-base": "^0.0.0",
     "@scope/jsii-calc-lib": "^0.0.0"
   },
   "dependencyClosure": {
@@ -180,25 +179,25 @@
     "jsii-calc.DerivedClassHasNoProperties": {
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 326
+        "line": 325
       }
     },
     "jsii-calc.InterfaceInNamespaceIncludesClasses": {
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1207
+        "line": 1206
       }
     },
     "jsii-calc.InterfaceInNamespaceOnlyInterface": {
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1200
+        "line": 1199
       }
     },
     "jsii-calc.PythonSelf": {
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1091
+        "line": 1090
       }
     },
     "jsii-calc.composition": {
@@ -309,7 +308,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1251
+        "line": 1250
       },
       "methods": [
         {
@@ -319,7 +318,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1258
+            "line": 1257
           },
           "name": "abstractMethod",
           "parameters": [
@@ -342,7 +341,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1254
+            "line": 1253
           },
           "name": "nonAbstractMethod",
           "returns": {
@@ -361,7 +360,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1260
+            "line": 1259
           },
           "name": "propFromInterface",
           "overrides": "jsii-calc.IInterfaceImplementedByAbstractClass",
@@ -386,7 +385,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1247
+        "line": 1246
       },
       "name": "AbstractClassBase",
       "properties": [
@@ -398,7 +397,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1248
+            "line": 1247
           },
           "name": "abstractProperty",
           "type": {
@@ -421,7 +420,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1275
+        "line": 1274
       },
       "methods": [
         {
@@ -430,7 +429,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1276
+            "line": 1275
           },
           "name": "giveMeAbstract",
           "returns": {
@@ -445,7 +444,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1280
+            "line": 1279
           },
           "name": "giveMeInterface",
           "returns": {
@@ -464,7 +463,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1284
+            "line": 1283
           },
           "name": "returnAbstractFromProperty",
           "type": {
@@ -662,7 +661,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 64
+        "line": 63
       },
       "methods": [
         {
@@ -671,7 +670,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 233
+            "line": 232
           },
           "name": "anyIn",
           "parameters": [
@@ -689,7 +688,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 225
+            "line": 224
           },
           "name": "anyOut",
           "returns": {
@@ -704,7 +703,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 221
+            "line": 220
           },
           "name": "enumMethod",
           "parameters": [
@@ -731,7 +730,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 217
+            "line": 216
           },
           "name": "enumPropertyValue",
           "type": {
@@ -744,7 +743,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 181
+            "line": 180
           },
           "name": "anyArrayProperty",
           "type": {
@@ -762,7 +761,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 182
+            "line": 181
           },
           "name": "anyMapProperty",
           "type": {
@@ -780,7 +779,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 180
+            "line": 179
           },
           "name": "anyProperty",
           "type": {
@@ -793,7 +792,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 166
+            "line": 165
           },
           "name": "arrayProperty",
           "type": {
@@ -811,7 +810,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 69
+            "line": 68
           },
           "name": "booleanProperty",
           "type": {
@@ -824,7 +823,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 115
+            "line": 114
           },
           "name": "dateProperty",
           "type": {
@@ -837,7 +836,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 201
+            "line": 200
           },
           "name": "enumProperty",
           "type": {
@@ -850,7 +849,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 134
+            "line": 133
           },
           "name": "jsonProperty",
           "type": {
@@ -863,7 +862,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 151
+            "line": 150
           },
           "name": "mapProperty",
           "type": {
@@ -881,7 +880,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 100
+            "line": 99
           },
           "name": "numberProperty",
           "type": {
@@ -894,7 +893,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 84
+            "line": 83
           },
           "name": "stringProperty",
           "type": {
@@ -907,7 +906,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 193
+            "line": 192
           },
           "name": "unionArrayProperty",
           "type": {
@@ -934,7 +933,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 194
+            "line": 193
           },
           "name": "unionMapProperty",
           "type": {
@@ -964,7 +963,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 192
+            "line": 191
           },
           "name": "unionProperty",
           "type": {
@@ -992,7 +991,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 187
+            "line": 186
           },
           "name": "unknownArrayProperty",
           "type": {
@@ -1010,7 +1009,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 188
+            "line": 187
           },
           "name": "unknownMapProperty",
           "type": {
@@ -1028,7 +1027,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 186
+            "line": 185
           },
           "name": "unknownProperty",
           "type": {
@@ -1041,7 +1040,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 198
+            "line": 197
           },
           "name": "optionalEnumValue",
           "optional": true,
@@ -1060,7 +1059,7 @@
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 34
+        "line": 33
       },
       "members": [
         {
@@ -1098,7 +1097,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 616
+        "line": 615
       },
       "methods": [
         {
@@ -1107,7 +1106,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 624
+            "line": 623
           },
           "name": "getBar",
           "parameters": [
@@ -1132,7 +1131,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 620
+            "line": 619
           },
           "name": "getFoo",
           "parameters": [
@@ -1155,7 +1154,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 635
+            "line": 634
           },
           "name": "setBar",
           "parameters": [
@@ -1186,7 +1185,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 631
+            "line": 630
           },
           "name": "setFoo",
           "parameters": [
@@ -1219,7 +1218,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2686
+          "line": 2685
         },
         "parameters": [
           {
@@ -1239,7 +1238,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2685
+        "line": 2684
       },
       "name": "AmbiguousParameters",
       "properties": [
@@ -1250,7 +1249,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2688
+            "line": 2687
           },
           "name": "props",
           "type": {
@@ -1264,7 +1263,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2687
+            "line": 2686
           },
           "name": "scope",
           "type": {
@@ -1290,7 +1289,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2215
+        "line": 2214
       },
       "methods": [
         {
@@ -1299,7 +1298,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2219
+            "line": 2218
           },
           "name": "provideAsClass",
           "overrides": "jsii-calc.IAnonymousImplementationProvider",
@@ -1315,7 +1314,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2223
+            "line": 2222
           },
           "name": "provideAsInterface",
           "overrides": "jsii-calc.IAnonymousImplementationProvider",
@@ -1342,7 +1341,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 334
+        "line": 333
       },
       "methods": [
         {
@@ -1352,7 +1351,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 335
+            "line": 334
           },
           "name": "callMe",
           "returns": {
@@ -1369,7 +1368,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 354
+            "line": 353
           },
           "name": "callMe2",
           "returns": {
@@ -1387,7 +1386,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 364
+            "line": 363
           },
           "name": "callMeDoublePromise",
           "returns": {
@@ -1402,7 +1401,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 372
+            "line": 371
           },
           "name": "dontOverrideMe",
           "returns": {
@@ -1418,7 +1417,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 343
+            "line": 342
           },
           "name": "overrideMe",
           "parameters": [
@@ -1442,7 +1441,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 347
+            "line": 346
           },
           "name": "overrideMeToo",
           "returns": {
@@ -1468,7 +1467,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1542
+        "line": 1541
       },
       "methods": [
         {
@@ -1477,7 +1476,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1543
+            "line": 1542
           },
           "name": "methodOne"
         },
@@ -1487,7 +1486,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1549
+            "line": 1548
           },
           "name": "methodTwo"
         }
@@ -1508,7 +1507,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2480
+        "line": 2479
       },
       "name": "BaseJsii976"
     },
@@ -1529,7 +1528,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2424
+        "line": 2423
       },
       "methods": [
         {
@@ -1538,7 +1537,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2427
+            "line": 2426
           },
           "name": "ring",
           "overrides": "jsii-calc.IBell"
@@ -1552,7 +1551,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2425
+            "line": 2424
           },
           "name": "rung",
           "type": {
@@ -1677,7 +1676,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2770
+        "line": 2769
       },
       "methods": [
         {
@@ -1686,7 +1685,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2771
+            "line": 2770
           },
           "name": "check",
           "returns": {
@@ -1704,7 +1703,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2788
+            "line": 2787
           },
           "name": "giveItBack",
           "parameters": [
@@ -2038,7 +2037,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2504
+        "line": 2503
       },
       "name": "ChildStruct982",
       "properties": [
@@ -2050,7 +2049,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2505
+            "line": 2504
           },
           "name": "bar",
           "type": {
@@ -2076,7 +2075,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1805
+        "line": 1804
       },
       "name": "ClassThatImplementsTheInternalInterface",
       "properties": [
@@ -2086,7 +2085,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1809
+            "line": 1808
           },
           "name": "a",
           "overrides": "jsii-calc.IAnotherPublicInterface",
@@ -2100,7 +2099,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1810
+            "line": 1809
           },
           "name": "b",
           "overrides": "jsii-calc.INonInternalInterface",
@@ -2114,7 +2113,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1811
+            "line": 1810
           },
           "name": "c",
           "overrides": "jsii-calc.INonInternalInterface",
@@ -2128,7 +2127,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1812
+            "line": 1811
           },
           "name": "d",
           "type": {
@@ -2154,7 +2153,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1815
+        "line": 1814
       },
       "name": "ClassThatImplementsThePrivateInterface",
       "properties": [
@@ -2164,7 +2163,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1817
+            "line": 1816
           },
           "name": "a",
           "overrides": "jsii-calc.IAnotherPublicInterface",
@@ -2178,7 +2177,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1818
+            "line": 1817
           },
           "name": "b",
           "overrides": "jsii-calc.INonInternalInterface",
@@ -2192,7 +2191,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1819
+            "line": 1818
           },
           "name": "c",
           "overrides": "jsii-calc.INonInternalInterface",
@@ -2206,7 +2205,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1820
+            "line": 1819
           },
           "name": "e",
           "type": {
@@ -2227,7 +2226,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2121
+          "line": 2120
         },
         "parameters": [
           {
@@ -2257,7 +2256,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2111
+        "line": 2110
       },
       "methods": [
         {
@@ -2266,7 +2265,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2126
+            "line": 2125
           },
           "name": "createAList",
           "returns": {
@@ -2287,7 +2286,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2130
+            "line": 2129
           },
           "name": "createAMap",
           "returns": {
@@ -2311,7 +2310,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2119
+            "line": 2118
           },
           "name": "staticArray",
           "static": true,
@@ -2330,7 +2329,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2115
+            "line": 2114
           },
           "name": "staticMap",
           "static": true,
@@ -2349,7 +2348,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2113
+            "line": 2112
           },
           "name": "array",
           "type": {
@@ -2367,7 +2366,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2112
+            "line": 2111
           },
           "name": "map",
           "type": {
@@ -2402,7 +2401,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1888
+        "line": 1887
       },
       "name": "ClassWithDocs"
     },
@@ -2418,7 +2417,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2061
+          "line": 2060
         },
         "parameters": [
           {
@@ -2432,7 +2431,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2058
+        "line": 2057
       },
       "methods": [
         {
@@ -2441,7 +2440,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2065
+            "line": 2064
           },
           "name": "import",
           "parameters": [
@@ -2468,7 +2467,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2059
+            "line": 2058
           },
           "name": "int",
           "type": {
@@ -2491,7 +2490,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1295
+        "line": 1294
       },
       "name": "ClassWithMutableObjectLiteralProperty",
       "properties": [
@@ -2501,7 +2500,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1296
+            "line": 1295
           },
           "name": "mutableObject",
           "type": {
@@ -2523,7 +2522,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1322
+        "line": 1321
       },
       "methods": [
         {
@@ -2532,7 +2531,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1324
+            "line": 1323
           },
           "name": "create",
           "parameters": [
@@ -2566,7 +2565,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1332
+            "line": 1331
           },
           "name": "readOnlyString",
           "overrides": "jsii-calc.IInterfaceWithProperties",
@@ -2580,7 +2579,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1333
+            "line": 1332
           },
           "name": "readWriteString",
           "overrides": "jsii-calc.IInterfaceWithProperties",
@@ -2601,7 +2600,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2643
+        "line": 2642
       },
       "methods": [
         {
@@ -2610,7 +2609,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2644
+            "line": 2643
           },
           "name": "makeInstance",
           "returns": {
@@ -2626,7 +2625,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2648
+            "line": 2647
           },
           "name": "makeStructInstance",
           "returns": {
@@ -2645,7 +2644,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2652
+            "line": 2651
           },
           "name": "unionProperty",
           "optional": true,
@@ -2688,7 +2687,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2656
+        "line": 2655
       },
       "name": "ConfusingToJacksonStruct",
       "properties": [
@@ -2700,7 +2699,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2657
+            "line": 2656
           },
           "name": "unionProperty",
           "optional": true,
@@ -2745,7 +2744,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1845
+          "line": 1844
         },
         "parameters": [
           {
@@ -2759,7 +2758,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1844
+        "line": 1843
       },
       "name": "ConstructorPassesThisOut"
     },
@@ -2777,7 +2776,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1590
+        "line": 1589
       },
       "methods": [
         {
@@ -2786,7 +2785,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1607
+            "line": 1606
           },
           "name": "hiddenInterface",
           "returns": {
@@ -2802,7 +2801,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1611
+            "line": 1610
           },
           "name": "hiddenInterfaces",
           "returns": {
@@ -2823,7 +2822,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1615
+            "line": 1614
           },
           "name": "hiddenSubInterfaces",
           "returns": {
@@ -2844,7 +2843,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1591
+            "line": 1590
           },
           "name": "makeClass",
           "returns": {
@@ -2860,7 +2859,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1595
+            "line": 1594
           },
           "name": "makeInterface",
           "returns": {
@@ -2876,7 +2875,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1599
+            "line": 1598
           },
           "name": "makeInterface2",
           "returns": {
@@ -2892,7 +2891,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1603
+            "line": 1602
           },
           "name": "makeInterfaces",
           "returns": {
@@ -2922,7 +2921,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2667
+          "line": 2666
         },
         "parameters": [
           {
@@ -2936,7 +2935,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2666
+        "line": 2665
       },
       "methods": [
         {
@@ -2945,7 +2944,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2669
+            "line": 2668
           },
           "name": "workItBaby",
           "returns": {
@@ -2973,7 +2972,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2309
+        "line": 2308
       },
       "methods": [
         {
@@ -2984,7 +2983,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2315
+            "line": 2314
           },
           "name": "staticImplementedByObjectLiteral",
           "parameters": [
@@ -3010,7 +3009,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2341
+            "line": 2340
           },
           "name": "staticImplementedByPrivateClass",
           "parameters": [
@@ -3036,7 +3035,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2330
+            "line": 2329
           },
           "name": "staticImplementedByPublicClass",
           "parameters": [
@@ -3062,7 +3061,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2352
+            "line": 2351
           },
           "name": "staticWhenTypedAsClass",
           "parameters": [
@@ -3088,7 +3087,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2362
+            "line": 2361
           },
           "name": "implementedByObjectLiteral",
           "parameters": [
@@ -3113,7 +3112,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2388
+            "line": 2387
           },
           "name": "implementedByPrivateClass",
           "parameters": [
@@ -3138,7 +3137,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2377
+            "line": 2376
           },
           "name": "implementedByPublicClass",
           "parameters": [
@@ -3163,7 +3162,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2399
+            "line": 2398
           },
           "name": "whenTypedAsClass",
           "parameters": [
@@ -3197,7 +3196,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1823
+        "line": 1822
       },
       "methods": [
         {
@@ -3206,7 +3205,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1824
+            "line": 1823
           },
           "name": "consumeAnotherPublicInterface",
           "parameters": [
@@ -3229,7 +3228,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1828
+            "line": 1827
           },
           "name": "consumeNonInternalInterface",
           "parameters": [
@@ -3264,7 +3263,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1984
+        "line": 1983
       },
       "methods": [
         {
@@ -3273,7 +3272,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1985
+            "line": 1984
           },
           "name": "render",
           "parameters": [
@@ -3297,7 +3296,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1991
+            "line": 1990
           },
           "name": "renderArbitrary",
           "parameters": [
@@ -3325,7 +3324,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1995
+            "line": 1994
           },
           "name": "renderMap",
           "parameters": [
@@ -3362,7 +3361,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 319
+          "line": 318
         },
         "parameters": [
           {
@@ -3391,7 +3390,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 318
+        "line": 317
       },
       "name": "DefaultedConstructorArgument",
       "properties": [
@@ -3402,7 +3401,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 320
+            "line": 319
           },
           "name": "arg1",
           "type": {
@@ -3416,7 +3415,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 322
+            "line": 321
           },
           "name": "arg3",
           "type": {
@@ -3430,7 +3429,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 321
+            "line": 320
           },
           "name": "arg2",
           "optional": true,
@@ -3456,7 +3455,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2511
+        "line": 2510
       },
       "methods": [
         {
@@ -3466,7 +3465,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2518
+            "line": 2517
           },
           "name": "takeThis",
           "returns": {
@@ -3483,7 +3482,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2523
+            "line": 2522
           },
           "name": "takeThisToo",
           "returns": {
@@ -3657,7 +3656,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 327
+        "line": 326
       },
       "name": "Base",
       "namespace": "DerivedClassHasNoProperties",
@@ -3668,7 +3667,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 328
+            "line": 327
           },
           "name": "prop",
           "type": {
@@ -3692,7 +3691,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 331
+        "line": 330
       },
       "name": "Derived",
       "namespace": "DerivedClassHasNoProperties"
@@ -3711,7 +3710,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 542
+        "line": 541
       },
       "name": "DerivedStruct",
       "properties": [
@@ -3723,7 +3722,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 548
+            "line": 547
           },
           "name": "anotherRequired",
           "type": {
@@ -3738,7 +3737,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 547
+            "line": 546
           },
           "name": "bool",
           "type": {
@@ -3754,7 +3753,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 546
+            "line": 545
           },
           "name": "nonPrimitive",
           "type": {
@@ -3770,7 +3769,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 554
+            "line": 553
           },
           "name": "anotherOptional",
           "optional": true,
@@ -3791,7 +3790,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 550
+            "line": 549
           },
           "name": "optionalAny",
           "optional": true,
@@ -3807,7 +3806,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 549
+            "line": 548
           },
           "name": "optionalArray",
           "optional": true,
@@ -3832,7 +3831,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2029
+        "line": 2028
       },
       "name": "DiamondInheritanceBaseLevelStruct",
       "properties": [
@@ -3844,7 +3843,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2030
+            "line": 2029
           },
           "name": "baseLevelProperty",
           "type": {
@@ -3866,7 +3865,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2033
+        "line": 2032
       },
       "name": "DiamondInheritanceFirstMidLevelStruct",
       "properties": [
@@ -3878,7 +3877,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2035
+            "line": 2034
           },
           "name": "firstMidLevelProperty",
           "type": {
@@ -3900,7 +3899,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2038
+        "line": 2037
       },
       "name": "DiamondInheritanceSecondMidLevelStruct",
       "properties": [
@@ -3912,7 +3911,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2040
+            "line": 2039
           },
           "name": "secondMidLevelProperty",
           "type": {
@@ -3935,7 +3934,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2043
+        "line": 2042
       },
       "name": "DiamondInheritanceTopLevelStruct",
       "properties": [
@@ -3947,7 +3946,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2046
+            "line": 2045
           },
           "name": "topLevelProperty",
           "type": {
@@ -3967,7 +3966,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2533
+        "line": 2532
       },
       "name": "DisappointingCollectionSource",
       "properties": [
@@ -3981,7 +3980,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2535
+            "line": 2534
           },
           "name": "maybeList",
           "optional": true,
@@ -4005,7 +4004,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2537
+            "line": 2536
           },
           "name": "maybeMap",
           "optional": true,
@@ -4035,7 +4034,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1299
+        "line": 1298
       },
       "methods": [
         {
@@ -4044,7 +4043,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1314
+            "line": 1313
           },
           "name": "changePrivatePropertyValue",
           "parameters": [
@@ -4062,7 +4061,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1306
+            "line": 1305
           },
           "name": "privateMethodValue",
           "returns": {
@@ -4077,7 +4076,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1310
+            "line": 1309
           },
           "name": "privatePropertyValue",
           "returns": {
@@ -4104,7 +4103,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1355
+        "line": 1354
       },
       "methods": [
         {
@@ -4113,7 +4112,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1356
+            "line": 1355
           },
           "name": "method",
           "parameters": [
@@ -4219,7 +4218,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1432
+        "line": 1431
       },
       "methods": [
         {
@@ -4228,7 +4227,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1433
+            "line": 1432
           },
           "name": "optionalAndVariadic",
           "parameters": [
@@ -4274,7 +4273,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 486
+        "line": 485
       },
       "methods": [
         {
@@ -4284,7 +4283,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 491
+            "line": 490
           },
           "name": "hello",
           "overrides": "@scope/jsii-calc-lib.IFriendly",
@@ -4301,7 +4300,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 487
+            "line": 486
           },
           "name": "next",
           "overrides": "jsii-calc.IRandomNumberGenerator",
@@ -4327,7 +4326,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2795
+          "line": 2794
         },
         "parameters": [
           {
@@ -4341,7 +4340,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2794
+        "line": 2793
       },
       "name": "DynamicPropertyBearer",
       "properties": [
@@ -4351,7 +4350,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2797
+            "line": 2796
           },
           "name": "dynamicProperty",
           "type": {
@@ -4364,7 +4363,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2795
+            "line": 2794
           },
           "name": "valueStore",
           "type": {
@@ -4386,7 +4385,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2806
+          "line": 2805
         },
         "parameters": [
           {
@@ -4400,7 +4399,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2805
+        "line": 2804
       },
       "methods": [
         {
@@ -4411,7 +4410,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2817
+            "line": 2816
           },
           "name": "overrideValue",
           "parameters": [
@@ -4441,7 +4440,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2806
+            "line": 2805
           },
           "name": "originalValue",
           "type": {
@@ -4543,7 +4542,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 46
+        "line": 45
       },
       "methods": [
         {
@@ -4552,7 +4551,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 52
+            "line": 51
           },
           "name": "randomIntegerLikeEnum",
           "returns": {
@@ -4568,7 +4567,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 47
+            "line": 46
           },
           "name": "randomStringLikeEnum",
           "returns": {
@@ -4595,7 +4594,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1646
+        "line": 1645
       },
       "methods": [
         {
@@ -4606,7 +4605,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1651
+            "line": 1650
           },
           "name": "doesKeyExist",
           "parameters": [
@@ -4637,7 +4636,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1671
+            "line": 1670
           },
           "name": "prop1IsNull",
           "returns": {
@@ -4659,7 +4658,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1661
+            "line": 1660
           },
           "name": "prop2IsUndefined",
           "returns": {
@@ -4687,7 +4686,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1641
+        "line": 1640
       },
       "name": "EraseUndefinedHashValuesOptions",
       "properties": [
@@ -4699,7 +4698,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1642
+            "line": 1641
           },
           "name": "option1",
           "optional": true,
@@ -4715,7 +4714,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1643
+            "line": 1642
           },
           "name": "option2",
           "optional": true,
@@ -4874,7 +4873,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1518
+          "line": 1517
         },
         "parameters": [
           {
@@ -4888,7 +4887,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1517
+        "line": 1516
       },
       "name": "ExportedBaseClass",
       "properties": [
@@ -4899,7 +4898,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1518
+            "line": 1517
           },
           "name": "success",
           "type": {
@@ -4918,7 +4917,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1760
+        "line": 1759
       },
       "name": "ExtendsInternalInterface",
       "properties": [
@@ -4930,7 +4929,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1761
+            "line": 1760
           },
           "name": "boom",
           "type": {
@@ -4945,7 +4944,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1701
+            "line": 1700
           },
           "name": "prop",
           "type": {
@@ -5135,7 +5134,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 557
+        "line": 556
       },
       "methods": [
         {
@@ -5145,7 +5144,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 575
+            "line": 574
           },
           "name": "derivedToFirst",
           "parameters": [
@@ -5169,7 +5168,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 568
+            "line": 567
           },
           "name": "readDerivedNonPrimitive",
           "parameters": [
@@ -5193,7 +5192,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 561
+            "line": 560
           },
           "name": "readFirstNumber",
           "parameters": [
@@ -5220,7 +5219,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 579
+            "line": 578
           },
           "name": "structLiteral",
           "type": {
@@ -5278,7 +5277,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 533
+        "line": 532
       },
       "methods": [
         {
@@ -5287,7 +5286,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 534
+            "line": 533
           },
           "name": "betterGreeting",
           "parameters": [
@@ -5317,7 +5316,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2211
+        "line": 2210
       },
       "methods": [
         {
@@ -5327,7 +5326,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2213
+            "line": 2212
           },
           "name": "provideAsClass",
           "returns": {
@@ -5343,7 +5342,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2212
+            "line": 2211
           },
           "name": "provideAsInterface",
           "returns": {
@@ -5364,7 +5363,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2230
+        "line": 2229
       },
       "methods": [
         {
@@ -5374,7 +5373,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2232
+            "line": 2231
           },
           "name": "verb",
           "returns": {
@@ -5394,7 +5393,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2231
+            "line": 2230
           },
           "name": "value",
           "type": {
@@ -5412,7 +5411,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1781
+        "line": 1780
       },
       "name": "IAnotherPublicInterface",
       "properties": [
@@ -5423,7 +5422,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1782
+            "line": 1781
           },
           "name": "a",
           "type": {
@@ -5441,7 +5440,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2420
+        "line": 2419
       },
       "methods": [
         {
@@ -5451,7 +5450,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2421
+            "line": 2420
           },
           "name": "ring"
         }
@@ -5468,7 +5467,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2409
+        "line": 2408
       },
       "methods": [
         {
@@ -5478,7 +5477,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2410
+            "line": 2409
           },
           "name": "yourTurn",
           "parameters": [
@@ -5503,7 +5502,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2416
+        "line": 2415
       },
       "methods": [
         {
@@ -5513,7 +5512,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2417
+            "line": 2416
           },
           "name": "yourTurn",
           "parameters": [
@@ -5626,7 +5625,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1772
+        "line": 1771
       },
       "name": "IExtendsPrivateInterface",
       "properties": [
@@ -5638,7 +5637,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1773
+            "line": 1772
           },
           "name": "moreThings",
           "type": {
@@ -5657,7 +5656,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1757
+            "line": 1756
           },
           "name": "private",
           "type": {
@@ -5799,7 +5798,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1243
+        "line": 1242
       },
       "name": "IInterfaceImplementedByAbstractClass",
       "properties": [
@@ -5811,7 +5810,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1244
+            "line": 1243
           },
           "name": "propFromInterface",
           "type": {
@@ -5833,7 +5832,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1347
+        "line": 1346
       },
       "name": "IInterfaceThatShouldNotBeADataType",
       "properties": [
@@ -5845,7 +5844,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1349
+            "line": 1348
           },
           "name": "otherValue",
           "type": {
@@ -5863,7 +5862,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1712
+        "line": 1711
       },
       "methods": [
         {
@@ -5873,7 +5872,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1713
+            "line": 1712
           },
           "name": "visible"
         }
@@ -5889,7 +5888,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1337
+        "line": 1336
       },
       "methods": [
         {
@@ -5899,7 +5898,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1340
+            "line": 1339
           },
           "name": "doThings"
         }
@@ -5914,7 +5913,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1338
+            "line": 1337
           },
           "name": "value",
           "type": {
@@ -5933,7 +5932,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1221
+        "line": 1220
       },
       "methods": [
         {
@@ -5943,7 +5942,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1222
+            "line": 1221
           },
           "name": "hello",
           "parameters": [
@@ -5974,7 +5973,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 587
+        "line": 586
       },
       "name": "IInterfaceWithProperties",
       "properties": [
@@ -5986,7 +5985,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 588
+            "line": 587
           },
           "name": "readOnlyString",
           "type": {
@@ -6000,7 +5999,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 589
+            "line": 588
           },
           "name": "readWriteString",
           "type": {
@@ -6021,7 +6020,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 592
+        "line": 591
       },
       "name": "IInterfaceWithPropertiesExtension",
       "properties": [
@@ -6032,7 +6031,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 594
+            "line": 593
           },
           "name": "foo",
           "type": {
@@ -6189,7 +6188,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1291
+        "line": 1290
       },
       "name": "IMutableObjectLiteral",
       "properties": [
@@ -6200,7 +6199,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1292
+            "line": 1291
           },
           "name": "value",
           "type": {
@@ -6221,7 +6220,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1790
+        "line": 1789
       },
       "name": "INonInternalInterface",
       "properties": [
@@ -6232,7 +6231,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1787
+            "line": 1786
           },
           "name": "b",
           "type": {
@@ -6246,7 +6245,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1791
+            "line": 1790
           },
           "name": "c",
           "type": {
@@ -6265,7 +6264,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2545
+        "line": 2544
       },
       "methods": [
         {
@@ -6275,7 +6274,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2547
+            "line": 2546
           },
           "name": "wasSet",
           "returns": {
@@ -6294,7 +6293,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2546
+            "line": 2545
           },
           "name": "property",
           "type": {
@@ -6313,7 +6312,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2734
+        "line": 2733
       },
       "methods": [
         {
@@ -6323,7 +6322,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2735
+            "line": 2734
           },
           "name": "optional",
           "returns": {
@@ -6345,7 +6344,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1514
+        "line": 1513
       },
       "name": "IPrivatelyImplemented",
       "properties": [
@@ -6357,7 +6356,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1515
+            "line": 1514
           },
           "name": "success",
           "type": {
@@ -6375,7 +6374,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1561
+        "line": 1560
       },
       "methods": [
         {
@@ -6385,7 +6384,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1562
+            "line": 1561
           },
           "name": "bye",
           "returns": {
@@ -6406,7 +6405,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1565
+        "line": 1564
       },
       "methods": [
         {
@@ -6416,7 +6415,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1566
+            "line": 1565
           },
           "name": "ciao",
           "returns": {
@@ -6472,7 +6471,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2476
+        "line": 2475
       },
       "name": "IReturnJsii976",
       "properties": [
@@ -6484,7 +6483,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2477
+            "line": 2476
           },
           "name": "foo",
           "type": {
@@ -6502,7 +6501,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 640
+        "line": 639
       },
       "methods": [
         {
@@ -6512,7 +6511,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 641
+            "line": 640
           },
           "name": "obtainNumber",
           "returns": {
@@ -6532,7 +6531,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 643
+            "line": 642
           },
           "name": "numberProp",
           "type": {
@@ -6594,7 +6593,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2663
+        "line": 2662
       },
       "methods": [
         {
@@ -6604,7 +6603,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2664
+            "line": 2663
           },
           "name": "returnStruct",
           "returns": {
@@ -6663,7 +6662,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1764
+        "line": 1763
       },
       "name": "ImplementInternalInterface",
       "properties": [
@@ -6673,7 +6672,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1765
+            "line": 1764
           },
           "name": "prop",
           "type": {
@@ -6696,7 +6695,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2227
+        "line": 2226
       },
       "name": "Implementation",
       "properties": [
@@ -6707,7 +6706,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2228
+            "line": 2227
           },
           "name": "value",
           "type": {
@@ -6733,7 +6732,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1719
+        "line": 1718
       },
       "methods": [
         {
@@ -6742,7 +6741,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1720
+            "line": 1719
           },
           "name": "visible",
           "overrides": "jsii-calc.IInterfaceWithInternal"
@@ -6765,7 +6764,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1738
+        "line": 1737
       },
       "name": "ImplementsInterfaceWithInternalSubclass"
     },
@@ -6783,7 +6782,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1768
+        "line": 1767
       },
       "name": "ImplementsPrivateInterface",
       "properties": [
@@ -6793,7 +6792,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1769
+            "line": 1768
           },
           "name": "private",
           "type": {
@@ -6815,7 +6814,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1177
+        "line": 1176
       },
       "name": "ImplictBaseOfBase",
       "properties": [
@@ -6827,7 +6826,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1178
+            "line": 1177
           },
           "name": "goo",
           "type": {
@@ -6854,7 +6853,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1568
+        "line": 1567
       },
       "methods": [
         {
@@ -6863,7 +6862,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1569
+            "line": 1568
           },
           "name": "ciao",
           "overrides": "jsii-calc.IPublicInterface2",
@@ -6887,7 +6886,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2697
+        "line": 2696
       },
       "methods": [
         {
@@ -6896,7 +6895,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2708
+            "line": 2707
           },
           "name": "listOfInterfaces",
           "returns": {
@@ -6917,7 +6916,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2698
+            "line": 2697
           },
           "name": "listOfStructs",
           "returns": {
@@ -6938,7 +6937,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2718
+            "line": 2717
           },
           "name": "mapOfInterfaces",
           "returns": {
@@ -6959,7 +6958,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2702
+            "line": 2701
           },
           "name": "mapOfStructs",
           "returns": {
@@ -6991,7 +6990,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1208
+        "line": 1207
       },
       "name": "Foo",
       "namespace": "InterfaceInNamespaceIncludesClasses",
@@ -7002,7 +7001,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1209
+            "line": 1208
           },
           "name": "bar",
           "optional": true,
@@ -7022,7 +7021,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1212
+        "line": 1211
       },
       "name": "Hello",
       "namespace": "InterfaceInNamespaceIncludesClasses",
@@ -7035,7 +7034,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1213
+            "line": 1212
           },
           "name": "foo",
           "type": {
@@ -7054,7 +7053,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1202
+        "line": 1201
       },
       "name": "Hello",
       "namespace": "InterfaceInNamespaceOnlyInterface",
@@ -7067,7 +7066,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1203
+            "line": 1202
           },
           "name": "foo",
           "type": {
@@ -7086,7 +7085,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2099
+        "line": 2098
       },
       "methods": [
         {
@@ -7095,7 +7094,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2100
+            "line": 2099
           },
           "name": "makeInterfaces",
           "parameters": [
@@ -7138,7 +7137,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2744
+        "line": 2743
       },
       "methods": [
         {
@@ -7147,7 +7146,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2745
+            "line": 2744
           },
           "name": "myself",
           "returns": {
@@ -7305,7 +7304,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 518
+        "line": 517
       },
       "methods": [
         {
@@ -7314,7 +7313,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 519
+            "line": 518
           },
           "name": "giveMeFriendly",
           "returns": {
@@ -7329,7 +7328,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 525
+            "line": 524
           },
           "name": "giveMeFriendlyGenerator",
           "returns": {
@@ -7355,7 +7354,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 248
+        "line": 247
       },
       "methods": [
         {
@@ -7364,7 +7363,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 249
+            "line": 248
           },
           "name": "returnLiteral",
           "returns": {
@@ -7390,7 +7389,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 257
+        "line": 256
       },
       "name": "JSObjectLiteralToNativeClass",
       "properties": [
@@ -7400,7 +7399,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 258
+            "line": 257
           },
           "name": "propA",
           "type": {
@@ -7413,7 +7412,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 259
+            "line": 258
           },
           "name": "propB",
           "type": {
@@ -7436,7 +7435,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 746
+        "line": 745
       },
       "methods": [
         {
@@ -7445,7 +7444,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 747
+            "line": 746
           },
           "name": "abstract"
         },
@@ -7455,7 +7454,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 751
+            "line": 750
           },
           "name": "assert"
         },
@@ -7465,7 +7464,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 755
+            "line": 754
           },
           "name": "boolean"
         },
@@ -7475,7 +7474,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 759
+            "line": 758
           },
           "name": "break"
         },
@@ -7485,7 +7484,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 763
+            "line": 762
           },
           "name": "byte"
         },
@@ -7495,7 +7494,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 767
+            "line": 766
           },
           "name": "case"
         },
@@ -7505,7 +7504,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 771
+            "line": 770
           },
           "name": "catch"
         },
@@ -7515,7 +7514,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 775
+            "line": 774
           },
           "name": "char"
         },
@@ -7525,7 +7524,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 779
+            "line": 778
           },
           "name": "class"
         },
@@ -7535,7 +7534,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 783
+            "line": 782
           },
           "name": "const"
         },
@@ -7545,7 +7544,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 787
+            "line": 786
           },
           "name": "continue"
         },
@@ -7555,7 +7554,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 791
+            "line": 790
           },
           "name": "default"
         },
@@ -7565,7 +7564,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 799
+            "line": 798
           },
           "name": "do"
         },
@@ -7575,7 +7574,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 795
+            "line": 794
           },
           "name": "double"
         },
@@ -7585,7 +7584,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 803
+            "line": 802
           },
           "name": "else"
         },
@@ -7595,7 +7594,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 807
+            "line": 806
           },
           "name": "enum"
         },
@@ -7605,7 +7604,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 811
+            "line": 810
           },
           "name": "extends"
         },
@@ -7615,7 +7614,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 815
+            "line": 814
           },
           "name": "false"
         },
@@ -7625,7 +7624,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 819
+            "line": 818
           },
           "name": "final"
         },
@@ -7635,7 +7634,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 823
+            "line": 822
           },
           "name": "finally"
         },
@@ -7645,7 +7644,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 827
+            "line": 826
           },
           "name": "float"
         },
@@ -7655,7 +7654,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 831
+            "line": 830
           },
           "name": "for"
         },
@@ -7665,7 +7664,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 835
+            "line": 834
           },
           "name": "goto"
         },
@@ -7675,7 +7674,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 839
+            "line": 838
           },
           "name": "if"
         },
@@ -7685,7 +7684,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 843
+            "line": 842
           },
           "name": "implements"
         },
@@ -7695,7 +7694,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 847
+            "line": 846
           },
           "name": "import"
         },
@@ -7705,7 +7704,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 851
+            "line": 850
           },
           "name": "instanceof"
         },
@@ -7715,7 +7714,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 855
+            "line": 854
           },
           "name": "int"
         },
@@ -7725,7 +7724,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 859
+            "line": 858
           },
           "name": "interface"
         },
@@ -7735,7 +7734,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 863
+            "line": 862
           },
           "name": "long"
         },
@@ -7745,7 +7744,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 867
+            "line": 866
           },
           "name": "native"
         },
@@ -7755,7 +7754,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 871
+            "line": 870
           },
           "name": "new"
         },
@@ -7765,7 +7764,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 875
+            "line": 874
           },
           "name": "null"
         },
@@ -7775,7 +7774,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 879
+            "line": 878
           },
           "name": "package"
         },
@@ -7785,7 +7784,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 883
+            "line": 882
           },
           "name": "private"
         },
@@ -7795,7 +7794,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 887
+            "line": 886
           },
           "name": "protected"
         },
@@ -7805,7 +7804,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 891
+            "line": 890
           },
           "name": "public"
         },
@@ -7815,7 +7814,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 895
+            "line": 894
           },
           "name": "return"
         },
@@ -7825,7 +7824,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 899
+            "line": 898
           },
           "name": "short"
         },
@@ -7835,7 +7834,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 903
+            "line": 902
           },
           "name": "static"
         },
@@ -7845,7 +7844,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 907
+            "line": 906
           },
           "name": "strictfp"
         },
@@ -7855,7 +7854,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 911
+            "line": 910
           },
           "name": "super"
         },
@@ -7865,7 +7864,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 915
+            "line": 914
           },
           "name": "switch"
         },
@@ -7875,7 +7874,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 919
+            "line": 918
           },
           "name": "synchronized"
         },
@@ -7885,7 +7884,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 923
+            "line": 922
           },
           "name": "this"
         },
@@ -7895,7 +7894,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 927
+            "line": 926
           },
           "name": "throw"
         },
@@ -7905,7 +7904,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 931
+            "line": 930
           },
           "name": "throws"
         },
@@ -7915,7 +7914,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 935
+            "line": 934
           },
           "name": "transient"
         },
@@ -7925,7 +7924,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 939
+            "line": 938
           },
           "name": "true"
         },
@@ -7935,7 +7934,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 943
+            "line": 942
           },
           "name": "try"
         },
@@ -7945,7 +7944,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 947
+            "line": 946
           },
           "name": "void"
         },
@@ -7955,7 +7954,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 951
+            "line": 950
           },
           "name": "volatile"
         }
@@ -7968,7 +7967,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 955
+            "line": 954
           },
           "name": "while",
           "type": {
@@ -8035,7 +8034,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1531
+        "line": 1530
       },
       "name": "JsiiAgent",
       "properties": [
@@ -8047,7 +8046,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1535
+            "line": 1534
           },
           "name": "value",
           "optional": true,
@@ -8069,7 +8068,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2578
+        "line": 2577
       },
       "methods": [
         {
@@ -8078,7 +8077,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2623
+            "line": 2622
           },
           "name": "anyArray",
           "returns": {
@@ -8094,7 +8093,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2619
+            "line": 2618
           },
           "name": "anyBooleanFalse",
           "returns": {
@@ -8110,7 +8109,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2615
+            "line": 2614
           },
           "name": "anyBooleanTrue",
           "returns": {
@@ -8126,7 +8125,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2595
+            "line": 2594
           },
           "name": "anyDate",
           "returns": {
@@ -8142,7 +8141,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2611
+            "line": 2610
           },
           "name": "anyEmptyString",
           "returns": {
@@ -8158,7 +8157,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2591
+            "line": 2590
           },
           "name": "anyFunction",
           "returns": {
@@ -8174,7 +8173,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2627
+            "line": 2626
           },
           "name": "anyHash",
           "returns": {
@@ -8190,7 +8189,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2583
+            "line": 2582
           },
           "name": "anyNull",
           "returns": {
@@ -8206,7 +8205,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2599
+            "line": 2598
           },
           "name": "anyNumber",
           "returns": {
@@ -8222,7 +8221,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2631
+            "line": 2630
           },
           "name": "anyRef",
           "returns": {
@@ -8238,7 +8237,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2607
+            "line": 2606
           },
           "name": "anyString",
           "returns": {
@@ -8254,7 +8253,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2587
+            "line": 2586
           },
           "name": "anyUndefined",
           "returns": {
@@ -8270,7 +8269,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2603
+            "line": 2602
           },
           "name": "anyZero",
           "returns": {
@@ -8286,7 +8285,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2579
+            "line": 2578
           },
           "name": "stringify",
           "parameters": [
@@ -8322,7 +8321,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2829
+          "line": 2828
         },
         "parameters": [
           {
@@ -8336,7 +8335,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2828
+        "line": 2827
       },
       "name": "LevelOne",
       "properties": [
@@ -8347,7 +8346,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2829
+            "line": 2828
           },
           "name": "props",
           "type": {
@@ -8366,7 +8365,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2839
+        "line": 2838
       },
       "name": "PropBooleanValue",
       "namespace": "LevelOne",
@@ -8379,7 +8378,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2840
+            "line": 2839
           },
           "name": "value",
           "type": {
@@ -8398,7 +8397,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2835
+        "line": 2834
       },
       "name": "PropProperty",
       "namespace": "LevelOne",
@@ -8411,7 +8410,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2836
+            "line": 2835
           },
           "name": "prop",
           "type": {
@@ -8430,7 +8429,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2831
+        "line": 2830
       },
       "name": "LevelOneProps",
       "properties": [
@@ -8442,7 +8441,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2832
+            "line": 2831
           },
           "name": "prop",
           "type": {
@@ -8462,7 +8461,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1441
+        "line": 1440
       },
       "name": "LoadBalancedFargateServiceProps",
       "properties": [
@@ -8477,7 +8476,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1484
+            "line": 1483
           },
           "name": "containerPort",
           "optional": true,
@@ -8496,7 +8495,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1455
+            "line": 1454
           },
           "name": "cpu",
           "optional": true,
@@ -8515,7 +8514,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1477
+            "line": 1476
           },
           "name": "memoryMiB",
           "optional": true,
@@ -8533,7 +8532,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1491
+            "line": 1490
           },
           "name": "publicLoadBalancer",
           "optional": true,
@@ -8551,7 +8550,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1498
+            "line": 1497
           },
           "name": "publicTasks",
           "optional": true,
@@ -8913,7 +8912,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2452
+        "line": 2451
       },
       "name": "NestedStruct",
       "properties": [
@@ -8926,7 +8925,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2456
+            "line": 2455
           },
           "name": "numberProp",
           "type": {
@@ -8950,7 +8949,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1127
+        "line": 1126
       },
       "methods": [
         {
@@ -8961,7 +8960,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1158
+            "line": 1157
           },
           "name": "cryptoSha256",
           "returns": {
@@ -8979,7 +8978,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1132
+            "line": 1131
           },
           "name": "fsReadFile",
           "returns": {
@@ -8996,7 +8995,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1141
+            "line": 1140
           },
           "name": "fsReadFileSync",
           "returns": {
@@ -9016,7 +9015,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1150
+            "line": 1149
           },
           "name": "osPlatform",
           "type": {
@@ -9038,7 +9037,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1371
+          "line": 1370
         },
         "parameters": [
           {
@@ -9059,7 +9058,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1368
+        "line": 1367
       },
       "methods": [
         {
@@ -9068,7 +9067,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1379
+            "line": 1378
           },
           "name": "giveMeUndefined",
           "parameters": [
@@ -9087,7 +9086,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1389
+            "line": 1388
           },
           "name": "giveMeUndefinedInsideAnObject",
           "parameters": [
@@ -9105,7 +9104,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1418
+            "line": 1417
           },
           "name": "verifyPropertyIsUndefined"
         }
@@ -9118,7 +9117,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1369
+            "line": 1368
           },
           "name": "changeMeToUndefined",
           "optional": true,
@@ -9138,7 +9137,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1427
+        "line": 1426
       },
       "name": "NullShouldBeTreatedAsUndefinedData",
       "properties": [
@@ -9150,7 +9149,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1429
+            "line": 1428
           },
           "name": "arrayWithThreeElementsAndUndefinedAsSecondArgument",
           "type": {
@@ -9170,7 +9169,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1428
+            "line": 1427
           },
           "name": "thisShouldBeUndefined",
           "optional": true,
@@ -9193,7 +9192,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 507
+          "line": 506
         },
         "parameters": [
           {
@@ -9207,7 +9206,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 506
+        "line": 505
       },
       "methods": [
         {
@@ -9216,7 +9215,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 513
+            "line": 512
           },
           "name": "isSameGenerator",
           "parameters": [
@@ -9239,7 +9238,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 509
+            "line": 508
           },
           "name": "nextTimes100",
           "returns": {
@@ -9257,7 +9256,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 507
+            "line": 506
           },
           "name": "generator",
           "type": {
@@ -9281,7 +9280,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 265
+        "line": 264
       },
       "methods": [
         {
@@ -9291,7 +9290,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 269
+            "line": 268
           },
           "name": "sumFromArray",
           "parameters": [
@@ -9320,7 +9319,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 280
+            "line": 279
           },
           "name": "sumFromMap",
           "parameters": [
@@ -9354,7 +9353,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2549
+        "line": 2548
       },
       "methods": [
         {
@@ -9363,7 +9362,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2550
+            "line": 2549
           },
           "name": "provide",
           "returns": {
@@ -9421,7 +9420,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1225
+          "line": 1224
         },
         "parameters": [
           {
@@ -9435,7 +9434,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1224
+        "line": 1223
       },
       "methods": [
         {
@@ -9444,7 +9443,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1233
+            "line": 1232
           },
           "name": "invokeWithOptional"
         },
@@ -9454,7 +9453,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1229
+            "line": 1228
           },
           "name": "invokeWithoutOptional"
         }
@@ -9473,7 +9472,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 311
+          "line": 310
         },
         "parameters": [
           {
@@ -9500,7 +9499,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 310
+        "line": 309
       },
       "name": "OptionalConstructorArgument",
       "properties": [
@@ -9511,7 +9510,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 312
+            "line": 311
           },
           "name": "arg1",
           "type": {
@@ -9525,7 +9524,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 313
+            "line": 312
           },
           "name": "arg2",
           "type": {
@@ -9539,7 +9538,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 314
+            "line": 313
           },
           "name": "arg3",
           "optional": true,
@@ -9559,7 +9558,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1870
+        "line": 1869
       },
       "name": "OptionalStruct",
       "properties": [
@@ -9571,7 +9570,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1871
+            "line": 1870
           },
           "name": "field",
           "optional": true,
@@ -9593,7 +9592,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1865
+          "line": 1864
         },
         "parameters": [
           {
@@ -9608,7 +9607,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1861
+        "line": 1860
       },
       "name": "OptionalStructConsumer",
       "properties": [
@@ -9619,7 +9618,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1862
+            "line": 1861
           },
           "name": "parameterWasUndefined",
           "type": {
@@ -9633,7 +9632,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1863
+            "line": 1862
           },
           "name": "fieldValue",
           "optional": true,
@@ -9658,7 +9657,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2138
+        "line": 2137
       },
       "methods": [
         {
@@ -9667,7 +9666,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2150
+            "line": 2149
           },
           "name": "overrideMe",
           "protected": true,
@@ -9683,7 +9682,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2146
+            "line": 2145
           },
           "name": "switchModes"
         },
@@ -9693,7 +9692,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2142
+            "line": 2141
           },
           "name": "valueFromProtected",
           "returns": {
@@ -9712,7 +9711,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2139
+            "line": 2138
           },
           "name": "overrideReadOnly",
           "protected": true,
@@ -9726,7 +9725,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2140
+            "line": 2139
           },
           "name": "overrideReadWrite",
           "protected": true,
@@ -9750,7 +9749,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 646
+        "line": 645
       },
       "methods": [
         {
@@ -9759,7 +9758,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 647
+            "line": 646
           },
           "name": "test",
           "parameters": [
@@ -9790,7 +9789,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2501
+        "line": 2500
       },
       "name": "ParentStruct982",
       "properties": [
@@ -9802,7 +9801,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2502
+            "line": 2501
           },
           "name": "foo",
           "type": {
@@ -9826,7 +9825,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1836
+        "line": 1835
       },
       "methods": [
         {
@@ -9836,7 +9835,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1837
+            "line": 1836
           },
           "name": "consumePartiallyInitializedThis",
           "parameters": [
@@ -9882,7 +9881,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 496
+        "line": 495
       },
       "methods": [
         {
@@ -9891,7 +9890,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 497
+            "line": 496
           },
           "name": "sayHello",
           "parameters": [
@@ -10068,7 +10067,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1556
+        "line": 1555
       },
       "methods": [
         {
@@ -10077,7 +10076,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1557
+            "line": 1556
           },
           "name": "hello"
         }
@@ -10098,7 +10097,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 958
+        "line": 957
       },
       "methods": [
         {
@@ -10107,7 +10106,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 959
+            "line": 958
           },
           "name": "and"
         },
@@ -10117,7 +10116,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 963
+            "line": 962
           },
           "name": "as"
         },
@@ -10127,7 +10126,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 967
+            "line": 966
           },
           "name": "assert"
         },
@@ -10137,7 +10136,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 971
+            "line": 970
           },
           "name": "async"
         },
@@ -10147,7 +10146,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 975
+            "line": 974
           },
           "name": "await"
         },
@@ -10157,7 +10156,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 979
+            "line": 978
           },
           "name": "break"
         },
@@ -10167,7 +10166,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 983
+            "line": 982
           },
           "name": "class"
         },
@@ -10177,7 +10176,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 987
+            "line": 986
           },
           "name": "continue"
         },
@@ -10187,7 +10186,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 991
+            "line": 990
           },
           "name": "def"
         },
@@ -10197,7 +10196,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 995
+            "line": 994
           },
           "name": "del"
         },
@@ -10207,7 +10206,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 999
+            "line": 998
           },
           "name": "elif"
         },
@@ -10217,7 +10216,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1003
+            "line": 1002
           },
           "name": "else"
         },
@@ -10227,7 +10226,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1007
+            "line": 1006
           },
           "name": "except"
         },
@@ -10237,7 +10236,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1011
+            "line": 1010
           },
           "name": "finally"
         },
@@ -10247,7 +10246,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1015
+            "line": 1014
           },
           "name": "for"
         },
@@ -10257,7 +10256,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1019
+            "line": 1018
           },
           "name": "from"
         },
@@ -10267,7 +10266,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1023
+            "line": 1022
           },
           "name": "global"
         },
@@ -10277,7 +10276,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1027
+            "line": 1026
           },
           "name": "if"
         },
@@ -10287,7 +10286,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1031
+            "line": 1030
           },
           "name": "import"
         },
@@ -10297,7 +10296,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1035
+            "line": 1034
           },
           "name": "in"
         },
@@ -10307,7 +10306,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1039
+            "line": 1038
           },
           "name": "is"
         },
@@ -10317,7 +10316,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1043
+            "line": 1042
           },
           "name": "lambda"
         },
@@ -10327,7 +10326,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1047
+            "line": 1046
           },
           "name": "nonlocal"
         },
@@ -10337,7 +10336,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1051
+            "line": 1050
           },
           "name": "not"
         },
@@ -10347,7 +10346,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1055
+            "line": 1054
           },
           "name": "or"
         },
@@ -10357,7 +10356,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1059
+            "line": 1058
           },
           "name": "pass"
         },
@@ -10367,7 +10366,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1063
+            "line": 1062
           },
           "name": "raise"
         },
@@ -10377,7 +10376,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1067
+            "line": 1066
           },
           "name": "return"
         },
@@ -10387,7 +10386,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1071
+            "line": 1070
           },
           "name": "try"
         },
@@ -10397,7 +10396,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1075
+            "line": 1074
           },
           "name": "while"
         },
@@ -10407,7 +10406,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1079
+            "line": 1078
           },
           "name": "with"
         },
@@ -10417,7 +10416,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1083
+            "line": 1082
           },
           "name": "yield"
         }
@@ -10436,7 +10435,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1093
+          "line": 1092
         },
         "parameters": [
           {
@@ -10450,7 +10449,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1092
+        "line": 1091
       },
       "methods": [
         {
@@ -10459,7 +10458,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1095
+            "line": 1094
           },
           "name": "method",
           "parameters": [
@@ -10487,7 +10486,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1093
+            "line": 1092
           },
           "name": "self",
           "type": {
@@ -10508,7 +10507,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1101
+          "line": 1100
         },
         "parameters": [
           {
@@ -10522,7 +10521,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1100
+        "line": 1099
       },
       "name": "ClassWithSelfKwarg",
       "namespace": "PythonSelf",
@@ -10534,7 +10533,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1101
+            "line": 1100
           },
           "name": "props",
           "type": {
@@ -10552,7 +10551,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1108
+        "line": 1107
       },
       "methods": [
         {
@@ -10562,7 +10561,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1109
+            "line": 1108
           },
           "name": "method",
           "parameters": [
@@ -10593,7 +10592,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1104
+        "line": 1103
       },
       "name": "StructWithSelf",
       "namespace": "PythonSelf",
@@ -10606,7 +10605,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1105
+            "line": 1104
           },
           "name": "self",
           "type": {
@@ -10630,7 +10629,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1184
+        "line": 1183
       },
       "methods": [
         {
@@ -10639,7 +10638,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1187
+            "line": 1186
           },
           "name": "loadFoo",
           "returns": {
@@ -10655,7 +10654,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1191
+            "line": 1190
           },
           "name": "saveFoo",
           "parameters": [
@@ -10676,7 +10675,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1185
+            "line": 1184
           },
           "name": "foo",
           "optional": true,
@@ -10703,7 +10702,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1509
+        "line": 1508
       },
       "name": "ReturnsPrivateImplementationOfInterface",
       "properties": [
@@ -10714,7 +10713,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1510
+            "line": 1509
           },
           "name": "privateImplementation",
           "type": {
@@ -10735,7 +10734,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2445
+        "line": 2444
       },
       "name": "RootStruct",
       "properties": [
@@ -10748,7 +10747,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2449
+            "line": 2448
           },
           "name": "stringProp",
           "type": {
@@ -10763,7 +10762,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2450
+            "line": 2449
           },
           "name": "nestedStruct",
           "optional": true,
@@ -10782,7 +10781,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2458
+        "line": 2457
       },
       "methods": [
         {
@@ -10791,7 +10790,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2459
+            "line": 2458
           },
           "name": "validate",
           "parameters": [
@@ -10821,7 +10820,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 289
+        "line": 288
       },
       "methods": [
         {
@@ -10830,7 +10829,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 297
+            "line": 296
           },
           "name": "methodWithDefaultedArguments",
           "parameters": [
@@ -10863,7 +10862,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 305
+            "line": 304
           },
           "name": "methodWithOptionalAnyArgument",
           "parameters": [
@@ -10883,7 +10882,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 293
+            "line": 292
           },
           "name": "methodWithOptionalArguments",
           "parameters": [
@@ -10921,7 +10920,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2017
+        "line": 2016
       },
       "name": "SecondLevelStruct",
       "properties": [
@@ -10934,7 +10933,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2021
+            "line": 2020
           },
           "name": "deeperRequiredProp",
           "type": {
@@ -10950,7 +10949,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2026
+            "line": 2025
           },
           "name": "deeperOptionalProp",
           "optional": true,
@@ -10976,7 +10975,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1627
+        "line": 1626
       },
       "methods": [
         {
@@ -10985,7 +10984,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1630
+            "line": 1629
           },
           "name": "interface1",
           "returns": {
@@ -11000,7 +10999,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1634
+            "line": 1633
           },
           "name": "interface2",
           "returns": {
@@ -11023,7 +11022,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1969
+        "line": 1968
       },
       "methods": [
         {
@@ -11032,7 +11031,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1971
+            "line": 1970
           },
           "name": "isSingletonInt",
           "parameters": [
@@ -11062,7 +11061,7 @@
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1976
+        "line": 1975
       },
       "members": [
         {
@@ -11086,7 +11085,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1952
+        "line": 1951
       },
       "methods": [
         {
@@ -11095,7 +11094,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1955
+            "line": 1954
           },
           "name": "isSingletonString",
           "parameters": [
@@ -11125,7 +11124,7 @@
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1960
+        "line": 1959
       },
       "members": [
         {
@@ -11198,7 +11197,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2482
+        "line": 2481
       },
       "methods": [
         {
@@ -11207,7 +11206,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2491
+            "line": 2490
           },
           "name": "returnAnonymous",
           "returns": {
@@ -11223,7 +11222,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2483
+            "line": 2482
           },
           "name": "returnReturn",
           "returns": {
@@ -11384,7 +11383,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1895
+        "line": 1894
       },
       "methods": [
         {
@@ -11393,7 +11392,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1898
+            "line": 1897
           },
           "name": "canAccessStaticContext",
           "returns": {
@@ -11412,7 +11411,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1906
+            "line": 1905
           },
           "name": "staticVariable",
           "static": true,
@@ -11432,7 +11431,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2863
+        "line": 2862
       },
       "methods": [
         {
@@ -11441,7 +11440,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2868
+            "line": 2867
           },
           "name": "method",
           "overrides": "jsii-calc.StaticHelloParent",
@@ -11457,7 +11456,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2864
+            "line": 2863
           },
           "name": "property",
           "overrides": "jsii-calc.StaticHelloParent",
@@ -11484,7 +11483,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2854
+        "line": 2853
       },
       "methods": [
         {
@@ -11493,7 +11492,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2859
+            "line": 2858
           },
           "name": "method",
           "static": true
@@ -11508,7 +11507,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2855
+            "line": 2854
           },
           "name": "property",
           "static": true,
@@ -11530,7 +11529,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 691
+          "line": 690
         },
         "parameters": [
           {
@@ -11544,7 +11543,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 690
+        "line": 689
       },
       "methods": [
         {
@@ -11554,7 +11553,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 697
+            "line": 696
           },
           "name": "staticMethod",
           "parameters": [
@@ -11581,7 +11580,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 701
+            "line": 700
           },
           "name": "justMethod",
           "returns": {
@@ -11602,7 +11601,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 713
+            "line": 712
           },
           "name": "BAR",
           "static": true,
@@ -11618,7 +11617,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 742
+            "line": 741
           },
           "name": "ConstObj",
           "static": true,
@@ -11635,7 +11634,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 708
+            "line": 707
           },
           "name": "Foo",
           "static": true,
@@ -11652,7 +11651,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 718
+            "line": 717
           },
           "name": "zooBar",
           "static": true,
@@ -11673,7 +11672,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 727
+            "line": 726
           },
           "name": "instance",
           "static": true,
@@ -11687,7 +11686,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 741
+            "line": 740
           },
           "name": "nonConstStatic",
           "static": true,
@@ -11702,7 +11701,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 691
+            "line": 690
           },
           "name": "value",
           "type": {
@@ -11720,7 +11719,7 @@
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 40
+        "line": 39
       },
       "members": [
         {
@@ -11758,7 +11757,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1680
+        "line": 1679
       },
       "name": "StripInternal",
       "properties": [
@@ -11768,7 +11767,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1681
+            "line": 1680
           },
           "name": "youSeeMe",
           "type": {
@@ -11788,7 +11787,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2243
+        "line": 2242
       },
       "name": "StructA",
       "properties": [
@@ -11800,7 +11799,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2244
+            "line": 2243
           },
           "name": "requiredString",
           "type": {
@@ -11815,7 +11814,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2246
+            "line": 2245
           },
           "name": "optionalNumber",
           "optional": true,
@@ -11831,7 +11830,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2245
+            "line": 2244
           },
           "name": "optionalString",
           "optional": true,
@@ -11852,7 +11851,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2252
+        "line": 2251
       },
       "name": "StructB",
       "properties": [
@@ -11864,7 +11863,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2253
+            "line": 2252
           },
           "name": "requiredString",
           "type": {
@@ -11879,7 +11878,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2254
+            "line": 2253
           },
           "name": "optionalBoolean",
           "optional": true,
@@ -11895,7 +11894,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2255
+            "line": 2254
           },
           "name": "optionalStructA",
           "optional": true,
@@ -11917,7 +11916,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2681
+        "line": 2680
       },
       "name": "StructParameterType",
       "properties": [
@@ -11929,7 +11928,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2682
+            "line": 2681
           },
           "name": "scope",
           "type": {
@@ -11944,7 +11943,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2683
+            "line": 2682
           },
           "name": "props",
           "optional": true,
@@ -11969,7 +11968,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2075
+        "line": 2074
       },
       "methods": [
         {
@@ -11978,7 +11977,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2087
+            "line": 2086
           },
           "name": "howManyVarArgsDidIPass",
           "parameters": [
@@ -12010,7 +12009,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2076
+            "line": 2075
           },
           "name": "roundTrip",
           "parameters": [
@@ -12046,7 +12045,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2257
+        "line": 2256
       },
       "methods": [
         {
@@ -12055,7 +12054,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2258
+            "line": 2257
           },
           "name": "isStructA",
           "parameters": [
@@ -12088,7 +12087,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2279
+            "line": 2278
           },
           "name": "isStructB",
           "parameters": [
@@ -12128,7 +12127,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2049
+        "line": 2048
       },
       "name": "StructWithJavaReservedWords",
       "properties": [
@@ -12140,7 +12139,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2050
+            "line": 2049
           },
           "name": "default",
           "type": {
@@ -12155,7 +12154,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2051
+            "line": 2050
           },
           "name": "assert",
           "optional": true,
@@ -12171,7 +12170,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2054
+            "line": 2053
           },
           "name": "result",
           "optional": true,
@@ -12187,7 +12186,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2055
+            "line": 2054
           },
           "name": "that",
           "optional": true,
@@ -12272,7 +12271,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2184
+          "line": 2183
         },
         "parameters": [
           {
@@ -12320,7 +12319,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2174
+        "line": 2173
       },
       "name": "SupportsNiceJavaBuilder",
       "properties": [
@@ -12332,7 +12331,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2185
+            "line": 2184
           },
           "name": "id",
           "overrides": "jsii-calc.SupportsNiceJavaBuilderWithRequiredProps",
@@ -12347,7 +12346,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2175
+            "line": 2174
           },
           "name": "rest",
           "type": {
@@ -12371,7 +12370,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2194
+        "line": 2193
       },
       "name": "SupportsNiceJavaBuilderProps",
       "properties": [
@@ -12384,7 +12383,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2204
+            "line": 2203
           },
           "name": "bar",
           "type": {
@@ -12401,7 +12400,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2199
+            "line": 2198
           },
           "name": "id",
           "optional": true,
@@ -12424,7 +12423,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2166
+          "line": 2165
         },
         "parameters": [
           {
@@ -12450,7 +12449,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2158
+        "line": 2157
       },
       "name": "SupportsNiceJavaBuilderWithRequiredProps",
       "properties": [
@@ -12461,7 +12460,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2160
+            "line": 2159
           },
           "name": "bar",
           "type": {
@@ -12476,7 +12475,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2167
+            "line": 2166
           },
           "name": "id",
           "type": {
@@ -12490,7 +12489,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2159
+            "line": 2158
           },
           "name": "propId",
           "optional": true,
@@ -12514,7 +12513,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 377
+        "line": 376
       },
       "methods": [
         {
@@ -12524,7 +12523,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 390
+            "line": 389
           },
           "name": "callerIsAsync",
           "returns": {
@@ -12539,7 +12538,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 378
+            "line": 377
           },
           "name": "callerIsMethod",
           "returns": {
@@ -12554,7 +12553,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 430
+            "line": 429
           },
           "name": "modifyOtherProperty",
           "parameters": [
@@ -12572,7 +12571,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 402
+            "line": 401
           },
           "name": "modifyValueOfTheProperty",
           "parameters": [
@@ -12590,7 +12589,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 443
+            "line": 442
           },
           "name": "readA",
           "returns": {
@@ -12605,7 +12604,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 434
+            "line": 433
           },
           "name": "retrieveOtherProperty",
           "returns": {
@@ -12620,7 +12619,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 414
+            "line": 413
           },
           "name": "retrieveReadOnlyProperty",
           "returns": {
@@ -12635,7 +12634,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 406
+            "line": 405
           },
           "name": "retrieveValueOfTheProperty",
           "returns": {
@@ -12650,7 +12649,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 394
+            "line": 393
           },
           "name": "virtualMethod",
           "parameters": [
@@ -12673,7 +12672,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 447
+            "line": 446
           },
           "name": "writeA",
           "parameters": [
@@ -12695,7 +12694,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 412
+            "line": 411
           },
           "name": "readonlyProperty",
           "type": {
@@ -12708,7 +12707,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 441
+            "line": 440
           },
           "name": "a",
           "type": {
@@ -12721,7 +12720,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 382
+            "line": 381
           },
           "name": "callerIsProperty",
           "type": {
@@ -12734,7 +12733,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 420
+            "line": 419
           },
           "name": "otherProperty",
           "type": {
@@ -12747,7 +12746,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 400
+            "line": 399
           },
           "name": "theProperty",
           "type": {
@@ -12760,7 +12759,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 428
+            "line": 427
           },
           "name": "valueOfOtherProperty",
           "type": {
@@ -12783,7 +12782,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 652
+        "line": 651
       },
       "methods": [
         {
@@ -12792,7 +12791,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 653
+            "line": 652
           },
           "name": "throwError"
         }
@@ -12809,7 +12808,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2000
+        "line": 1999
       },
       "name": "TopLevelStruct",
       "properties": [
@@ -12822,7 +12821,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2004
+            "line": 2003
           },
           "name": "required",
           "type": {
@@ -12838,7 +12837,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2014
+            "line": 2013
           },
           "name": "secondLevel",
           "type": {
@@ -12863,7 +12862,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2009
+            "line": 2008
           },
           "name": "optional",
           "optional": true,
@@ -12884,7 +12883,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2755
+        "line": 2754
       },
       "methods": [
         {
@@ -12894,7 +12893,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2759
+            "line": 2758
           },
           "name": "mode",
           "returns": {
@@ -12966,7 +12965,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1113
+        "line": 1112
       },
       "name": "UnionProperties",
       "properties": [
@@ -12978,7 +12977,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1115
+            "line": 1114
           },
           "name": "bar",
           "type": {
@@ -13005,7 +13004,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1114
+            "line": 1113
           },
           "name": "foo",
           "optional": true,
@@ -13115,7 +13114,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1118
+        "line": 1117
       },
       "methods": [
         {
@@ -13124,7 +13123,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1119
+            "line": 1118
           },
           "name": "value",
           "returns": {
@@ -13151,7 +13150,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1169
+        "line": 1168
       },
       "methods": [
         {
@@ -13160,7 +13159,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1170
+            "line": 1169
           },
           "name": "hello",
           "returns": {
@@ -13184,7 +13183,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 598
+          "line": 597
         },
         "parameters": [
           {
@@ -13198,7 +13197,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 597
+        "line": 596
       },
       "methods": [
         {
@@ -13207,7 +13206,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 600
+            "line": 599
           },
           "name": "justRead",
           "returns": {
@@ -13222,7 +13221,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 609
+            "line": 608
           },
           "name": "readStringAndNumber",
           "parameters": [
@@ -13245,7 +13244,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 604
+            "line": 603
           },
           "name": "writeAndRead",
           "parameters": [
@@ -13272,7 +13271,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 598
+            "line": 597
           },
           "name": "obj",
           "type": {
@@ -13293,7 +13292,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 682
+          "line": 681
         },
         "parameters": [
           {
@@ -13307,7 +13306,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 681
+        "line": 680
       },
       "methods": [
         {
@@ -13316,7 +13315,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 684
+            "line": 683
           },
           "name": "asArray",
           "parameters": [
@@ -13355,7 +13354,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 668
+          "line": 667
         },
         "parameters": [
           {
@@ -13374,7 +13373,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 662
+        "line": 661
       },
       "methods": [
         {
@@ -13383,7 +13382,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 676
+            "line": 675
           },
           "name": "asArray",
           "parameters": [
@@ -13436,7 +13435,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 452
+        "line": 451
       },
       "methods": [
         {
@@ -13446,7 +13445,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 477
+            "line": 476
           },
           "name": "overrideMeAsync",
           "parameters": [
@@ -13469,7 +13468,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 481
+            "line": 480
           },
           "name": "overrideMeSync",
           "parameters": [
@@ -13493,7 +13492,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 459
+            "line": 458
           },
           "name": "parallelSumAsync",
           "parameters": [
@@ -13517,7 +13516,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 453
+            "line": 452
           },
           "name": "serialSumAsync",
           "parameters": [
@@ -13540,7 +13539,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 469
+            "line": 468
           },
           "name": "sumSync",
           "parameters": [
@@ -13577,7 +13576,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1924
+        "line": 1923
       },
       "methods": [
         {
@@ -13586,7 +13585,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1929
+            "line": 1928
           },
           "name": "callMe"
         },
@@ -13597,7 +13596,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1933
+            "line": 1932
           },
           "name": "overrideMe",
           "protected": true
@@ -13612,7 +13611,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1926
+            "line": 1925
           },
           "name": "methodWasCalled",
           "type": {
@@ -13634,7 +13633,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1940
+          "line": 1939
         },
         "parameters": [
           {
@@ -13649,7 +13648,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1939
+        "line": 1938
       },
       "name": "WithPrivatePropertyInConstructor",
       "properties": [
@@ -13660,7 +13659,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1942
+            "line": 1941
           },
           "name": "success",
           "type": {
@@ -14441,5 +14440,5 @@
     }
   },
   "version": "0.0.0",
-  "fingerprint": "3qOrZPKmCOP/TmHomsppsVKom0OerOiFs9MVSblTVUU="
+  "fingerprint": "s0WTodgbAHDmgEPpTYorSZ2mi7rj+NjClzGmC3nucF4="
 }
diff --git a/packages/jsii-calc/test/test.calc.ts b/packages/jsii-calc/test/test.calc.ts
index fc9bf9eb52..0558997897 100644
--- a/packages/jsii-calc/test/test.calc.ts
+++ b/packages/jsii-calc/test/test.calc.ts
@@ -124,4 +124,4 @@ assert.equal(calc3.readUnionValue(), 9 * 3);
 // All primitive types
 //
 
-console.log('ok');
+console.log('ok', __filename);
diff --git a/packages/jsii-calc/test/test.transitive.ts b/packages/jsii-calc/test/test.transitive.ts
new file mode 100644
index 0000000000..5718bbe327
--- /dev/null
+++ b/packages/jsii-calc/test/test.transitive.ts
@@ -0,0 +1,34 @@
+// this wee little test is intended to ensure that jsii-calc doesn't accidentally
+// take a direct dependency on @scope/jsii-calc-base-of-base, which is intended
+// to only be used as a transitive dependency through @scope/jsii-calc-base.
+
+import * as assert from 'assert';
+import { readFileSync } from 'fs';
+import { join } from 'path';
+
+const pkgjsonPath = join(__dirname, '..', 'package.json');
+const pkgjson = JSON.parse(readFileSync(pkgjsonPath, 'utf-8'));
+
+// read the name of the transitive dependency module
+// (@scope/jsii-calc-base-of-base) from it's package.json file, in order to
+// create strong-coupling (if someone decides to change the name this will
+// fail).
+const transitiveDepName = JSON.parse(
+  readFileSync(
+    join(
+      __dirname,
+      '..',
+      '..',
+      '@scope',
+      'jsii-calc-base-of-base',
+      'package.json',
+    ),
+    'utf-8',
+  ),
+).name;
+
+const message = `Do not directly take a dependency on "${transitiveDepName}". It is meant to only be declared as a transitive dependency through @scope/jsii-calc-base. Sorry!`;
+assert.ok(!(transitiveDepName in pkgjson.dependencies), message);
+assert.ok(!(transitiveDepName in pkgjson.peerDependencies), message);
+
+console.log('ok', __filename);
diff --git a/packages/jsii-pacmak/lib/targets/go.ts b/packages/jsii-pacmak/lib/targets/go.ts
index 9b2ca31ddb..3706c171e2 100644
--- a/packages/jsii-pacmak/lib/targets/go.ts
+++ b/packages/jsii-pacmak/lib/targets/go.ts
@@ -5,19 +5,25 @@ import { Rosetta } from 'jsii-rosetta';
 import * as path from 'path';
 
 import { IGenerator } from '../generator';
-import { Target, TargetOptions } from '../target';
+import * as logging from '../logging';
+import { findLocalBuildDirs, Target, TargetOptions } from '../target';
+import { shell } from '../util';
 import { Documentation } from './go/documentation';
-import { RootPackage } from './go/package';
+import { GOMOD_FILENAME, RootPackage } from './go/package';
 import { JSII_INIT_PACKAGE } from './go/runtime';
+import { JSII_RT_MODULE_NAME } from './go/runtime/constants';
 import { goPackageName } from './go/util';
 
 export class Golang extends Target {
-  public readonly generator: IGenerator;
+  private readonly goGenerator: GoGenerator;
 
   public constructor(options: TargetOptions) {
     super(options);
+    this.goGenerator = new GoGenerator(options.rosetta);
+  }
 
-    this.generator = new GoGenerator(options.rosetta);
+  public get generator() {
+    return this.goGenerator;
   }
 
   /**
@@ -27,12 +33,86 @@ export class Golang extends Target {
    * @param outDir    the directory where the publishable artifact should be placed.
    */
   public async build(sourceDir: string, outDir: string): Promise<void> {
-    return this.copyFiles(sourceDir, outDir);
+    // copy generated sources to the output directory
+    await this.copyFiles(sourceDir, outDir);
+
+    const pkgDir = path.join(outDir, goPackageName(this.assembly.name));
+
+    // write `local.go.mod` with "replace" directives for local modules
+    const localGoMod = await this.writeLocalGoMod(pkgDir);
+
+    // run `go build` with local.go.mod
+    await go('build', ['-modfile', localGoMod], { cwd: pkgDir });
+
+    // delete local.go.mod from the output directory so it doesn't get published
+    await fs.unlink(path.join(pkgDir, localGoMod));
+  }
+
+  /**
+   * Creates a copy of the `go.mod` file called `local.go.mod` with added
+   * `replace` directives for local mono-repo dependencies. This is required in
+   * order to run `go fmt` and `go build`.
+   *
+   * @param pkgDir The directory which contains the generated go code
+   */
+  private async writeLocalGoMod(pkgDir: string) {
+    const replace: Record<string, string> = {};
+
+    // find local deps by check if `<jsii.outdir>/go` exists for dependencies
+    // and also consider `outDir` in case pacmak is executed using `--outdir
+    // --recurse` (in which case all go code will be generated there).
+    const dirs = [
+      path.dirname(pkgDir),
+      ...(await findLocalBuildDirs(this.packageDir, 'go')),
+    ];
+
+    // try to resolve @jsii/go-runtime (only exists as a devDependency)
+    const jsiiRuntimeDir = tryFindLocalRuntime();
+    if (jsiiRuntimeDir) {
+      replace[JSII_RT_MODULE_NAME] = jsiiRuntimeDir;
+    }
+
+    // iterate (recursively) on all package dependencies and check if we have a
+    // local build directory for this module. if
+    // we do, add a "replace" directive to point to it instead of download from
+    // the network.
+    const visit = (pkg: RootPackage) => {
+      for (const dep of pkg.packageDependencies) {
+        for (const baseDir of dirs) {
+          const moduleDir = tryFindLocalModule(baseDir, dep);
+          if (moduleDir) {
+            replace[dep.goModuleName] = moduleDir;
+          }
+        }
+
+        // recurse to transitive deps ("replace" is only considered at the top level go.mod)
+        visit(dep);
+      }
+    };
+
+    visit(this.goGenerator.rootPackage);
+
+    // write `local.go.mod`
+
+    // read existing content
+    const goMod = path.join(pkgDir, GOMOD_FILENAME);
+    const lines = (await fs.readFile(goMod, 'utf-8')).split('\n');
+
+    for (const [from, to] of Object.entries(replace)) {
+      logging.info(`Local replace: ${from} => ${to}`);
+      lines.push(`replace ${from} => ${to}`);
+    }
+
+    const localGoMod = `local.${GOMOD_FILENAME}`;
+    await fs.writeFile(path.join(pkgDir, localGoMod), lines.join('\n'));
+    return localGoMod;
   }
 }
 
 class GoGenerator implements IGenerator {
   private assembly!: Assembly;
+  public rootPackage!: RootPackage;
+
   private readonly code = new CodeMaker({
     indentCharacter: '\t',
     indentationLevel: 1,
@@ -53,7 +133,9 @@ class GoGenerator implements IGenerator {
   }
 
   public generate(): void {
-    new RootPackage(this.assembly).emit({
+    this.rootPackage = new RootPackage(this.assembly);
+
+    return this.rootPackage.emit({
       code: this.code,
       documenter: this.documenter,
     });
@@ -94,3 +176,56 @@ class GoGenerator implements IGenerator {
     this.code.closeFile(file);
   }
 }
+
+/**
+ * Checks if `buildDir` includes a local go build version (with "replace"
+ * directives).
+ * @param baseDir the `dist/go` directory
+ * @returns `undefined` if not or the module directory otherwise.
+ */
+function tryFindLocalModule(baseDir: string, pkg: RootPackage) {
+  const gomodPath = path.join(baseDir, pkg.packageName, GOMOD_FILENAME);
+  if (!fs.pathExistsSync(gomodPath)) {
+    return undefined;
+  }
+
+  // read `go.mod` and check that it is for the correct module
+  const gomod = fs.readFileSync(gomodPath, 'utf-8').split('\n');
+  const isExpectedModule = gomod.find(
+    (line) => line.trim() === `module ${pkg.goModuleName}`,
+  );
+
+  if (!isExpectedModule) {
+    return undefined;
+  }
+
+  return path.resolve(path.dirname(gomodPath));
+}
+
+/**
+ * Check if we are running from inside the jsii repository, and then we want to
+ * use the local runtime instead of download from a released version.
+ */
+function tryFindLocalRuntime() {
+  try {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports, import/no-extraneous-dependencies
+    const dir = require('@jsii/go-runtime').runtimePath;
+    logging.debug(`Using @jsii/go-runtime from ${dir}`);
+    return dir;
+  } catch {
+    return undefined;
+  }
+}
+
+/**
+ * Executes a go CLI command.
+ *
+ *
+ * @param command The `go` command to execute (e.g. `build`)
+ * @param args Additional args
+ * @param options Options
+ */
+async function go(command: string, args: string[], options: { cwd: string }) {
+  const { cwd } = options;
+  return shell('go', [command, ...args], { cwd });
+}
diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json
index 2c28cb6822..2d4ae06d5f 100644
--- a/packages/jsii-pacmak/package.json
+++ b/packages/jsii-pacmak/package.json
@@ -53,6 +53,7 @@
   "devDependencies": {
     "@jsii/dotnet-runtime": "^0.0.0",
     "@jsii/java-runtime": "^0.0.0",
+    "@jsii/go-runtime": "^0.0.0",
     "@scope/jsii-calc-lib": "^0.0.0",
     "@types/clone": "^2.1.0",
     "@types/commonmark": "^0.27.4",
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.ts.snap
index 1fc0591dc3..def10b31cb 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.ts.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.ts.snap
@@ -13,9 +13,10 @@ exports[`Generated code for "@scope/jsii-calc-base": <outDir>/ 1`] = `
        ┃              ┣━ 📄 BaseProps.cs
        ┃              ┣━ 📄 IBaseInterface.cs
        ┃              ┣━ 📄 IBaseProps.cs
-       ┃              ┗━ 📁 Internal
-       ┃                 ┗━ 📁 DependencyResolution
-       ┃                    ┗━ 📄 Anchor.cs
+       ┃              ┣━ 📁 Internal
+       ┃              ┃  ┗━ 📁 DependencyResolution
+       ┃              ┃     ┗━ 📄 Anchor.cs
+       ┃              ┗━ 📄 StaticConsumer.cs
        ┣━ 📄 Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj
        ┣━ 📄 AssemblyInfo.cs
        ┗━ 📄 scope-jsii-calc-base-0.0.0.tgz
@@ -235,6 +236,45 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace.Internal.Dependenc
 
 `;
 
+exports[`Generated code for "@scope/jsii-calc-base": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/StaticConsumer.cs 1`] = `
+using Amazon.JSII.Runtime.Deputy;
+
+#pragma warning disable CS0672,CS0809,CS1591
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace
+{
+    /// <summary>Hides the transitive dependency of base-of-base.</summary>
+    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace.StaticConsumer), fullyQualifiedName: "@scope/jsii-calc-base.StaticConsumer")]
+    public class StaticConsumer : DeputyBase
+    {
+        public StaticConsumer(): base(new DeputyProps(System.Array.Empty<object?>()))
+        {
+        }
+
+        /// <summary>Used by jsii to construct an instance of this class from a Javascript-owned object reference</summary>
+        /// <param name="reference">The Javascript-owned object reference</param>
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        protected StaticConsumer(ByRefValue reference): base(reference)
+        {
+        }
+
+        /// <summary>Used by jsii to construct an instance of this class from DeputyProps</summary>
+        /// <param name="props">The deputy props</param>
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        protected StaticConsumer(DeputyProps props): base(props)
+        {
+        }
+
+        [JsiiMethod(name: "consume", parametersJson: "[{\\"name\\":\\"args\\",\\"type\\":{\\"primitive\\":\\"any\\"},\\"variadic\\":true}]")]
+        public static void Consume(params object[] args)
+        {
+            InvokeStaticVoidMethod(typeof(Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace.StaticConsumer), new System.Type[]{typeof(object[])}, new object[]{args});
+        }
+    }
+}
+
+`;
+
 exports[`Generated code for "@scope/jsii-calc-base": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/AssemblyInfo.cs 1`] = `
 using Amazon.JSII.Runtime.Deputy;
 
@@ -2044,7 +2084,6 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
   <ItemGroup>
     <PackageReference Include="Amazon.JSII.Runtime" Version="(,0.0.1)" />
     <PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.BasePackageId" Version="(,0.0.1)" />
-    <PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId" Version="(,0.0.1)" />
     <PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.LibPackageId" Version="[0.0.0-devpreview,0.0.1)" />
   </ItemGroup>
   <PropertyGroup>
@@ -9660,7 +9699,6 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Internal.DependencyResolution
         public Anchor()
         {
             new Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace.Internal.DependencyResolution.Anchor();
-            new Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.Internal.DependencyResolution.Anchor();
             new Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Internal.DependencyResolution.Anchor();
         }
     }
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.ts.snap
index a12a50aeef..1aa15c0284 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.ts.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.ts.snap
@@ -166,6 +166,41 @@ func (i *IBaseInterface) Bar() {
 	)
 }
 
+// Class interface
+type StaticConsumerIface interface {
+}
+
+// Hides the transitive dependency of base-of-base.
+// Struct proxy
+type StaticConsumer struct {
+}
+
+func NewStaticConsumer() StaticConsumerIface {
+	_init_.Initialize()
+	self := StaticConsumer{}
+	_jsii_.Create(
+		"@scope/jsii-calc-base.StaticConsumer",
+		[]interface{}{},
+		[]_jsii_.FQN{},
+		[]_jsii_.Override{},
+		&self,
+	)
+	return &self
+}
+
+func StaticConsumer_Consume(args interface{}) {
+	_init_.Initialize()
+	var returns interface{}
+	_jsii_.InvokeStatic(
+		"@scope/jsii-calc-base.StaticConsumer",
+		"consume",
+		[]interface{}{args},
+		false,
+		&returns,
+		map[reflect.Type]reflect.Type{},
+	)
+}
+
 
 `;
 
@@ -1377,7 +1412,6 @@ go 1.15
 require (
 	github.com/aws/jsii-runtime-go v0.0.0
 	github.com/aws/jsii/jsii-calc/go/scopejsiicalcbase v0.0.0
-	github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase v0.0.0
 	github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0
 )
 
@@ -1502,7 +1536,6 @@ import (
 	"sync"
 	// Initialization endpoints of dependencies
 	scopejsiicalcbase "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbase/jsii"
-	scopejsiicalcbaseofbase "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/jsii"
 	scopejsiicalclib "github.com/aws/jsii/jsii-calc/go/scopejsiicalclib/jsii"
 )
 
@@ -1514,7 +1547,6 @@ func Initialize() {
 	once.Do(func(){
 		// Ensure all dependencies are initialized
 		scopejsiicalcbase.Initialize()
-		scopejsiicalcbaseofbase.Initialize()
 		scopejsiicalclib.Initialize()
 
 		// Load this library into the kernel
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.ts.snap
index 3edb60643a..e6e6a62f75 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.ts.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.ts.snap
@@ -16,7 +16,8 @@ exports[`Generated code for "@scope/jsii-calc-base": <outDir>/ 1`] = `
           ┃                    ┣━ 📄 $Module.java
           ┃                    ┣━ 📄 Base.java
           ┃                    ┣━ 📄 BaseProps.java
-          ┃                    ┗━ 📄 IBaseInterface.java
+          ┃                    ┣━ 📄 IBaseInterface.java
+          ┃                    ┗━ 📄 StaticConsumer.java
           ┗━ 📁 resources
              ┗━ 📁 software
                 ┗━ 📁 amazon
@@ -469,10 +470,41 @@ public interface IBaseInterface extends software.amazon.jsii.JsiiSerializable, s
 
 `;
 
+exports[`Generated code for "@scope/jsii-calc-base": <outDir>/java/src/main/java/software/amazon/jsii/tests/calculator/base/StaticConsumer.java 1`] = `
+package software.amazon.jsii.tests.calculator.base;
+
+/**
+ * Hides the transitive dependency of base-of-base.
+ */
+@javax.annotation.Generated(value = "jsii-pacmak")
+@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.base.$Module.class, fqn = "@scope/jsii-calc-base.StaticConsumer")
+public class StaticConsumer extends software.amazon.jsii.JsiiObject {
+
+    protected StaticConsumer(final software.amazon.jsii.JsiiObjectRef objRef) {
+        super(objRef);
+    }
+
+    protected StaticConsumer(final software.amazon.jsii.JsiiObject.InitializationMode initializationMode) {
+        super(initializationMode);
+    }
+
+    public StaticConsumer() {
+        super(software.amazon.jsii.JsiiObject.InitializationMode.JSII);
+        software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this);
+    }
+
+    public static void consume(final @org.jetbrains.annotations.NotNull java.lang.Object... args) {
+        software.amazon.jsii.JsiiObject.jsiiStaticCall(software.amazon.jsii.tests.calculator.base.StaticConsumer.class, "consume", software.amazon.jsii.NativeType.VOID, java.util.Arrays.<Object>stream(args).toArray(Object[]::new));
+    }
+}
+
+`;
+
 exports[`Generated code for "@scope/jsii-calc-base": <outDir>/java/src/main/resources/software/amazon/jsii/tests/calculator/base/$Module.txt 1`] = `
 @scope/jsii-calc-base.Base=software.amazon.jsii.tests.calculator.base.Base
 @scope/jsii-calc-base.BaseProps=software.amazon.jsii.tests.calculator.base.BaseProps
 @scope/jsii-calc-base.IBaseInterface=software.amazon.jsii.tests.calculator.base.IBaseInterface
+@scope/jsii-calc-base.StaticConsumer=software.amazon.jsii.tests.calculator.base.StaticConsumer
 
 `;
 
@@ -2819,11 +2851,6 @@ exports[`Generated code for "jsii-calc": <outDir>/java/pom.xml 1`] = `
       <artifactId>calculator-base</artifactId>
       <version>(,0.0.1)</version>
     </dependency>
-    <dependency>
-      <groupId>software.amazon.jsii.tests</groupId>
-      <artifactId>calculator-base-of-base</artifactId>
-      <version>(,0.0.1)</version>
-    </dependency>
     <dependency>
       <groupId>software.amazon.jsii.tests</groupId>
       <artifactId>calculator-lib</artifactId>
@@ -2994,7 +3021,7 @@ public final class $Module extends JsiiModule {
 
     @Override
     public List<Class<? extends JsiiModule>> getDependencies() {
-        return asList(software.amazon.jsii.tests.calculator.base.$Module.class, software.amazon.jsii.tests.calculator.baseofbase.$Module.class, software.amazon.jsii.tests.calculator.lib.$Module.class);
+        return asList(software.amazon.jsii.tests.calculator.base.$Module.class, software.amazon.jsii.tests.calculator.lib.$Module.class);
     }
 
     @Override
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.ts.snap
index 3b50bfa62c..1d6f5b80e5 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.ts.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.ts.snap
@@ -207,10 +207,29 @@ class _IBaseInterfaceProxy(
         return typing.cast(None, jsii.invoke(self, "bar", []))
 
 
+class StaticConsumer(
+    metaclass=jsii.JSIIMeta,
+    jsii_type="@scope/jsii-calc-base.StaticConsumer",
+):
+    """Hides the transitive dependency of base-of-base."""
+
+    def __init__(self) -> None:
+        jsii.create(StaticConsumer, self, [])
+
+    @jsii.member(jsii_name="consume") # type: ignore[misc]
+    @builtins.classmethod
+    def consume(cls, *args: typing.Any) -> None:
+        """
+        :param args: -
+        """
+        return typing.cast(None, jsii.sinvoke(cls, "consume", [*args]))
+
+
 __all__ = [
     "Base",
     "BaseProps",
     "IBaseInterface",
+    "StaticConsumer",
 ]
 
 publication.publish()
@@ -1417,7 +1436,6 @@ kwargs = json.loads(
     "install_requires": [
         "jsii<0.0.1",
         "publication>=0.0.3",
-        "scope.jsii-calc-base-of-base<0.0.1",
         "scope.jsii-calc-base<0.0.1",
         "scope.jsii-calc-lib<0.0.1"
     ],
@@ -8789,7 +8807,6 @@ import publication
 import typing_extensions
 
 import scope.jsii_calc_base._jsii
-import scope.jsii_calc_base_of_base._jsii
 import scope.jsii_calc_lib._jsii
 
 __jsii_assembly__ = jsii.JSIIAssembly.load(
diff --git a/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.ts.snap b/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.ts.snap
index 11a3320089..c3bd857f99 100644
--- a/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.ts.snap
+++ b/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.ts.snap
@@ -5,7 +5,6 @@ exports[`jsii-tree --all 1`] = `
  ├─┬ jsii-calc
  │ ├─┬ dependencies
  │ │ ├── @scope/jsii-calc-base
- │ │ ├── @scope/jsii-calc-base-of-base
  │ │ └── @scope/jsii-calc-lib
  │ ├─┬ submodules
  │ │ ├─┬ DerivedClassHasNoProperties
@@ -2625,6 +2624,17 @@ exports[`jsii-tree --all 1`] = `
  │   │   ├── <initializer>() initializer
  │   │   └─┬ typeName() method
  │   │     └── returns: any
+ │   ├─┬ class StaticConsumer
+ │   │ └─┬ members
+ │   │   ├── <initializer>() initializer
+ │   │   └─┬ static consume(args) method
+ │   │     ├── static
+ │   │     ├── variadic
+ │   │     ├─┬ parameters
+ │   │     │ └─┬ args
+ │   │     │   ├── type: any
+ │   │     │   └── variadic
+ │   │     └── returns: void
  │   ├─┬ interface BaseProps
  │   │ ├─┬ interfaces
  │   │ │ └── VeryBaseProps
@@ -3122,6 +3132,7 @@ exports[`jsii-tree --inheritance 1`] = `
  ├─┬ @scope/jsii-calc-base
  │ └─┬ types
  │   ├── class Base
+ │   ├── class StaticConsumer
  │   ├─┬ interface BaseProps
  │   │ └─┬ interfaces
  │   │   └── VeryBaseProps
@@ -4335,6 +4346,10 @@ exports[`jsii-tree --members 1`] = `
  │   │ └─┬ members
  │   │   ├── <initializer>() initializer
  │   │   └── typeName() method
+ │   ├─┬ class StaticConsumer
+ │   │ └─┬ members
+ │   │   ├── <initializer>() initializer
+ │   │   └── static consume(args) method
  │   ├─┬ interface BaseProps
  │   │ └─┬ members
  │   │   └── bar property
@@ -4710,6 +4725,7 @@ exports[`jsii-tree --types 1`] = `
  ├─┬ @scope/jsii-calc-base
  │ └─┬ types
  │   ├── class Base
+ │   ├── class StaticConsumer
  │   ├── interface BaseProps
  │   └── interface IBaseInterface
  ├─┬ @scope/jsii-calc-base-of-base
diff --git a/packages/jsii-reflect/test/__snapshots__/tree.test.ts.snap b/packages/jsii-reflect/test/__snapshots__/tree.test.ts.snap
index 4a41f1aa3e..d9751a15c6 100644
--- a/packages/jsii-reflect/test/__snapshots__/tree.test.ts.snap
+++ b/packages/jsii-reflect/test/__snapshots__/tree.test.ts.snap
@@ -86,7 +86,6 @@ exports[`showAll 1`] = `
  ├─┬ jsii-calc
  │ ├─┬ dependencies
  │ │ ├── @scope/jsii-calc-base
- │ │ ├── @scope/jsii-calc-base-of-base
  │ │ └── @scope/jsii-calc-lib
  │ ├─┬ submodules
  │ │ ├─┬ DerivedClassHasNoProperties
@@ -2706,6 +2705,17 @@ exports[`showAll 1`] = `
  │   │   ├── <initializer>() initializer
  │   │   └─┬ typeName() method
  │   │     └── returns: any
+ │   ├─┬ class StaticConsumer
+ │   │ └─┬ members
+ │   │   ├── <initializer>() initializer
+ │   │   └─┬ static consume(args) method
+ │   │     ├── static
+ │   │     ├── variadic
+ │   │     ├─┬ parameters
+ │   │     │ └─┬ args
+ │   │     │   ├── type: any
+ │   │     │   └── variadic
+ │   │     └── returns: void
  │   ├─┬ interface BaseProps
  │   │ ├─┬ interfaces
  │   │ │ └── VeryBaseProps
@@ -3168,6 +3178,7 @@ exports[`types 1`] = `
  ├─┬ @scope/jsii-calc-base
  │ └─┬ types
  │   ├── class Base
+ │   ├── class StaticConsumer
  │   ├── interface BaseProps
  │   └── interface IBaseInterface
  ├─┬ @scope/jsii-calc-base-of-base
diff --git a/packages/jsii-reflect/test/__snapshots__/type-system.test.ts.snap b/packages/jsii-reflect/test/__snapshots__/type-system.test.ts.snap
index f54f6bacff..592faa8acb 100644
--- a/packages/jsii-reflect/test/__snapshots__/type-system.test.ts.snap
+++ b/packages/jsii-reflect/test/__snapshots__/type-system.test.ts.snap
@@ -14,6 +14,7 @@ Array [
   "@scope/jsii-calc-base-of-base.StaticConsumer",
   "@scope/jsii-calc-base-of-base.Very",
   "@scope/jsii-calc-base.Base",
+  "@scope/jsii-calc-base.StaticConsumer",
   "@scope/jsii-calc-lib.Number",
   "@scope/jsii-calc-lib.NumericValue",
   "@scope/jsii-calc-lib.Operation",