From bc711541c17019eba3af16ec7efadc6a25287514 Mon Sep 17 00:00:00 2001
From: Romain Marcadier <rmuller@amazon.com>
Date: Mon, 24 Aug 2020 19:09:42 +0200
Subject: [PATCH] fix(jsii): class members named after the class result in
 illegal C# (#1903)

It is illegal in C# to name a class' member (method, property) with the
same name as the class itself (even if the member is static). Since both
class and member names are pascal-cased in C#, this means a class'
members cannot share the same PascalCased representation.

This adds a compile-time validation for this condition, effectively
calling out member names to have the same PascalCased representation
as their declaring class' name.

This is currently only a warning, as this is "made to work" by altering
the type name by appending `_` at the end of it, which is ugly and
dangerous but works, and is currently done in several places).

As all warnings, this turns into an error when operating under `--strict`,
and future work (i.e: #1931) will allow more granular configuration
of these errors, so we can hopefully opt all new codebases into the
strict behavior and eventually drop the slugification.

Fixes #1880
---
 docs/typescript-restrictions.md               |   59 +
 .../ComplianceTests.cs                        |   50 +-
 .../amazon/jsii/testing/ComplianceTest.java   |    6 +-
 packages/@jsii/kernel/test/kernel.test.ts     |    2 +-
 .../python-runtime/tests/test_compliance.py   |    2 +-
 packages/@scope/jsii-calc-lib/lib/index.ts    |  100 +-
 .../@scope/jsii-calc-lib/test/assembly.jsii   |  116 +-
 packages/jsii-calc/lib/calculator.ts          |   38 +-
 packages/jsii-calc/lib/compliance.ts          |   13 +-
 packages/jsii-calc/test/assembly.jsii         | 1448 +++++-----
 packages/jsii-diff/test/classes.test.ts       |   46 +-
 packages/jsii-diff/test/structs.test.ts       |   24 +-
 packages/jsii-diff/test/util.ts               |   14 +-
 packages/jsii-pacmak/bin/jsii-pacmak.ts       |    9 +
 packages/jsii-pacmak/lib/targets/dotnet.ts    |   26 +-
 .../__snapshots__/jsii-pacmak.test.ts.snap    | 2486 +++++++++--------
 packages/jsii-pacmak/test/build-test.sh       |   10 +-
 .../test/__snapshots__/jsii-tree.test.js.snap |   96 +-
 .../__snapshots__/type-system.test.js.snap    |    2 +-
 .../jsii-reflect/test/independent.test.ts     |    2 +-
 .../jsii-reflect/test/type-system.test.ts     |   20 +-
 packages/jsii/lib/assembler.ts                |   80 +-
 .../test/__snapshots__/negatives.test.js.snap |   45 +-
 packages/jsii/test/docs.test.ts               |   28 +-
 .../neg.implementation-changes-types.4.ts     |    2 +-
 .../neg.implementation-changes-types.5.ts     |    4 +-
 .../neg.inheritance-changes-types.4.ts        |    4 +-
 .../neg.inheritance-changes-types.5.ts        |    8 +-
 .../negatives/neg.member-named-after-type.ts  |   15 +
 29 files changed, 2476 insertions(+), 2279 deletions(-)
 create mode 100644 packages/jsii/test/negatives/neg.member-named-after-type.ts

diff --git a/docs/typescript-restrictions.md b/docs/typescript-restrictions.md
index 6c655cd49d..d629bf509f 100644
--- a/docs/typescript-restrictions.md
+++ b/docs/typescript-restrictions.md
@@ -75,6 +75,65 @@ users in languages with conflicts.
 
 [`jsii/lib/reserved-words.ts`]: ../packages/jsii/lib/reserved-words.ts
 
+## Type Members
+
+### Naming
+
+Methods and properties declared on *classes* cannot be named after the class (
+meaning they cannot share the same PascalCased representation), as this results
+in illegal **C#** code:
+
+> :memo: Due to existing usage (in such cases, an `_` is appended at the end of
+> the **type** name, effectively breaking existing .NET code if such a member
+> is introduced post-release), this restriction is only enforced when `jsii` is
+> invoked with the `--strict` parameter.
+>
+> It will be upgraded to *always* be an error in a future release.
+
+```ts
+export class Name {
+  // ⛔️ Illegal property name
+  public name: string;
+}
+
+export class Name {
+  // ⛔️ Illegal method name
+  public name(): void { /* ... */ }
+}
+```
+
+### Overriding
+
+The visibility of a type member cannot be changed when it is overridden, even if
+the change increases the visibility of said member, as this would result in
+illegal **C#** code:
+
+```ts
+export class Base {
+  protected method(): void { /* ... */ }
+}
+
+export class Child {
+  // ⛔️ Illegal change of visibility when overriding a member
+  public method(): void { /* ... */ }
+}
+```
+
+Additionally, **C#** does not allow changing the type signature of members while
+overriding them, even if the updated type signature is a strict specialization
+of the original one, and this is consequently also forbidden in `jsii`:
+
+```ts
+export class Base {
+  public method(): any { /* ... */ }
+}
+
+export class Child {
+  // ⛔️ Illegal change of signature when overriding a member
+  public method(): string { /* ... */ }
+}
+```
+
 ## Behavioral Interfaces & Structs
 
 `jsii` considers **TypeScript** interfaces in two distinct categories: *Structs*
diff --git a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs
index ae1ffe6985..a100ce6a4e 100644
--- a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs
+++ b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs
@@ -29,9 +29,6 @@ public RuntimeException(string message)
             }
         }
 
-        // DateTime.UnixEpoch was added in .NET Core 2.1, but our build container only supports 2.0.
-        static readonly DateTime UnixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
-
         const string Prefix = nameof(IntegrationTests) + ".Compliance.";
 
         private readonly IDisposable _serviceContainerFixture;
@@ -73,8 +70,8 @@ public void PrimitiveTypes()
             Assert.Equal(1234d, types.NumberProperty);
 
             // date
-            types.DateProperty = UnixEpoch.AddMilliseconds(123);
-            Assert.Equal(UnixEpoch.AddMilliseconds(123), types.DateProperty);
+            types.DateProperty = DateTime.UnixEpoch.AddMilliseconds(123);
+            Assert.Equal(DateTime.UnixEpoch.AddMilliseconds(123), types.DateProperty);
 
             // json
             types.JsonProperty = JObject.Parse(@"{ ""Foo"": { ""Bar"": 123 } }");
@@ -87,12 +84,12 @@ public void Dates()
             var types = new AllTypes();
 
             // strong type
-            types.DateProperty = UnixEpoch.AddMilliseconds(123);
-            Assert.Equal(UnixEpoch.AddMilliseconds(123), types.DateProperty);
+            types.DateProperty = DateTime.UnixEpoch.AddMilliseconds(123);
+            Assert.Equal(DateTime.UnixEpoch.AddMilliseconds(123), types.DateProperty);
 
             // weak type
-            types.AnyProperty = UnixEpoch.AddSeconds(999);
-            Assert.Equal(UnixEpoch.AddSeconds(999), types.AnyProperty);
+            types.AnyProperty = DateTime.UnixEpoch.AddSeconds(999);
+            Assert.Equal(DateTime.UnixEpoch.AddSeconds(999), types.AnyProperty);
         }
 
         [Fact(DisplayName = Prefix + nameof(CollectionTypes))]
@@ -142,8 +139,8 @@ public void DynamicTypes()
             Assert.Equal(12d, types.AnyProperty);
 
             // date
-            types.AnyProperty = UnixEpoch.AddSeconds(1234);
-            Assert.Equal(UnixEpoch.AddSeconds(1234), types.AnyProperty);
+            types.AnyProperty = DateTime.UnixEpoch.AddSeconds(1234);
+            Assert.Equal(DateTime.UnixEpoch.AddSeconds(1234), types.AnyProperty);
 
             // json (notice that when deserialized, it is deserialized as a map).
             types.AnyProperty = new Dictionary<string, object>
@@ -327,7 +324,7 @@ public void Arrays()
         {
             var sum = new Sum
             {
-                Parts = new Value_[] {new Number(5), new Number(10), new Multiply(new Number(2), new Number(3))}
+                Parts = new NumericValue[] {new Number(5), new Number(10), new Multiply(new Number(2), new Number(3))}
             };
             Assert.Equal(10d + 5d + 2d * 3d, sum.Value);
             Assert.Equal(5d, sum.Parts[0].Value);
@@ -591,13 +588,6 @@ public void PropertyOverrides_Interfaces()
             Assert.Equal("Hello!?", interact.WriteAndRead("Hello"));
         }
 
-        [Fact(DisplayName = Prefix + nameof(InterfaceBuilder), Skip = "There is no fluent API for C#")]
-        public void InterfaceBuilder()
-        {
-            throw new NotImplementedException();
-        }
-
-
         [Fact(DisplayName = Prefix + nameof(SyncOverrides_SyncOverrides))]
         public void SyncOverrides_SyncOverrides()
         {
@@ -746,18 +736,6 @@ public void TestInterfaceParameter()
             Assert.Equal("I am literally friendly! Let me buy you a drink!", betterGreeting);
         }
 
-        [Fact(DisplayName = Prefix + nameof(Structs_StepBuilders), Skip = "There is no fluent API for C#")]
-        public void Structs_StepBuilders()
-        {
-            throw new NotImplementedException();
-        }
-
-        [Fact(DisplayName = Prefix + nameof(Structs_BuildersContainNullChecks), Skip = "There is no fluent API for C#")]
-        public void Structs_BuildersContainNullChecks()
-        {
-            throw new NotImplementedException();
-        }
-
         [Fact(DisplayName = Prefix + nameof(Structs_SerializeToJsii))]
         public void Structs_SerializeToJsii()
         {
@@ -944,10 +922,10 @@ public void OptionalAndVariadicArgumentsTest()
             variadicClassNoParams.AsArray(double.MinValue, list.ToArray());
         }
 
-        [Fact(DisplayName = Prefix + nameof(JsiiAgent))]
-        public void JsiiAgent()
+        [Fact(DisplayName = Prefix + nameof(JsiiAgentIsCorrect))]
+        public void JsiiAgentIsCorrect()
         {
-            Assert.Equal("DotNet/" + Environment.Version + "/.NETCoreApp,Version=v3.1/1.0.0.0", JsiiAgent_.JsiiAgent);
+            Assert.Equal("DotNet/" + Environment.Version + "/.NETCoreApp,Version=v3.1/1.0.0.0", JsiiAgent.Value);
         }
 
         [Fact(DisplayName = Prefix + nameof(ReceiveInstanceOfPrivateClass))]
@@ -980,7 +958,7 @@ public void EraseUnsetDataValues()
             Assert.Equal(new Dictionary<string, object> { [ "prop1"] = "value1" }, EraseUndefinedHashValues.Prop2IsUndefined());
         }
 
-        [Fact(DisplayName = Prefix + nameof(ObjectIdDoesNotGetReallocatedWhenTheConstructorPassesThisOut), Skip = "Currently broken")]
+        [Fact(DisplayName = Prefix + nameof(ObjectIdDoesNotGetReallocatedWhenTheConstructorPassesThisOut))]
         public void ObjectIdDoesNotGetReallocatedWhenTheConstructorPassesThisOut()
         {
             var reflector = new PartiallyInitializedThisConsumerImpl();
@@ -1125,7 +1103,7 @@ class PartiallyInitializedThisConsumerImpl : PartiallyInitializedThisConsumer
             public override String ConsumePartiallyInitializedThis(ConstructorPassesThisOut obj, DateTime dt, AllTypesEnum ev)
             {
                 Assert.NotNull(obj);
-                Assert.Equal(new DateTime(0), dt);
+                Assert.Equal(DateTime.UnixEpoch, dt);
                 Assert.Equal(AllTypesEnum.THIS_IS_GREAT, ev);
 
                 return "OK";
diff --git a/packages/@jsii/java-runtime-test/project/src/test/java/software/amazon/jsii/testing/ComplianceTest.java b/packages/@jsii/java-runtime-test/project/src/test/java/software/amazon/jsii/testing/ComplianceTest.java
index 3840178d08..bdcd792368 100644
--- a/packages/@jsii/java-runtime-test/project/src/test/java/software/amazon/jsii/testing/ComplianceTest.java
+++ b/packages/@jsii/java-runtime-test/project/src/test/java/software/amazon/jsii/testing/ComplianceTest.java
@@ -17,8 +17,8 @@
 import software.amazon.jsii.tests.calculator.lib.IFriendly;
 import software.amazon.jsii.tests.calculator.lib.MyFirstStruct;
 import software.amazon.jsii.tests.calculator.lib.Number;
+import software.amazon.jsii.tests.calculator.lib.NumericValue;
 import software.amazon.jsii.tests.calculator.lib.StructWithOnlyOptionals;
-import software.amazon.jsii.tests.calculator.lib.Value;
 import software.amazon.jsii.tests.calculator.submodule.child.OuterClass;
 
 import java.io.IOException;
@@ -216,7 +216,7 @@ public void callMethods() {
     public void unmarshallIntoAbstractType() {
         Calculator calc = new Calculator();
         calc.add(120);
-        Value value = calc.getCurr();
+        NumericValue value = calc.getCurr();
         assertEquals(120, value.getValue());
     }
 
@@ -1206,7 +1206,7 @@ public void nullShouldBeTreatedAsUndefined() {
 
     @Test
     public void testJsiiAgent() {
-        assertEquals("Java/" + System.getProperty("java.version"), JsiiAgent.getJsiiAgent());
+        assertEquals("Java/" + System.getProperty("java.version"), JsiiAgent.getValue());
     }
 
     /**
diff --git a/packages/@jsii/kernel/test/kernel.test.ts b/packages/@jsii/kernel/test/kernel.test.ts
index 31f7d2ff1e..05364f3512 100644
--- a/packages/@jsii/kernel/test/kernel.test.ts
+++ b/packages/@jsii/kernel/test/kernel.test.ts
@@ -1482,7 +1482,7 @@ defineTest('nulls are converted to undefined - properties', (sandbox) => {
 
 defineTest('JSII_AGENT is undefined in node.js', (sandbox) => {
   expect(
-    sandbox.sget({ fqn: 'jsii-calc.JsiiAgent', property: 'jsiiAgent' }).value,
+    sandbox.sget({ fqn: 'jsii-calc.JsiiAgent', property: 'value' }).value,
   ).toBe(undefined);
 });
 
diff --git a/packages/@jsii/python-runtime/tests/test_compliance.py b/packages/@jsii/python-runtime/tests/test_compliance.py
index df06cc1b00..c8a9ce77be 100644
--- a/packages/@jsii/python-runtime/tests/test_compliance.py
+++ b/packages/@jsii/python-runtime/tests/test_compliance.py
@@ -915,7 +915,7 @@ def test_nullShouldBeTreatedAsUndefined():
 
 
 def test_testJsiiAgent():
-    assert JsiiAgent.jsii_agent == f"Python/{platform.python_version()}"
+    assert JsiiAgent.value == f"Python/{platform.python_version()}"
 
 
 def test_receiveInstanceOfPrivateClass():
diff --git a/packages/@scope/jsii-calc-lib/lib/index.ts b/packages/@scope/jsii-calc-lib/lib/index.ts
index bb3021338e..b4268904dd 100644
--- a/packages/@scope/jsii-calc-lib/lib/index.ts
+++ b/packages/@scope/jsii-calc-lib/lib/index.ts
@@ -3,52 +3,52 @@ import * as base from '@scope/jsii-calc-base';
 /**
  * Abstract class which represents a numeric value.
  */
-export abstract class Value extends base.Base {
-    /**
-     * The value.
-     */
-    public abstract readonly value: number;
+export abstract class NumericValue extends base.Base {
+  /**
+   * The value.
+   */
+  public abstract readonly value: number;
 
-    /**
-     * String representation of the value.
-     */
-    public toString() {
-        return this.value.toString();
-    }
+  /**
+   * String representation of the value.
+   */
+  public toString() {
+    return this.value.toString();
+  }
 }
 
 /**
  * The general contract for a concrete number.
  */
 export interface IDoublable {
-    readonly doubleValue: number;
+  readonly doubleValue: number;
 }
 
 /**
  * Represents a concrete number.
  */
-export class Number extends Value implements IDoublable {
-    /**
-     * Creates a Number object.
-     * @param value The number.
-     */
-    constructor(readonly value: number) {
-        super();
-    }
+export class Number extends NumericValue implements IDoublable {
+  /**
+   * Creates a Number object.
+   * @param value The number.
+   */
+  public constructor(public readonly value: number) {
+    super();
+  }
 
-    /**
-     * The number multiplied by 2.
-     */
-    get doubleValue() {
-        return 2 * this.value;
-    }
+  /**
+   * The number multiplied by 2.
+   */
+  public get doubleValue() {
+    return 2 * this.value;
+  }
 }
 
 /**
  * Represents an operation on values.
  */
-export abstract class Operation extends Value {
-    public abstract toString(): string;
+export abstract class Operation extends NumericValue {
+  public abstract toString(): string;
 }
 
 /**
@@ -56,38 +56,38 @@ export abstract class Operation extends Value {
  * a "hello" or "goodbye" blessing and they will respond back in a fun and friendly manner.
  */
 export interface IFriendly {
-    /**
-     * Say hello!
-     */
-    hello(): string
+  /**
+   * Say hello!
+   */
+  hello(): string;
 }
 
 /**
  * This is the first struct we have created in jsii
  */
 export interface MyFirstStruct {
-    /**
-     * A string value
-     */
-    readonly astring: string
+  /**
+   * A string value
+   */
+  readonly astring: string;
 
-    /**
-     * An awesome number value
-     */
-    readonly anumber: number
-    readonly firstOptional?: string[]
+  /**
+   * An awesome number value
+   */
+  readonly anumber: number;
+  readonly firstOptional?: string[];
 }
 
 /**
  * This is a struct with only optional properties.
  */
 export interface StructWithOnlyOptionals {
-    /**
-     * The first optional!
-     */
-    readonly optional1?: string
-    readonly optional2?: number
-    readonly optional3?: boolean
+  /**
+   * The first optional!
+   */
+  readonly optional1?: string;
+  readonly optional2?: number;
+  readonly optional3?: boolean;
 }
 
 /**
@@ -95,8 +95,8 @@ export interface StructWithOnlyOptionals {
  * See awslabs/jsii#138
  */
 export enum EnumFromScopedModule {
-    VALUE1,
-    VALUE2
+  VALUE1,
+  VALUE2,
 }
 
 /**
@@ -106,7 +106,7 @@ export enum EnumFromScopedModule {
  * far enough up the tree.
  */
 export interface IThreeLevelsInterface extends base.IBaseInterface {
-    baz(): void;
+  baz(): void;
 }
 
 export * as submodule from './submodule';
diff --git a/packages/@scope/jsii-calc-lib/test/assembly.jsii b/packages/@scope/jsii-calc-lib/test/assembly.jsii
index f810386a55..e9707f4e7d 100644
--- a/packages/@scope/jsii-calc-lib/test/assembly.jsii
+++ b/packages/@scope/jsii-calc-lib/test/assembly.jsii
@@ -314,7 +314,7 @@
     },
     "@scope/jsii-calc-lib.Number": {
       "assembly": "@scope/jsii-calc-lib",
-      "base": "@scope/jsii-calc-lib.Value",
+      "base": "@scope/jsii-calc-lib.NumericValue",
       "docs": {
         "stability": "deprecated",
         "summary": "Represents a concrete number."
@@ -378,7 +378,60 @@
             "line": 35
           },
           "name": "value",
-          "overrides": "@scope/jsii-calc-lib.Value",
+          "overrides": "@scope/jsii-calc-lib.NumericValue",
+          "type": {
+            "primitive": "number"
+          }
+        }
+      ]
+    },
+    "@scope/jsii-calc-lib.NumericValue": {
+      "abstract": true,
+      "assembly": "@scope/jsii-calc-lib",
+      "base": "@scope/jsii-calc-base.Base",
+      "docs": {
+        "stability": "deprecated",
+        "summary": "Abstract class which represents a numeric value."
+      },
+      "fqn": "@scope/jsii-calc-lib.NumericValue",
+      "initializer": {},
+      "kind": "class",
+      "locationInModule": {
+        "filename": "lib/index.ts",
+        "line": 6
+      },
+      "methods": [
+        {
+          "docs": {
+            "stability": "deprecated",
+            "summary": "String representation of the value."
+          },
+          "locationInModule": {
+            "filename": "lib/index.ts",
+            "line": 15
+          },
+          "name": "toString",
+          "returns": {
+            "type": {
+              "primitive": "string"
+            }
+          }
+        }
+      ],
+      "name": "NumericValue",
+      "properties": [
+        {
+          "abstract": true,
+          "docs": {
+            "stability": "deprecated",
+            "summary": "The value."
+          },
+          "immutable": true,
+          "locationInModule": {
+            "filename": "lib/index.ts",
+            "line": 10
+          },
+          "name": "value",
           "type": {
             "primitive": "number"
           }
@@ -388,7 +441,7 @@
     "@scope/jsii-calc-lib.Operation": {
       "abstract": true,
       "assembly": "@scope/jsii-calc-lib",
-      "base": "@scope/jsii-calc-lib.Value",
+      "base": "@scope/jsii-calc-lib.NumericValue",
       "docs": {
         "stability": "deprecated",
         "summary": "Represents an operation on values."
@@ -412,7 +465,7 @@
             "line": 51
           },
           "name": "toString",
-          "overrides": "@scope/jsii-calc-lib.Value",
+          "overrides": "@scope/jsii-calc-lib.NumericValue",
           "returns": {
             "type": {
               "primitive": "string"
@@ -488,59 +541,6 @@
         }
       ]
     },
-    "@scope/jsii-calc-lib.Value": {
-      "abstract": true,
-      "assembly": "@scope/jsii-calc-lib",
-      "base": "@scope/jsii-calc-base.Base",
-      "docs": {
-        "stability": "deprecated",
-        "summary": "Abstract class which represents a numeric value."
-      },
-      "fqn": "@scope/jsii-calc-lib.Value",
-      "initializer": {},
-      "kind": "class",
-      "locationInModule": {
-        "filename": "lib/index.ts",
-        "line": 6
-      },
-      "methods": [
-        {
-          "docs": {
-            "stability": "deprecated",
-            "summary": "String representation of the value."
-          },
-          "locationInModule": {
-            "filename": "lib/index.ts",
-            "line": 15
-          },
-          "name": "toString",
-          "returns": {
-            "type": {
-              "primitive": "string"
-            }
-          }
-        }
-      ],
-      "name": "Value",
-      "properties": [
-        {
-          "abstract": true,
-          "docs": {
-            "stability": "deprecated",
-            "summary": "The value."
-          },
-          "immutable": true,
-          "locationInModule": {
-            "filename": "lib/index.ts",
-            "line": 10
-          },
-          "name": "value",
-          "type": {
-            "primitive": "number"
-          }
-        }
-      ]
-    },
     "@scope/jsii-calc-lib.submodule.IReflectable": {
       "assembly": "@scope/jsii-calc-lib",
       "docs": {
@@ -760,5 +760,5 @@
     }
   },
   "version": "0.0.0",
-  "fingerprint": "eQh0XE5tmf4g2rxlhgkrIZJ93RG55/oLM+RNpmaQyGs="
+  "fingerprint": "kLS1ei6Uc31/IKA//k3OZp65Lxz+2tLyQOO/qSYpvSE="
 }
diff --git a/packages/jsii-calc/lib/calculator.ts b/packages/jsii-calc/lib/calculator.ts
index 39fcf4134f..51743e0d58 100644
--- a/packages/jsii-calc/lib/calculator.ts
+++ b/packages/jsii-calc/lib/calculator.ts
@@ -1,7 +1,11 @@
-import { Operation, Value, Number, IFriendly } from '@scope/jsii-calc-lib';
+import {
+  Operation,
+  NumericValue,
+  Number,
+  IFriendly,
+} from '@scope/jsii-calc-lib';
 
 /* eslint-disable
-  @typescript-eslint/explicit-module-boundary-types,
   @typescript-eslint/no-namespace,
   @typescript-eslint/member-ordering,
 */
@@ -46,7 +50,10 @@ export abstract class BinaryOperation extends Operation implements IFriendly {
    * @param lhs Left-hand side operand
    * @param rhs Right-hand side operand
    */
-  public constructor(public readonly lhs: Value, public readonly rhs: Value) {
+  public constructor(
+    public readonly lhs: NumericValue,
+    public readonly rhs: NumericValue,
+  ) {
     super();
   }
 
@@ -98,7 +105,7 @@ export class Multiply extends BinaryOperation
  * An operation on a single operand.
  */
 export abstract class UnaryOperation extends Operation {
-  public constructor(public readonly operand: Value) {
+  public constructor(public readonly operand: NumericValue) {
     super();
   }
 }
@@ -159,7 +166,7 @@ export namespace composition {
      * The expression that this operation consists of.
      * Must be implemented by derived classes.
      */
-    abstract readonly expression: Value;
+    abstract readonly expression: NumericValue;
 
     public toString() {
       switch (this.stringStyle) {
@@ -198,7 +205,7 @@ export class Sum extends composition.CompositeOperation {
   /**
    * The parts to sum.
    */
-  public parts: Value[] = [];
+  public parts: NumericValue[] = [];
 
   // TODO: some annoying bug in Nashorn will throw this exception if
   // call that prototype's ctor via "apply" instead: java.lang.AssertionError: duplicate code
@@ -207,7 +214,7 @@ export class Sum extends composition.CompositeOperation {
   }
 
   public get expression() {
-    let curr: Value = new Number(0);
+    let curr: NumericValue = new Number(0);
     for (const part of this.parts) {
       curr = new Add(curr, part);
     }
@@ -224,11 +231,14 @@ export class Power extends composition.CompositeOperation {
    * @param base The base of the power
    * @param pow The number of times to multiply
    */
-  public constructor(public readonly base: Value, public readonly pow: Value) {
+  public constructor(
+    public readonly base: NumericValue,
+    public readonly pow: NumericValue,
+  ) {
     super();
   }
 
-  public get expression(): Value {
+  public get expression(): NumericValue {
     let curr: Operation = new Number(1);
     for (let i = 0; i < this.pow.value; ++i) {
       curr = new Multiply(curr, this.base);
@@ -297,17 +307,17 @@ export class Calculator extends composition.CompositeOperation {
   /**
    * The current value.
    */
-  public curr: Value;
+  public curr: NumericValue;
 
   /**
    * A map of per operation name of all operations performed.
    */
-  public readonly operationsMap: { [op: string]: Value[] } = {};
+  public readonly operationsMap: { [op: string]: NumericValue[] } = {};
 
   /**
    * A log of all operations.
    */
-  public readonly operationsLog = new Array<Value>();
+  public readonly operationsLog = new Array<NumericValue>();
 
   /**
    * The maximum value allows in this calculator.
@@ -365,7 +375,7 @@ export class Calculator extends composition.CompositeOperation {
     return this.unionProperty.value;
   }
 
-  private addOperation(op: string, value: Value) {
+  private addOperation(op: string, value: NumericValue) {
     if (this.maxValue && value.value > this.maxValue) {
       throw new Error(
         `Operation ${value.value} exceeded maximum value ${this.maxValue}`,
@@ -374,7 +384,7 @@ export class Calculator extends composition.CompositeOperation {
 
     let list = this.operationsMap[op];
     if (!list) {
-      list = new Array<Value>();
+      list = new Array<NumericValue>();
       this.operationsMap[op] = list;
     }
     list.push(value);
diff --git a/packages/jsii-calc/lib/compliance.ts b/packages/jsii-calc/lib/compliance.ts
index 2163f680b8..052284a009 100644
--- a/packages/jsii-calc/lib/compliance.ts
+++ b/packages/jsii-calc/lib/compliance.ts
@@ -5,7 +5,7 @@ import {
   MyFirstStruct,
   Number as LibNumber,
   StructWithOnlyOptionals,
-  Value,
+  NumericValue,
 } from '@scope/jsii-calc-lib';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -19,7 +19,6 @@ import {
 } from './calculator';
 
 /* eslint-disable
-  @typescript-eslint/explicit-module-boundary-types,
   @typescript-eslint/no-namespace,
   @typescript-eslint/member-ordering,
 */
@@ -189,7 +188,7 @@ export class AllTypes {
   // unions
 
   public unionProperty: string | number | LibNumber | Multiply = 'foo';
-  public unionArrayProperty: Array<Value | number> = [];
+  public unionArrayProperty: Array<NumericValue | number> = [];
   public unionMapProperty: { [key: string]: LibNumber | number | string } = {};
 
   // enum
@@ -265,7 +264,7 @@ export class ObjectRefsInCollections {
   /**
    * Returns the sum of all values
    */
-  public sumFromArray(values: Value[]) {
+  public sumFromArray(values: NumericValue[]) {
     let sum = 0;
     for (const val of values) {
       sum += val.value;
@@ -276,7 +275,7 @@ export class ObjectRefsInCollections {
   /**
    * Returns the sum of all values in a map
    */
-  public sumFromMap(values: { [key: string]: Value }) {
+  public sumFromMap(values: { [key: string]: NumericValue }) {
     let sum = 0;
     for (const key of Object.keys(values)) {
       sum += values[key].value;
@@ -550,7 +549,7 @@ export interface DerivedStruct extends MyFirstStruct {
   /**
    * This is optional.
    */
-  readonly anotherOptional?: { [key: string]: Value };
+  readonly anotherOptional?: { [key: string]: NumericValue };
 }
 
 export class GiveMeStructs {
@@ -1529,7 +1528,7 @@ export class JsiiAgent {
   /**
    * Returns the value of the JSII_AGENT environment variable.
    */
-  public static get jsiiAgent(): string | undefined {
+  public static get value(): string | undefined {
     return process.env.JSII_AGENT;
   }
 }
diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii
index ac9fd2e83a..a4f33235c5 100644
--- a/packages/jsii-calc/test/assembly.jsii
+++ b/packages/jsii-calc/test/assembly.jsii
@@ -169,31 +169,31 @@
     "jsii-calc.DerivedClassHasNoProperties": {
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 325
+        "line": 324
       }
     },
     "jsii-calc.InterfaceInNamespaceIncludesClasses": {
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1206
+        "line": 1205
       }
     },
     "jsii-calc.InterfaceInNamespaceOnlyInterface": {
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1199
+        "line": 1198
       }
     },
     "jsii-calc.PythonSelf": {
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1090
+        "line": 1089
       }
     },
     "jsii-calc.composition": {
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 134
+        "line": 141
       }
     },
     "jsii-calc.submodule": {
@@ -278,7 +278,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1250
+        "line": 1249
       },
       "methods": [
         {
@@ -288,7 +288,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1256
+            "line": 1255
           },
           "name": "abstractMethod",
           "parameters": [
@@ -311,7 +311,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1252
+            "line": 1251
           },
           "name": "nonAbstractMethod",
           "returns": {
@@ -330,7 +330,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1258
+            "line": 1257
           },
           "name": "propFromInterface",
           "overrides": "jsii-calc.IInterfaceImplementedByAbstractClass",
@@ -355,7 +355,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1246
+        "line": 1245
       },
       "name": "AbstractClassBase",
       "properties": [
@@ -367,7 +367,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1247
+            "line": 1246
           },
           "name": "abstractProperty",
           "type": {
@@ -390,7 +390,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1273
+        "line": 1272
       },
       "methods": [
         {
@@ -399,7 +399,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1274
+            "line": 1273
           },
           "name": "giveMeAbstract",
           "returns": {
@@ -414,7 +414,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1278
+            "line": 1277
           },
           "name": "giveMeInterface",
           "returns": {
@@ -433,7 +433,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1282
+            "line": 1281
           },
           "name": "returnAbstractFromProperty",
           "type": {
@@ -458,7 +458,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 411
+        "line": 421
       },
       "methods": [
         {
@@ -468,7 +468,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 413
+            "line": 423
           },
           "name": "someMethod",
           "parameters": [
@@ -493,7 +493,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 419
+            "line": 429
           },
           "name": "workItAll",
           "parameters": [
@@ -523,7 +523,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 412
+            "line": 422
           },
           "name": "property",
           "protected": true,
@@ -548,7 +548,7 @@
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 49
+          "line": 53
         },
         "parameters": [
           {
@@ -557,7 +557,7 @@
             },
             "name": "lhs",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           },
           {
@@ -566,7 +566,7 @@
             },
             "name": "rhs",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           }
         ]
@@ -574,7 +574,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 61
+        "line": 68
       },
       "methods": [
         {
@@ -584,7 +584,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 66
+            "line": 73
           },
           "name": "toString",
           "overrides": "@scope/jsii-calc-lib.Operation",
@@ -605,10 +605,10 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 62
+            "line": 69
           },
           "name": "value",
-          "overrides": "@scope/jsii-calc-lib.Value",
+          "overrides": "@scope/jsii-calc-lib.NumericValue",
           "type": {
             "primitive": "number"
           }
@@ -631,7 +631,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 63
+        "line": 62
       },
       "methods": [
         {
@@ -640,7 +640,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 232
+            "line": 231
           },
           "name": "anyIn",
           "parameters": [
@@ -658,7 +658,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 224
+            "line": 223
           },
           "name": "anyOut",
           "returns": {
@@ -673,7 +673,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 220
+            "line": 219
           },
           "name": "enumMethod",
           "parameters": [
@@ -700,7 +700,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 216
+            "line": 215
           },
           "name": "enumPropertyValue",
           "type": {
@@ -713,7 +713,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 180
+            "line": 179
           },
           "name": "anyArrayProperty",
           "type": {
@@ -731,7 +731,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 181
+            "line": 180
           },
           "name": "anyMapProperty",
           "type": {
@@ -749,7 +749,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 179
+            "line": 178
           },
           "name": "anyProperty",
           "type": {
@@ -762,7 +762,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 165
+            "line": 164
           },
           "name": "arrayProperty",
           "type": {
@@ -780,7 +780,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 68
+            "line": 67
           },
           "name": "booleanProperty",
           "type": {
@@ -793,7 +793,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 114
+            "line": 113
           },
           "name": "dateProperty",
           "type": {
@@ -806,7 +806,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 200
+            "line": 199
           },
           "name": "enumProperty",
           "type": {
@@ -819,7 +819,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 133
+            "line": 132
           },
           "name": "jsonProperty",
           "type": {
@@ -832,7 +832,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 150
+            "line": 149
           },
           "name": "mapProperty",
           "type": {
@@ -850,7 +850,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 99
+            "line": 98
           },
           "name": "numberProperty",
           "type": {
@@ -863,7 +863,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 83
+            "line": 82
           },
           "name": "stringProperty",
           "type": {
@@ -876,7 +876,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 192
+            "line": 191
           },
           "name": "unionArrayProperty",
           "type": {
@@ -888,7 +888,7 @@
                       "primitive": "number"
                     },
                     {
-                      "fqn": "@scope/jsii-calc-lib.Value"
+                      "fqn": "@scope/jsii-calc-lib.NumericValue"
                     }
                   ]
                 }
@@ -903,7 +903,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 193
+            "line": 192
           },
           "name": "unionMapProperty",
           "type": {
@@ -933,7 +933,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 191
+            "line": 190
           },
           "name": "unionProperty",
           "type": {
@@ -961,7 +961,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 186
+            "line": 185
           },
           "name": "unknownArrayProperty",
           "type": {
@@ -979,7 +979,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 187
+            "line": 186
           },
           "name": "unknownMapProperty",
           "type": {
@@ -997,7 +997,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 185
+            "line": 184
           },
           "name": "unknownProperty",
           "type": {
@@ -1010,7 +1010,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 197
+            "line": 196
           },
           "name": "optionalEnumValue",
           "optional": true,
@@ -1029,7 +1029,7 @@
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 33
+        "line": 32
       },
       "members": [
         {
@@ -1067,7 +1067,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 615
+        "line": 614
       },
       "methods": [
         {
@@ -1076,7 +1076,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 623
+            "line": 622
           },
           "name": "getBar",
           "parameters": [
@@ -1101,7 +1101,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 619
+            "line": 618
           },
           "name": "getFoo",
           "parameters": [
@@ -1124,7 +1124,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 634
+            "line": 633
           },
           "name": "setBar",
           "parameters": [
@@ -1155,7 +1155,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 630
+            "line": 629
           },
           "name": "setFoo",
           "parameters": [
@@ -1188,7 +1188,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2683
+          "line": 2682
         },
         "parameters": [
           {
@@ -1208,7 +1208,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2682
+        "line": 2681
       },
       "name": "AmbiguousParameters",
       "properties": [
@@ -1219,7 +1219,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2685
+            "line": 2684
           },
           "name": "props",
           "type": {
@@ -1233,7 +1233,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2684
+            "line": 2683
           },
           "name": "scope",
           "type": {
@@ -1259,7 +1259,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2212
+        "line": 2211
       },
       "methods": [
         {
@@ -1268,7 +1268,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2216
+            "line": 2215
           },
           "name": "provideAsClass",
           "overrides": "jsii-calc.IAnonymousImplementationProvider",
@@ -1284,7 +1284,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2220
+            "line": 2219
           },
           "name": "provideAsInterface",
           "overrides": "jsii-calc.IAnonymousImplementationProvider",
@@ -1311,7 +1311,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 333
+        "line": 332
       },
       "methods": [
         {
@@ -1321,7 +1321,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 334
+            "line": 333
           },
           "name": "callMe",
           "returns": {
@@ -1338,7 +1338,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 353
+            "line": 352
           },
           "name": "callMe2",
           "returns": {
@@ -1356,7 +1356,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 363
+            "line": 362
           },
           "name": "callMeDoublePromise",
           "returns": {
@@ -1371,7 +1371,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 371
+            "line": 370
           },
           "name": "dontOverrideMe",
           "returns": {
@@ -1387,7 +1387,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 342
+            "line": 341
           },
           "name": "overrideMe",
           "parameters": [
@@ -1411,7 +1411,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 346
+            "line": 345
           },
           "name": "overrideMeToo",
           "returns": {
@@ -1437,7 +1437,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1539
+        "line": 1538
       },
       "methods": [
         {
@@ -1446,7 +1446,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1540
+            "line": 1539
           },
           "name": "methodOne"
         },
@@ -1456,7 +1456,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1546
+            "line": 1545
           },
           "name": "methodTwo"
         }
@@ -1477,7 +1477,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2477
+        "line": 2476
       },
       "name": "BaseJsii976"
     },
@@ -1498,7 +1498,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2421
+        "line": 2420
       },
       "methods": [
         {
@@ -1507,7 +1507,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2424
+            "line": 2423
           },
           "name": "ring",
           "overrides": "jsii-calc.IBell"
@@ -1521,7 +1521,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2422
+            "line": 2421
           },
           "name": "rung",
           "type": {
@@ -1546,7 +1546,7 @@
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 49
+          "line": 53
         },
         "parameters": [
           {
@@ -1555,7 +1555,7 @@
             },
             "name": "lhs",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           },
           {
@@ -1564,7 +1564,7 @@
             },
             "name": "rhs",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           }
         ]
@@ -1575,7 +1575,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 43
+        "line": 47
       },
       "methods": [
         {
@@ -1585,7 +1585,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 53
+            "line": 60
           },
           "name": "hello",
           "overrides": "@scope/jsii-calc-lib.IFriendly",
@@ -1606,11 +1606,11 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 49
+            "line": 54
           },
           "name": "lhs",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         },
         {
@@ -1621,11 +1621,11 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 49
+            "line": 55
           },
           "name": "rhs",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         }
       ]
@@ -1646,7 +1646,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2767
+        "line": 2766
       },
       "methods": [
         {
@@ -1655,7 +1655,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2768
+            "line": 2767
           },
           "name": "check",
           "returns": {
@@ -1673,7 +1673,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2785
+            "line": 2784
           },
           "name": "giveItBack",
           "parameters": [
@@ -1713,7 +1713,7 @@
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 287
+          "line": 297
         },
         "parameters": [
           {
@@ -1731,7 +1731,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 282
+        "line": 292
       },
       "methods": [
         {
@@ -1741,7 +1741,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 320
+            "line": 330
           },
           "name": "add",
           "parameters": [
@@ -1760,7 +1760,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 327
+            "line": 337
           },
           "name": "mul",
           "parameters": [
@@ -1779,7 +1779,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 341
+            "line": 351
           },
           "name": "neg"
         },
@@ -1790,7 +1790,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 334
+            "line": 344
           },
           "name": "pow",
           "parameters": [
@@ -1809,7 +1809,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 360
+            "line": 370
           },
           "name": "readUnionValue",
           "returns": {
@@ -1829,12 +1829,12 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 348
+            "line": 358
           },
           "name": "expression",
           "overrides": "jsii-calc.composition.CompositeOperation",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         },
         {
@@ -1845,13 +1845,13 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 310
+            "line": 320
           },
           "name": "operationsLog",
           "type": {
             "collection": {
               "elementtype": {
-                "fqn": "@scope/jsii-calc-lib.Value"
+                "fqn": "@scope/jsii-calc-lib.NumericValue"
               },
               "kind": "array"
             }
@@ -1865,7 +1865,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 305
+            "line": 315
           },
           "name": "operationsMap",
           "type": {
@@ -1873,7 +1873,7 @@
               "elementtype": {
                 "collection": {
                   "elementtype": {
-                    "fqn": "@scope/jsii-calc-lib.Value"
+                    "fqn": "@scope/jsii-calc-lib.NumericValue"
                   },
                   "kind": "array"
                 }
@@ -1889,11 +1889,11 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 300
+            "line": 310
           },
           "name": "curr",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         },
         {
@@ -1903,7 +1903,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 315
+            "line": 325
           },
           "name": "maxValue",
           "optional": true,
@@ -1918,7 +1918,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 355
+            "line": 365
           },
           "name": "unionProperty",
           "optional": true,
@@ -1951,7 +1951,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 243
+        "line": 253
       },
       "name": "CalculatorProps",
       "properties": [
@@ -1966,7 +1966,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 251
+            "line": 261
           },
           "name": "initialValue",
           "optional": true,
@@ -1984,7 +1984,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 258
+            "line": 268
           },
           "name": "maximumValue",
           "optional": true,
@@ -2007,7 +2007,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2501
+        "line": 2500
       },
       "name": "ChildStruct982",
       "properties": [
@@ -2019,7 +2019,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2502
+            "line": 2501
           },
           "name": "bar",
           "type": {
@@ -2045,7 +2045,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1802
+        "line": 1801
       },
       "name": "ClassThatImplementsTheInternalInterface",
       "properties": [
@@ -2055,7 +2055,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1806
+            "line": 1805
           },
           "name": "a",
           "overrides": "jsii-calc.IAnotherPublicInterface",
@@ -2069,7 +2069,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1807
+            "line": 1806
           },
           "name": "b",
           "overrides": "jsii-calc.INonInternalInterface",
@@ -2083,7 +2083,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1808
+            "line": 1807
           },
           "name": "c",
           "overrides": "jsii-calc.INonInternalInterface",
@@ -2097,7 +2097,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1809
+            "line": 1808
           },
           "name": "d",
           "type": {
@@ -2123,7 +2123,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1812
+        "line": 1811
       },
       "name": "ClassThatImplementsThePrivateInterface",
       "properties": [
@@ -2133,7 +2133,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1814
+            "line": 1813
           },
           "name": "a",
           "overrides": "jsii-calc.IAnotherPublicInterface",
@@ -2147,7 +2147,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1815
+            "line": 1814
           },
           "name": "b",
           "overrides": "jsii-calc.INonInternalInterface",
@@ -2161,7 +2161,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1816
+            "line": 1815
           },
           "name": "c",
           "overrides": "jsii-calc.INonInternalInterface",
@@ -2175,7 +2175,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1817
+            "line": 1816
           },
           "name": "e",
           "type": {
@@ -2196,7 +2196,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2118
+          "line": 2117
         },
         "parameters": [
           {
@@ -2226,7 +2226,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2108
+        "line": 2107
       },
       "methods": [
         {
@@ -2235,7 +2235,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2123
+            "line": 2122
           },
           "name": "createAList",
           "returns": {
@@ -2256,7 +2256,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2127
+            "line": 2126
           },
           "name": "createAMap",
           "returns": {
@@ -2280,7 +2280,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2116
+            "line": 2115
           },
           "name": "staticArray",
           "static": true,
@@ -2299,7 +2299,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2112
+            "line": 2111
           },
           "name": "staticMap",
           "static": true,
@@ -2318,7 +2318,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2110
+            "line": 2109
           },
           "name": "array",
           "type": {
@@ -2336,7 +2336,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2109
+            "line": 2108
           },
           "name": "map",
           "type": {
@@ -2371,7 +2371,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1885
+        "line": 1884
       },
       "name": "ClassWithDocs"
     },
@@ -2387,7 +2387,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2058
+          "line": 2057
         },
         "parameters": [
           {
@@ -2401,7 +2401,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2055
+        "line": 2054
       },
       "methods": [
         {
@@ -2410,7 +2410,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2062
+            "line": 2061
           },
           "name": "import",
           "parameters": [
@@ -2437,7 +2437,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2056
+            "line": 2055
           },
           "name": "int",
           "type": {
@@ -2460,7 +2460,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1293
+        "line": 1292
       },
       "name": "ClassWithMutableObjectLiteralProperty",
       "properties": [
@@ -2470,7 +2470,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1294
+            "line": 1293
           },
           "name": "mutableObject",
           "type": {
@@ -2492,7 +2492,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1320
+        "line": 1319
       },
       "methods": [
         {
@@ -2501,7 +2501,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1322
+            "line": 1321
           },
           "name": "create",
           "parameters": [
@@ -2535,7 +2535,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1330
+            "line": 1329
           },
           "name": "readOnlyString",
           "overrides": "jsii-calc.IInterfaceWithProperties",
@@ -2549,7 +2549,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1331
+            "line": 1330
           },
           "name": "readWriteString",
           "overrides": "jsii-calc.IInterfaceWithProperties",
@@ -2570,7 +2570,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2640
+        "line": 2639
       },
       "methods": [
         {
@@ -2579,7 +2579,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2641
+            "line": 2640
           },
           "name": "makeInstance",
           "returns": {
@@ -2595,7 +2595,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2645
+            "line": 2644
           },
           "name": "makeStructInstance",
           "returns": {
@@ -2614,7 +2614,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2649
+            "line": 2648
           },
           "name": "unionProperty",
           "optional": true,
@@ -2657,7 +2657,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2653
+        "line": 2652
       },
       "name": "ConfusingToJacksonStruct",
       "properties": [
@@ -2669,7 +2669,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2654
+            "line": 2653
           },
           "name": "unionProperty",
           "optional": true,
@@ -2714,7 +2714,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1842
+          "line": 1841
         },
         "parameters": [
           {
@@ -2728,7 +2728,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1841
+        "line": 1840
       },
       "name": "ConstructorPassesThisOut"
     },
@@ -2746,7 +2746,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1587
+        "line": 1586
       },
       "methods": [
         {
@@ -2755,7 +2755,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1604
+            "line": 1603
           },
           "name": "hiddenInterface",
           "returns": {
@@ -2771,7 +2771,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1608
+            "line": 1607
           },
           "name": "hiddenInterfaces",
           "returns": {
@@ -2792,7 +2792,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1612
+            "line": 1611
           },
           "name": "hiddenSubInterfaces",
           "returns": {
@@ -2813,7 +2813,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1588
+            "line": 1587
           },
           "name": "makeClass",
           "returns": {
@@ -2829,7 +2829,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1592
+            "line": 1591
           },
           "name": "makeInterface",
           "returns": {
@@ -2845,7 +2845,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1596
+            "line": 1595
           },
           "name": "makeInterface2",
           "returns": {
@@ -2861,7 +2861,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1600
+            "line": 1599
           },
           "name": "makeInterfaces",
           "returns": {
@@ -2891,7 +2891,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2664
+          "line": 2663
         },
         "parameters": [
           {
@@ -2905,7 +2905,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2663
+        "line": 2662
       },
       "methods": [
         {
@@ -2914,7 +2914,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2666
+            "line": 2665
           },
           "name": "workItBaby",
           "returns": {
@@ -2942,7 +2942,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2306
+        "line": 2305
       },
       "methods": [
         {
@@ -2953,7 +2953,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2312
+            "line": 2311
           },
           "name": "staticImplementedByObjectLiteral",
           "parameters": [
@@ -2979,7 +2979,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2338
+            "line": 2337
           },
           "name": "staticImplementedByPrivateClass",
           "parameters": [
@@ -3005,7 +3005,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2327
+            "line": 2326
           },
           "name": "staticImplementedByPublicClass",
           "parameters": [
@@ -3031,7 +3031,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2349
+            "line": 2348
           },
           "name": "staticWhenTypedAsClass",
           "parameters": [
@@ -3057,7 +3057,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2359
+            "line": 2358
           },
           "name": "implementedByObjectLiteral",
           "parameters": [
@@ -3082,7 +3082,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2385
+            "line": 2384
           },
           "name": "implementedByPrivateClass",
           "parameters": [
@@ -3107,7 +3107,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2374
+            "line": 2373
           },
           "name": "implementedByPublicClass",
           "parameters": [
@@ -3132,7 +3132,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2396
+            "line": 2395
           },
           "name": "whenTypedAsClass",
           "parameters": [
@@ -3166,7 +3166,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1820
+        "line": 1819
       },
       "methods": [
         {
@@ -3175,7 +3175,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1821
+            "line": 1820
           },
           "name": "consumeAnotherPublicInterface",
           "parameters": [
@@ -3198,7 +3198,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1825
+            "line": 1824
           },
           "name": "consumeNonInternalInterface",
           "parameters": [
@@ -3233,7 +3233,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1981
+        "line": 1980
       },
       "methods": [
         {
@@ -3242,7 +3242,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1982
+            "line": 1981
           },
           "name": "render",
           "parameters": [
@@ -3266,7 +3266,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1988
+            "line": 1987
           },
           "name": "renderArbitrary",
           "parameters": [
@@ -3294,7 +3294,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1992
+            "line": 1991
           },
           "name": "renderMap",
           "parameters": [
@@ -3331,7 +3331,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 318
+          "line": 317
         },
         "parameters": [
           {
@@ -3360,7 +3360,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 317
+        "line": 316
       },
       "name": "DefaultedConstructorArgument",
       "properties": [
@@ -3371,7 +3371,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 319
+            "line": 318
           },
           "name": "arg1",
           "type": {
@@ -3385,7 +3385,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 321
+            "line": 320
           },
           "name": "arg3",
           "type": {
@@ -3399,7 +3399,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 320
+            "line": 319
           },
           "name": "arg2",
           "optional": true,
@@ -3425,7 +3425,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2508
+        "line": 2507
       },
       "methods": [
         {
@@ -3435,7 +3435,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2515
+            "line": 2514
           },
           "name": "takeThis",
           "returns": {
@@ -3452,7 +3452,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2520
+            "line": 2519
           },
           "name": "takeThisToo",
           "returns": {
@@ -3626,7 +3626,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 326
+        "line": 325
       },
       "name": "Base",
       "namespace": "DerivedClassHasNoProperties",
@@ -3637,7 +3637,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 327
+            "line": 326
           },
           "name": "prop",
           "type": {
@@ -3661,7 +3661,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 330
+        "line": 329
       },
       "name": "Derived",
       "namespace": "DerivedClassHasNoProperties"
@@ -3680,7 +3680,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 541
+        "line": 540
       },
       "name": "DerivedStruct",
       "properties": [
@@ -3692,7 +3692,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 547
+            "line": 546
           },
           "name": "anotherRequired",
           "type": {
@@ -3707,7 +3707,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 546
+            "line": 545
           },
           "name": "bool",
           "type": {
@@ -3723,7 +3723,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 545
+            "line": 544
           },
           "name": "nonPrimitive",
           "type": {
@@ -3739,14 +3739,14 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 553
+            "line": 552
           },
           "name": "anotherOptional",
           "optional": true,
           "type": {
             "collection": {
               "elementtype": {
-                "fqn": "@scope/jsii-calc-lib.Value"
+                "fqn": "@scope/jsii-calc-lib.NumericValue"
               },
               "kind": "map"
             }
@@ -3760,7 +3760,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 549
+            "line": 548
           },
           "name": "optionalAny",
           "optional": true,
@@ -3776,7 +3776,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 548
+            "line": 547
           },
           "name": "optionalArray",
           "optional": true,
@@ -3801,7 +3801,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2026
+        "line": 2025
       },
       "name": "DiamondInheritanceBaseLevelStruct",
       "properties": [
@@ -3813,7 +3813,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2027
+            "line": 2026
           },
           "name": "baseLevelProperty",
           "type": {
@@ -3835,7 +3835,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2030
+        "line": 2029
       },
       "name": "DiamondInheritanceFirstMidLevelStruct",
       "properties": [
@@ -3847,7 +3847,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2032
+            "line": 2031
           },
           "name": "firstMidLevelProperty",
           "type": {
@@ -3869,7 +3869,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2035
+        "line": 2034
       },
       "name": "DiamondInheritanceSecondMidLevelStruct",
       "properties": [
@@ -3881,7 +3881,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2037
+            "line": 2036
           },
           "name": "secondMidLevelProperty",
           "type": {
@@ -3904,7 +3904,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2040
+        "line": 2039
       },
       "name": "DiamondInheritanceTopLevelStruct",
       "properties": [
@@ -3916,7 +3916,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2043
+            "line": 2042
           },
           "name": "topLevelProperty",
           "type": {
@@ -3936,7 +3936,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2530
+        "line": 2529
       },
       "name": "DisappointingCollectionSource",
       "properties": [
@@ -3950,7 +3950,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2532
+            "line": 2531
           },
           "name": "maybeList",
           "optional": true,
@@ -3974,7 +3974,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2534
+            "line": 2533
           },
           "name": "maybeMap",
           "optional": true,
@@ -4004,7 +4004,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1297
+        "line": 1296
       },
       "methods": [
         {
@@ -4013,7 +4013,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1312
+            "line": 1311
           },
           "name": "changePrivatePropertyValue",
           "parameters": [
@@ -4031,7 +4031,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1304
+            "line": 1303
           },
           "name": "privateMethodValue",
           "returns": {
@@ -4046,7 +4046,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1308
+            "line": 1307
           },
           "name": "privatePropertyValue",
           "returns": {
@@ -4073,7 +4073,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1353
+        "line": 1352
       },
       "methods": [
         {
@@ -4082,7 +4082,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1354
+            "line": 1353
           },
           "name": "method",
           "parameters": [
@@ -4188,7 +4188,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1430
+        "line": 1429
       },
       "methods": [
         {
@@ -4197,7 +4197,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1431
+            "line": 1430
           },
           "name": "optionalAndVariadic",
           "parameters": [
@@ -4243,7 +4243,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 485
+        "line": 484
       },
       "methods": [
         {
@@ -4253,7 +4253,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 490
+            "line": 489
           },
           "name": "hello",
           "overrides": "@scope/jsii-calc-lib.IFriendly",
@@ -4270,7 +4270,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 486
+            "line": 485
           },
           "name": "next",
           "overrides": "jsii-calc.IRandomNumberGenerator",
@@ -4296,7 +4296,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2794
+          "line": 2793
         },
         "parameters": [
           {
@@ -4310,7 +4310,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2793
+        "line": 2792
       },
       "name": "DynamicPropertyBearer",
       "properties": [
@@ -4320,7 +4320,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2796
+            "line": 2795
           },
           "name": "dynamicProperty",
           "type": {
@@ -4333,7 +4333,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2794
+            "line": 2793
           },
           "name": "valueStore",
           "type": {
@@ -4355,7 +4355,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2805
+          "line": 2804
         },
         "parameters": [
           {
@@ -4369,7 +4369,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2804
+        "line": 2803
       },
       "methods": [
         {
@@ -4380,7 +4380,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2816
+            "line": 2815
           },
           "name": "overrideValue",
           "parameters": [
@@ -4410,7 +4410,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2805
+            "line": 2804
           },
           "name": "originalValue",
           "type": {
@@ -4428,7 +4428,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 45
+        "line": 44
       },
       "methods": [
         {
@@ -4437,7 +4437,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 51
+            "line": 50
           },
           "name": "randomIntegerLikeEnum",
           "returns": {
@@ -4453,7 +4453,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 46
+            "line": 45
           },
           "name": "randomStringLikeEnum",
           "returns": {
@@ -4480,7 +4480,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1643
+        "line": 1642
       },
       "methods": [
         {
@@ -4491,7 +4491,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1648
+            "line": 1647
           },
           "name": "doesKeyExist",
           "parameters": [
@@ -4522,7 +4522,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1668
+            "line": 1667
           },
           "name": "prop1IsNull",
           "returns": {
@@ -4544,7 +4544,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1658
+            "line": 1657
           },
           "name": "prop2IsUndefined",
           "returns": {
@@ -4572,7 +4572,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1638
+        "line": 1637
       },
       "name": "EraseUndefinedHashValuesOptions",
       "properties": [
@@ -4584,7 +4584,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1639
+            "line": 1638
           },
           "name": "option1",
           "optional": true,
@@ -4600,7 +4600,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1640
+            "line": 1639
           },
           "name": "option2",
           "optional": true,
@@ -4759,7 +4759,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1516
+          "line": 1515
         },
         "parameters": [
           {
@@ -4773,7 +4773,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1515
+        "line": 1514
       },
       "name": "ExportedBaseClass",
       "properties": [
@@ -4784,7 +4784,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1516
+            "line": 1515
           },
           "name": "success",
           "type": {
@@ -4803,7 +4803,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1757
+        "line": 1756
       },
       "name": "ExtendsInternalInterface",
       "properties": [
@@ -4815,7 +4815,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1758
+            "line": 1757
           },
           "name": "boom",
           "type": {
@@ -4830,7 +4830,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1698
+            "line": 1697
           },
           "name": "prop",
           "type": {
@@ -5020,7 +5020,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 556
+        "line": 555
       },
       "methods": [
         {
@@ -5030,7 +5030,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 574
+            "line": 573
           },
           "name": "derivedToFirst",
           "parameters": [
@@ -5054,7 +5054,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 567
+            "line": 566
           },
           "name": "readDerivedNonPrimitive",
           "parameters": [
@@ -5078,7 +5078,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 560
+            "line": 559
           },
           "name": "readFirstNumber",
           "parameters": [
@@ -5105,7 +5105,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 578
+            "line": 577
           },
           "name": "structLiteral",
           "type": {
@@ -5163,7 +5163,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 532
+        "line": 531
       },
       "methods": [
         {
@@ -5172,7 +5172,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 533
+            "line": 532
           },
           "name": "betterGreeting",
           "parameters": [
@@ -5202,7 +5202,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2208
+        "line": 2207
       },
       "methods": [
         {
@@ -5212,7 +5212,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2210
+            "line": 2209
           },
           "name": "provideAsClass",
           "returns": {
@@ -5228,7 +5228,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2209
+            "line": 2208
           },
           "name": "provideAsInterface",
           "returns": {
@@ -5249,7 +5249,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2227
+        "line": 2226
       },
       "methods": [
         {
@@ -5259,7 +5259,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2229
+            "line": 2228
           },
           "name": "verb",
           "returns": {
@@ -5279,7 +5279,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2228
+            "line": 2227
           },
           "name": "value",
           "type": {
@@ -5297,7 +5297,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1778
+        "line": 1777
       },
       "name": "IAnotherPublicInterface",
       "properties": [
@@ -5308,7 +5308,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1779
+            "line": 1778
           },
           "name": "a",
           "type": {
@@ -5326,7 +5326,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2417
+        "line": 2416
       },
       "methods": [
         {
@@ -5336,7 +5336,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2418
+            "line": 2417
           },
           "name": "ring"
         }
@@ -5353,7 +5353,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2406
+        "line": 2405
       },
       "methods": [
         {
@@ -5363,7 +5363,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2407
+            "line": 2406
           },
           "name": "yourTurn",
           "parameters": [
@@ -5388,7 +5388,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2413
+        "line": 2412
       },
       "methods": [
         {
@@ -5398,7 +5398,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2414
+            "line": 2413
           },
           "name": "yourTurn",
           "parameters": [
@@ -5511,7 +5511,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1769
+        "line": 1768
       },
       "name": "IExtendsPrivateInterface",
       "properties": [
@@ -5523,7 +5523,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1770
+            "line": 1769
           },
           "name": "moreThings",
           "type": {
@@ -5542,7 +5542,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1754
+            "line": 1753
           },
           "name": "private",
           "type": {
@@ -5616,7 +5616,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 12
+        "line": 16
       },
       "methods": [
         {
@@ -5627,7 +5627,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 22
+            "line": 26
           },
           "name": "farewell",
           "returns": {
@@ -5645,7 +5645,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 17
+            "line": 21
           },
           "name": "goodbye",
           "returns": {
@@ -5670,7 +5670,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 36
+        "line": 40
       },
       "name": "IFriendlyRandomGenerator"
     },
@@ -5684,7 +5684,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1242
+        "line": 1241
       },
       "name": "IInterfaceImplementedByAbstractClass",
       "properties": [
@@ -5696,7 +5696,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1243
+            "line": 1242
           },
           "name": "propFromInterface",
           "type": {
@@ -5718,7 +5718,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1345
+        "line": 1344
       },
       "name": "IInterfaceThatShouldNotBeADataType",
       "properties": [
@@ -5730,7 +5730,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1347
+            "line": 1346
           },
           "name": "otherValue",
           "type": {
@@ -5748,7 +5748,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1709
+        "line": 1708
       },
       "methods": [
         {
@@ -5758,7 +5758,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1710
+            "line": 1709
           },
           "name": "visible"
         }
@@ -5774,7 +5774,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1335
+        "line": 1334
       },
       "methods": [
         {
@@ -5784,7 +5784,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1338
+            "line": 1337
           },
           "name": "doThings"
         }
@@ -5799,7 +5799,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1336
+            "line": 1335
           },
           "name": "value",
           "type": {
@@ -5818,7 +5818,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1220
+        "line": 1219
       },
       "methods": [
         {
@@ -5828,7 +5828,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1221
+            "line": 1220
           },
           "name": "hello",
           "parameters": [
@@ -5859,7 +5859,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 586
+        "line": 585
       },
       "name": "IInterfaceWithProperties",
       "properties": [
@@ -5871,7 +5871,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 587
+            "line": 586
           },
           "name": "readOnlyString",
           "type": {
@@ -5885,7 +5885,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 588
+            "line": 587
           },
           "name": "readWriteString",
           "type": {
@@ -5906,7 +5906,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 591
+        "line": 590
       },
       "name": "IInterfaceWithPropertiesExtension",
       "properties": [
@@ -5917,7 +5917,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 593
+            "line": 592
           },
           "name": "foo",
           "type": {
@@ -6074,7 +6074,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1289
+        "line": 1288
       },
       "name": "IMutableObjectLiteral",
       "properties": [
@@ -6085,7 +6085,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1290
+            "line": 1289
           },
           "name": "value",
           "type": {
@@ -6106,7 +6106,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1787
+        "line": 1786
       },
       "name": "INonInternalInterface",
       "properties": [
@@ -6117,7 +6117,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1784
+            "line": 1783
           },
           "name": "b",
           "type": {
@@ -6131,7 +6131,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1788
+            "line": 1787
           },
           "name": "c",
           "type": {
@@ -6150,7 +6150,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2542
+        "line": 2541
       },
       "methods": [
         {
@@ -6160,7 +6160,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2544
+            "line": 2543
           },
           "name": "wasSet",
           "returns": {
@@ -6179,7 +6179,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2543
+            "line": 2542
           },
           "name": "property",
           "type": {
@@ -6198,7 +6198,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2731
+        "line": 2730
       },
       "methods": [
         {
@@ -6208,7 +6208,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2732
+            "line": 2731
           },
           "name": "optional",
           "returns": {
@@ -6230,7 +6230,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1512
+        "line": 1511
       },
       "name": "IPrivatelyImplemented",
       "properties": [
@@ -6242,7 +6242,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1513
+            "line": 1512
           },
           "name": "success",
           "type": {
@@ -6260,7 +6260,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1558
+        "line": 1557
       },
       "methods": [
         {
@@ -6270,7 +6270,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1559
+            "line": 1558
           },
           "name": "bye",
           "returns": {
@@ -6291,7 +6291,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1562
+        "line": 1561
       },
       "methods": [
         {
@@ -6301,7 +6301,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1563
+            "line": 1562
           },
           "name": "ciao",
           "returns": {
@@ -6323,7 +6323,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 28
+        "line": 32
       },
       "methods": [
         {
@@ -6335,7 +6335,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 33
+            "line": 37
           },
           "name": "next",
           "returns": {
@@ -6357,7 +6357,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2473
+        "line": 2472
       },
       "name": "IReturnJsii976",
       "properties": [
@@ -6369,7 +6369,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2474
+            "line": 2473
           },
           "name": "foo",
           "type": {
@@ -6387,7 +6387,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 639
+        "line": 638
       },
       "methods": [
         {
@@ -6397,7 +6397,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 640
+            "line": 639
           },
           "name": "obtainNumber",
           "returns": {
@@ -6417,7 +6417,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 642
+            "line": 641
           },
           "name": "numberProp",
           "type": {
@@ -6479,7 +6479,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2660
+        "line": 2659
       },
       "methods": [
         {
@@ -6489,7 +6489,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2661
+            "line": 2660
           },
           "name": "returnStruct",
           "returns": {
@@ -6515,7 +6515,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1761
+        "line": 1760
       },
       "name": "ImplementInternalInterface",
       "properties": [
@@ -6525,7 +6525,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1762
+            "line": 1761
           },
           "name": "prop",
           "type": {
@@ -6548,7 +6548,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2224
+        "line": 2223
       },
       "name": "Implementation",
       "properties": [
@@ -6559,7 +6559,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2225
+            "line": 2224
           },
           "name": "value",
           "type": {
@@ -6585,7 +6585,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1716
+        "line": 1715
       },
       "methods": [
         {
@@ -6594,7 +6594,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1717
+            "line": 1716
           },
           "name": "visible",
           "overrides": "jsii-calc.IInterfaceWithInternal"
@@ -6617,7 +6617,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1735
+        "line": 1734
       },
       "name": "ImplementsInterfaceWithInternalSubclass"
     },
@@ -6635,7 +6635,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1765
+        "line": 1764
       },
       "name": "ImplementsPrivateInterface",
       "properties": [
@@ -6645,7 +6645,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1766
+            "line": 1765
           },
           "name": "private",
           "type": {
@@ -6667,7 +6667,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1176
+        "line": 1175
       },
       "name": "ImplictBaseOfBase",
       "properties": [
@@ -6679,7 +6679,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1177
+            "line": 1176
           },
           "name": "goo",
           "type": {
@@ -6706,7 +6706,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1565
+        "line": 1564
       },
       "methods": [
         {
@@ -6715,7 +6715,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1566
+            "line": 1565
           },
           "name": "ciao",
           "overrides": "jsii-calc.IPublicInterface2",
@@ -6739,7 +6739,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2694
+        "line": 2693
       },
       "methods": [
         {
@@ -6748,7 +6748,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2705
+            "line": 2704
           },
           "name": "listOfInterfaces",
           "returns": {
@@ -6769,7 +6769,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2695
+            "line": 2694
           },
           "name": "listOfStructs",
           "returns": {
@@ -6790,7 +6790,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2715
+            "line": 2714
           },
           "name": "mapOfInterfaces",
           "returns": {
@@ -6811,7 +6811,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2699
+            "line": 2698
           },
           "name": "mapOfStructs",
           "returns": {
@@ -6843,7 +6843,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1207
+        "line": 1206
       },
       "name": "Foo",
       "namespace": "InterfaceInNamespaceIncludesClasses",
@@ -6854,7 +6854,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1208
+            "line": 1207
           },
           "name": "bar",
           "optional": true,
@@ -6874,7 +6874,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1211
+        "line": 1210
       },
       "name": "Hello",
       "namespace": "InterfaceInNamespaceIncludesClasses",
@@ -6887,7 +6887,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1212
+            "line": 1211
           },
           "name": "foo",
           "type": {
@@ -6906,7 +6906,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1201
+        "line": 1200
       },
       "name": "Hello",
       "namespace": "InterfaceInNamespaceOnlyInterface",
@@ -6919,7 +6919,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1202
+            "line": 1201
           },
           "name": "foo",
           "type": {
@@ -6938,7 +6938,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2096
+        "line": 2095
       },
       "methods": [
         {
@@ -6947,7 +6947,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2097
+            "line": 2096
           },
           "name": "makeInterfaces",
           "parameters": [
@@ -6990,7 +6990,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2741
+        "line": 2740
       },
       "methods": [
         {
@@ -6999,7 +6999,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2742
+            "line": 2741
           },
           "name": "myself",
           "returns": {
@@ -7157,7 +7157,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 517
+        "line": 516
       },
       "methods": [
         {
@@ -7166,7 +7166,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 518
+            "line": 517
           },
           "name": "giveMeFriendly",
           "returns": {
@@ -7181,7 +7181,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 524
+            "line": 523
           },
           "name": "giveMeFriendlyGenerator",
           "returns": {
@@ -7207,7 +7207,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 247
+        "line": 246
       },
       "methods": [
         {
@@ -7216,7 +7216,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 248
+            "line": 247
           },
           "name": "returnLiteral",
           "returns": {
@@ -7242,7 +7242,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 256
+        "line": 255
       },
       "name": "JSObjectLiteralToNativeClass",
       "properties": [
@@ -7252,7 +7252,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 257
+            "line": 256
           },
           "name": "propA",
           "type": {
@@ -7265,7 +7265,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 258
+            "line": 257
           },
           "name": "propB",
           "type": {
@@ -7288,7 +7288,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 745
+        "line": 744
       },
       "methods": [
         {
@@ -7297,7 +7297,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 746
+            "line": 745
           },
           "name": "abstract"
         },
@@ -7307,7 +7307,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 750
+            "line": 749
           },
           "name": "assert"
         },
@@ -7317,7 +7317,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 754
+            "line": 753
           },
           "name": "boolean"
         },
@@ -7327,7 +7327,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 758
+            "line": 757
           },
           "name": "break"
         },
@@ -7337,7 +7337,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 762
+            "line": 761
           },
           "name": "byte"
         },
@@ -7347,7 +7347,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 766
+            "line": 765
           },
           "name": "case"
         },
@@ -7357,7 +7357,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 770
+            "line": 769
           },
           "name": "catch"
         },
@@ -7367,7 +7367,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 774
+            "line": 773
           },
           "name": "char"
         },
@@ -7377,7 +7377,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 778
+            "line": 777
           },
           "name": "class"
         },
@@ -7387,7 +7387,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 782
+            "line": 781
           },
           "name": "const"
         },
@@ -7397,7 +7397,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 786
+            "line": 785
           },
           "name": "continue"
         },
@@ -7407,7 +7407,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 790
+            "line": 789
           },
           "name": "default"
         },
@@ -7417,7 +7417,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 798
+            "line": 797
           },
           "name": "do"
         },
@@ -7427,7 +7427,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 794
+            "line": 793
           },
           "name": "double"
         },
@@ -7437,7 +7437,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 802
+            "line": 801
           },
           "name": "else"
         },
@@ -7447,7 +7447,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 806
+            "line": 805
           },
           "name": "enum"
         },
@@ -7457,7 +7457,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 810
+            "line": 809
           },
           "name": "extends"
         },
@@ -7467,7 +7467,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 814
+            "line": 813
           },
           "name": "false"
         },
@@ -7477,7 +7477,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 818
+            "line": 817
           },
           "name": "final"
         },
@@ -7487,7 +7487,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 822
+            "line": 821
           },
           "name": "finally"
         },
@@ -7497,7 +7497,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 826
+            "line": 825
           },
           "name": "float"
         },
@@ -7507,7 +7507,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 830
+            "line": 829
           },
           "name": "for"
         },
@@ -7517,7 +7517,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 834
+            "line": 833
           },
           "name": "goto"
         },
@@ -7527,7 +7527,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 838
+            "line": 837
           },
           "name": "if"
         },
@@ -7537,7 +7537,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 842
+            "line": 841
           },
           "name": "implements"
         },
@@ -7547,7 +7547,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 846
+            "line": 845
           },
           "name": "import"
         },
@@ -7557,7 +7557,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 850
+            "line": 849
           },
           "name": "instanceof"
         },
@@ -7567,7 +7567,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 854
+            "line": 853
           },
           "name": "int"
         },
@@ -7577,7 +7577,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 858
+            "line": 857
           },
           "name": "interface"
         },
@@ -7587,7 +7587,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 862
+            "line": 861
           },
           "name": "long"
         },
@@ -7597,7 +7597,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 866
+            "line": 865
           },
           "name": "native"
         },
@@ -7607,7 +7607,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 870
+            "line": 869
           },
           "name": "new"
         },
@@ -7617,7 +7617,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 874
+            "line": 873
           },
           "name": "null"
         },
@@ -7627,7 +7627,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 878
+            "line": 877
           },
           "name": "package"
         },
@@ -7637,7 +7637,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 882
+            "line": 881
           },
           "name": "private"
         },
@@ -7647,7 +7647,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 886
+            "line": 885
           },
           "name": "protected"
         },
@@ -7657,7 +7657,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 890
+            "line": 889
           },
           "name": "public"
         },
@@ -7667,7 +7667,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 894
+            "line": 893
           },
           "name": "return"
         },
@@ -7677,7 +7677,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 898
+            "line": 897
           },
           "name": "short"
         },
@@ -7687,7 +7687,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 902
+            "line": 901
           },
           "name": "static"
         },
@@ -7697,7 +7697,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 906
+            "line": 905
           },
           "name": "strictfp"
         },
@@ -7707,7 +7707,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 910
+            "line": 909
           },
           "name": "super"
         },
@@ -7717,7 +7717,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 914
+            "line": 913
           },
           "name": "switch"
         },
@@ -7727,7 +7727,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 918
+            "line": 917
           },
           "name": "synchronized"
         },
@@ -7737,7 +7737,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 922
+            "line": 921
           },
           "name": "this"
         },
@@ -7747,7 +7747,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 926
+            "line": 925
           },
           "name": "throw"
         },
@@ -7757,7 +7757,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 930
+            "line": 929
           },
           "name": "throws"
         },
@@ -7767,7 +7767,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 934
+            "line": 933
           },
           "name": "transient"
         },
@@ -7777,7 +7777,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 938
+            "line": 937
           },
           "name": "true"
         },
@@ -7787,7 +7787,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 942
+            "line": 941
           },
           "name": "try"
         },
@@ -7797,7 +7797,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 946
+            "line": 945
           },
           "name": "void"
         },
@@ -7807,7 +7807,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 950
+            "line": 949
           },
           "name": "volatile"
         }
@@ -7820,7 +7820,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 954
+            "line": 953
           },
           "name": "while",
           "type": {
@@ -7887,7 +7887,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1528
+        "line": 1527
       },
       "name": "JsiiAgent",
       "properties": [
@@ -7899,9 +7899,9 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1532
+            "line": 1531
           },
-          "name": "jsiiAgent",
+          "name": "value",
           "optional": true,
           "static": true,
           "type": {
@@ -7921,7 +7921,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2575
+        "line": 2574
       },
       "methods": [
         {
@@ -7930,7 +7930,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2620
+            "line": 2619
           },
           "name": "anyArray",
           "returns": {
@@ -7946,7 +7946,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2616
+            "line": 2615
           },
           "name": "anyBooleanFalse",
           "returns": {
@@ -7962,7 +7962,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2612
+            "line": 2611
           },
           "name": "anyBooleanTrue",
           "returns": {
@@ -7978,7 +7978,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2592
+            "line": 2591
           },
           "name": "anyDate",
           "returns": {
@@ -7994,7 +7994,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2608
+            "line": 2607
           },
           "name": "anyEmptyString",
           "returns": {
@@ -8010,7 +8010,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2588
+            "line": 2587
           },
           "name": "anyFunction",
           "returns": {
@@ -8026,7 +8026,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2624
+            "line": 2623
           },
           "name": "anyHash",
           "returns": {
@@ -8042,7 +8042,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2580
+            "line": 2579
           },
           "name": "anyNull",
           "returns": {
@@ -8058,7 +8058,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2596
+            "line": 2595
           },
           "name": "anyNumber",
           "returns": {
@@ -8074,7 +8074,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2628
+            "line": 2627
           },
           "name": "anyRef",
           "returns": {
@@ -8090,7 +8090,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2604
+            "line": 2603
           },
           "name": "anyString",
           "returns": {
@@ -8106,7 +8106,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2584
+            "line": 2583
           },
           "name": "anyUndefined",
           "returns": {
@@ -8122,7 +8122,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2600
+            "line": 2599
           },
           "name": "anyZero",
           "returns": {
@@ -8138,7 +8138,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2576
+            "line": 2575
           },
           "name": "stringify",
           "parameters": [
@@ -8172,7 +8172,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1439
+        "line": 1438
       },
       "name": "LoadBalancedFargateServiceProps",
       "properties": [
@@ -8187,7 +8187,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1482
+            "line": 1481
           },
           "name": "containerPort",
           "optional": true,
@@ -8206,7 +8206,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1453
+            "line": 1452
           },
           "name": "cpu",
           "optional": true,
@@ -8225,7 +8225,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1475
+            "line": 1474
           },
           "name": "memoryMiB",
           "optional": true,
@@ -8243,7 +8243,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1489
+            "line": 1488
           },
           "name": "publicLoadBalancer",
           "optional": true,
@@ -8261,7 +8261,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1496
+            "line": 1495
           },
           "name": "publicTasks",
           "optional": true,
@@ -8285,7 +8285,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 396
+        "line": 406
       },
       "methods": [
         {
@@ -8294,7 +8294,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 397
+            "line": 407
           },
           "name": "property",
           "returns": {
@@ -8313,7 +8313,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 401
+            "line": 411
           },
           "name": "elite",
           "type": {
@@ -8337,7 +8337,7 @@
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 49
+          "line": 53
         },
         "parameters": [
           {
@@ -8346,7 +8346,7 @@
             },
             "name": "lhs",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           },
           {
@@ -8355,7 +8355,7 @@
             },
             "name": "rhs",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           }
         ]
@@ -8367,7 +8367,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 74
+        "line": 81
       },
       "methods": [
         {
@@ -8377,7 +8377,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 88
+            "line": 95
           },
           "name": "farewell",
           "overrides": "jsii-calc.IFriendlier",
@@ -8394,7 +8394,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 84
+            "line": 91
           },
           "name": "goodbye",
           "overrides": "jsii-calc.IFriendlier",
@@ -8411,7 +8411,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 92
+            "line": 99
           },
           "name": "next",
           "overrides": "jsii-calc.IRandomNumberGenerator",
@@ -8428,7 +8428,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 80
+            "line": 87
           },
           "name": "toString",
           "overrides": "@scope/jsii-calc-lib.Operation",
@@ -8449,10 +8449,10 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 76
+            "line": 83
           },
           "name": "value",
-          "overrides": "@scope/jsii-calc-lib.Value",
+          "overrides": "@scope/jsii-calc-lib.NumericValue",
           "type": {
             "primitive": "number"
           }
@@ -8473,13 +8473,13 @@
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 101
+          "line": 108
         },
         "parameters": [
           {
             "name": "operand",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           }
         ]
@@ -8490,7 +8490,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 109
+        "line": 116
       },
       "methods": [
         {
@@ -8500,7 +8500,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 126
+            "line": 133
           },
           "name": "farewell",
           "overrides": "jsii-calc.IFriendlier",
@@ -8517,7 +8517,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 122
+            "line": 129
           },
           "name": "goodbye",
           "overrides": "jsii-calc.IFriendlier",
@@ -8534,7 +8534,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 118
+            "line": 125
           },
           "name": "hello",
           "overrides": "@scope/jsii-calc-lib.IFriendly",
@@ -8551,7 +8551,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 114
+            "line": 121
           },
           "name": "toString",
           "overrides": "@scope/jsii-calc-lib.Operation",
@@ -8572,10 +8572,10 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 110
+            "line": 117
           },
           "name": "value",
-          "overrides": "@scope/jsii-calc-lib.Value",
+          "overrides": "@scope/jsii-calc-lib.NumericValue",
           "type": {
             "primitive": "number"
           }
@@ -8623,7 +8623,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2449
+        "line": 2448
       },
       "name": "NestedStruct",
       "properties": [
@@ -8636,7 +8636,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2453
+            "line": 2452
           },
           "name": "numberProp",
           "type": {
@@ -8660,7 +8660,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1126
+        "line": 1125
       },
       "methods": [
         {
@@ -8671,7 +8671,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1157
+            "line": 1156
           },
           "name": "cryptoSha256",
           "returns": {
@@ -8689,7 +8689,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1131
+            "line": 1130
           },
           "name": "fsReadFile",
           "returns": {
@@ -8706,7 +8706,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1140
+            "line": 1139
           },
           "name": "fsReadFileSync",
           "returns": {
@@ -8726,7 +8726,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1149
+            "line": 1148
           },
           "name": "osPlatform",
           "type": {
@@ -8748,7 +8748,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1369
+          "line": 1368
         },
         "parameters": [
           {
@@ -8769,7 +8769,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1366
+        "line": 1365
       },
       "methods": [
         {
@@ -8778,7 +8778,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1377
+            "line": 1376
           },
           "name": "giveMeUndefined",
           "parameters": [
@@ -8797,7 +8797,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1387
+            "line": 1386
           },
           "name": "giveMeUndefinedInsideAnObject",
           "parameters": [
@@ -8815,7 +8815,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1416
+            "line": 1415
           },
           "name": "verifyPropertyIsUndefined"
         }
@@ -8828,7 +8828,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1367
+            "line": 1366
           },
           "name": "changeMeToUndefined",
           "optional": true,
@@ -8848,7 +8848,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1425
+        "line": 1424
       },
       "name": "NullShouldBeTreatedAsUndefinedData",
       "properties": [
@@ -8860,7 +8860,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1427
+            "line": 1426
           },
           "name": "arrayWithThreeElementsAndUndefinedAsSecondArgument",
           "type": {
@@ -8880,7 +8880,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1426
+            "line": 1425
           },
           "name": "thisShouldBeUndefined",
           "optional": true,
@@ -8903,7 +8903,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 506
+          "line": 505
         },
         "parameters": [
           {
@@ -8917,7 +8917,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 505
+        "line": 504
       },
       "methods": [
         {
@@ -8926,7 +8926,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 512
+            "line": 511
           },
           "name": "isSameGenerator",
           "parameters": [
@@ -8949,7 +8949,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 508
+            "line": 507
           },
           "name": "nextTimes100",
           "returns": {
@@ -8967,7 +8967,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 506
+            "line": 505
           },
           "name": "generator",
           "type": {
@@ -8991,7 +8991,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 264
+        "line": 263
       },
       "methods": [
         {
@@ -9001,7 +9001,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 268
+            "line": 267
           },
           "name": "sumFromArray",
           "parameters": [
@@ -9010,7 +9010,7 @@
               "type": {
                 "collection": {
                   "elementtype": {
-                    "fqn": "@scope/jsii-calc-lib.Value"
+                    "fqn": "@scope/jsii-calc-lib.NumericValue"
                   },
                   "kind": "array"
                 }
@@ -9030,7 +9030,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 279
+            "line": 278
           },
           "name": "sumFromMap",
           "parameters": [
@@ -9039,7 +9039,7 @@
               "type": {
                 "collection": {
                   "elementtype": {
-                    "fqn": "@scope/jsii-calc-lib.Value"
+                    "fqn": "@scope/jsii-calc-lib.NumericValue"
                   },
                   "kind": "map"
                 }
@@ -9064,7 +9064,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2546
+        "line": 2545
       },
       "methods": [
         {
@@ -9073,7 +9073,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2547
+            "line": 2546
           },
           "name": "provide",
           "returns": {
@@ -9131,7 +9131,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1224
+          "line": 1223
         },
         "parameters": [
           {
@@ -9145,7 +9145,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1223
+        "line": 1222
       },
       "methods": [
         {
@@ -9154,7 +9154,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1232
+            "line": 1231
           },
           "name": "invokeWithOptional"
         },
@@ -9164,7 +9164,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1228
+            "line": 1227
           },
           "name": "invokeWithoutOptional"
         }
@@ -9183,7 +9183,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 310
+          "line": 309
         },
         "parameters": [
           {
@@ -9210,7 +9210,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 309
+        "line": 308
       },
       "name": "OptionalConstructorArgument",
       "properties": [
@@ -9221,7 +9221,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 311
+            "line": 310
           },
           "name": "arg1",
           "type": {
@@ -9235,7 +9235,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 312
+            "line": 311
           },
           "name": "arg2",
           "type": {
@@ -9249,7 +9249,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 313
+            "line": 312
           },
           "name": "arg3",
           "optional": true,
@@ -9269,7 +9269,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1867
+        "line": 1866
       },
       "name": "OptionalStruct",
       "properties": [
@@ -9281,7 +9281,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1868
+            "line": 1867
           },
           "name": "field",
           "optional": true,
@@ -9303,7 +9303,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1862
+          "line": 1861
         },
         "parameters": [
           {
@@ -9318,7 +9318,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1858
+        "line": 1857
       },
       "name": "OptionalStructConsumer",
       "properties": [
@@ -9329,7 +9329,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1859
+            "line": 1858
           },
           "name": "parameterWasUndefined",
           "type": {
@@ -9343,7 +9343,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1860
+            "line": 1859
           },
           "name": "fieldValue",
           "optional": true,
@@ -9368,7 +9368,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2135
+        "line": 2134
       },
       "methods": [
         {
@@ -9377,7 +9377,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2147
+            "line": 2146
           },
           "name": "overrideMe",
           "protected": true,
@@ -9393,7 +9393,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2143
+            "line": 2142
           },
           "name": "switchModes"
         },
@@ -9403,7 +9403,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2139
+            "line": 2138
           },
           "name": "valueFromProtected",
           "returns": {
@@ -9422,7 +9422,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2136
+            "line": 2135
           },
           "name": "overrideReadOnly",
           "protected": true,
@@ -9436,7 +9436,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2137
+            "line": 2136
           },
           "name": "overrideReadWrite",
           "protected": true,
@@ -9460,7 +9460,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 645
+        "line": 644
       },
       "methods": [
         {
@@ -9469,7 +9469,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 646
+            "line": 645
           },
           "name": "test",
           "parameters": [
@@ -9500,7 +9500,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2498
+        "line": 2497
       },
       "name": "ParentStruct982",
       "properties": [
@@ -9512,7 +9512,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2499
+            "line": 2498
           },
           "name": "foo",
           "type": {
@@ -9536,7 +9536,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1833
+        "line": 1832
       },
       "methods": [
         {
@@ -9546,7 +9546,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1834
+            "line": 1833
           },
           "name": "consumePartiallyInitializedThis",
           "parameters": [
@@ -9592,7 +9592,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 495
+        "line": 494
       },
       "methods": [
         {
@@ -9601,7 +9601,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 496
+            "line": 495
           },
           "name": "sayHello",
           "parameters": [
@@ -9636,7 +9636,7 @@
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 227
+          "line": 234
         },
         "parameters": [
           {
@@ -9645,7 +9645,7 @@
             },
             "name": "base",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           },
           {
@@ -9654,7 +9654,7 @@
             },
             "name": "pow",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           }
         ]
@@ -9662,7 +9662,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 221
+        "line": 228
       },
       "name": "Power",
       "properties": [
@@ -9674,11 +9674,11 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 227
+            "line": 235
           },
           "name": "base",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         },
         {
@@ -9690,12 +9690,12 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 231
+            "line": 241
           },
           "name": "expression",
           "overrides": "jsii-calc.composition.CompositeOperation",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         },
         {
@@ -9706,11 +9706,11 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 227
+            "line": 236
           },
           "name": "pow",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         }
       ]
@@ -9730,7 +9730,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 392
+        "line": 402
       },
       "name": "PropertyNamedProperty",
       "properties": [
@@ -9741,7 +9741,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 393
+            "line": 403
           },
           "name": "property",
           "type": {
@@ -9755,7 +9755,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 394
+            "line": 404
           },
           "name": "yetAnoterOne",
           "type": {
@@ -9778,7 +9778,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1553
+        "line": 1552
       },
       "methods": [
         {
@@ -9787,7 +9787,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1554
+            "line": 1553
           },
           "name": "hello"
         }
@@ -9808,7 +9808,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 957
+        "line": 956
       },
       "methods": [
         {
@@ -9817,7 +9817,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 958
+            "line": 957
           },
           "name": "and"
         },
@@ -9827,7 +9827,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 962
+            "line": 961
           },
           "name": "as"
         },
@@ -9837,7 +9837,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 966
+            "line": 965
           },
           "name": "assert"
         },
@@ -9847,7 +9847,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 970
+            "line": 969
           },
           "name": "async"
         },
@@ -9857,7 +9857,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 974
+            "line": 973
           },
           "name": "await"
         },
@@ -9867,7 +9867,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 978
+            "line": 977
           },
           "name": "break"
         },
@@ -9877,7 +9877,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 982
+            "line": 981
           },
           "name": "class"
         },
@@ -9887,7 +9887,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 986
+            "line": 985
           },
           "name": "continue"
         },
@@ -9897,7 +9897,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 990
+            "line": 989
           },
           "name": "def"
         },
@@ -9907,7 +9907,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 994
+            "line": 993
           },
           "name": "del"
         },
@@ -9917,7 +9917,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 998
+            "line": 997
           },
           "name": "elif"
         },
@@ -9927,7 +9927,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1002
+            "line": 1001
           },
           "name": "else"
         },
@@ -9937,7 +9937,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1006
+            "line": 1005
           },
           "name": "except"
         },
@@ -9947,7 +9947,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1010
+            "line": 1009
           },
           "name": "finally"
         },
@@ -9957,7 +9957,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1014
+            "line": 1013
           },
           "name": "for"
         },
@@ -9967,7 +9967,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1018
+            "line": 1017
           },
           "name": "from"
         },
@@ -9977,7 +9977,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1022
+            "line": 1021
           },
           "name": "global"
         },
@@ -9987,7 +9987,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1026
+            "line": 1025
           },
           "name": "if"
         },
@@ -9997,7 +9997,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1030
+            "line": 1029
           },
           "name": "import"
         },
@@ -10007,7 +10007,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1034
+            "line": 1033
           },
           "name": "in"
         },
@@ -10017,7 +10017,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1038
+            "line": 1037
           },
           "name": "is"
         },
@@ -10027,7 +10027,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1042
+            "line": 1041
           },
           "name": "lambda"
         },
@@ -10037,7 +10037,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1046
+            "line": 1045
           },
           "name": "nonlocal"
         },
@@ -10047,7 +10047,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1050
+            "line": 1049
           },
           "name": "not"
         },
@@ -10057,7 +10057,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1054
+            "line": 1053
           },
           "name": "or"
         },
@@ -10067,7 +10067,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1058
+            "line": 1057
           },
           "name": "pass"
         },
@@ -10077,7 +10077,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1062
+            "line": 1061
           },
           "name": "raise"
         },
@@ -10087,7 +10087,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1066
+            "line": 1065
           },
           "name": "return"
         },
@@ -10097,7 +10097,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1070
+            "line": 1069
           },
           "name": "try"
         },
@@ -10107,7 +10107,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1074
+            "line": 1073
           },
           "name": "while"
         },
@@ -10117,7 +10117,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1078
+            "line": 1077
           },
           "name": "with"
         },
@@ -10127,7 +10127,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1082
+            "line": 1081
           },
           "name": "yield"
         }
@@ -10146,7 +10146,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1092
+          "line": 1091
         },
         "parameters": [
           {
@@ -10160,7 +10160,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1091
+        "line": 1090
       },
       "methods": [
         {
@@ -10169,7 +10169,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1094
+            "line": 1093
           },
           "name": "method",
           "parameters": [
@@ -10197,7 +10197,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1092
+            "line": 1091
           },
           "name": "self",
           "type": {
@@ -10218,7 +10218,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1100
+          "line": 1099
         },
         "parameters": [
           {
@@ -10232,7 +10232,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1099
+        "line": 1098
       },
       "name": "ClassWithSelfKwarg",
       "namespace": "PythonSelf",
@@ -10244,7 +10244,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1100
+            "line": 1099
           },
           "name": "props",
           "type": {
@@ -10262,7 +10262,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1107
+        "line": 1106
       },
       "methods": [
         {
@@ -10272,7 +10272,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1108
+            "line": 1107
           },
           "name": "method",
           "parameters": [
@@ -10303,7 +10303,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1103
+        "line": 1102
       },
       "name": "StructWithSelf",
       "namespace": "PythonSelf",
@@ -10316,7 +10316,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1104
+            "line": 1103
           },
           "name": "self",
           "type": {
@@ -10340,7 +10340,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1183
+        "line": 1182
       },
       "methods": [
         {
@@ -10349,7 +10349,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1186
+            "line": 1185
           },
           "name": "loadFoo",
           "returns": {
@@ -10365,7 +10365,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1190
+            "line": 1189
           },
           "name": "saveFoo",
           "parameters": [
@@ -10386,7 +10386,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1184
+            "line": 1183
           },
           "name": "foo",
           "optional": true,
@@ -10413,7 +10413,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1507
+        "line": 1506
       },
       "name": "ReturnsPrivateImplementationOfInterface",
       "properties": [
@@ -10424,7 +10424,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1508
+            "line": 1507
           },
           "name": "privateImplementation",
           "type": {
@@ -10445,7 +10445,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2442
+        "line": 2441
       },
       "name": "RootStruct",
       "properties": [
@@ -10458,7 +10458,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2446
+            "line": 2445
           },
           "name": "stringProp",
           "type": {
@@ -10473,7 +10473,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2447
+            "line": 2446
           },
           "name": "nestedStruct",
           "optional": true,
@@ -10492,7 +10492,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2455
+        "line": 2454
       },
       "methods": [
         {
@@ -10501,7 +10501,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2456
+            "line": 2455
           },
           "name": "validate",
           "parameters": [
@@ -10531,7 +10531,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 288
+        "line": 287
       },
       "methods": [
         {
@@ -10540,7 +10540,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 296
+            "line": 295
           },
           "name": "methodWithDefaultedArguments",
           "parameters": [
@@ -10573,7 +10573,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 304
+            "line": 303
           },
           "name": "methodWithOptionalAnyArgument",
           "parameters": [
@@ -10593,7 +10593,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 292
+            "line": 291
           },
           "name": "methodWithOptionalArguments",
           "parameters": [
@@ -10631,7 +10631,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2014
+        "line": 2013
       },
       "name": "SecondLevelStruct",
       "properties": [
@@ -10644,7 +10644,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2018
+            "line": 2017
           },
           "name": "deeperRequiredProp",
           "type": {
@@ -10660,7 +10660,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2023
+            "line": 2022
           },
           "name": "deeperOptionalProp",
           "optional": true,
@@ -10686,7 +10686,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1624
+        "line": 1623
       },
       "methods": [
         {
@@ -10695,7 +10695,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1627
+            "line": 1626
           },
           "name": "interface1",
           "returns": {
@@ -10710,7 +10710,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1631
+            "line": 1630
           },
           "name": "interface2",
           "returns": {
@@ -10733,7 +10733,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1966
+        "line": 1965
       },
       "methods": [
         {
@@ -10742,7 +10742,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1968
+            "line": 1967
           },
           "name": "isSingletonInt",
           "parameters": [
@@ -10772,7 +10772,7 @@
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1973
+        "line": 1972
       },
       "members": [
         {
@@ -10796,7 +10796,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1949
+        "line": 1948
       },
       "methods": [
         {
@@ -10805,7 +10805,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1952
+            "line": 1951
           },
           "name": "isSingletonString",
           "parameters": [
@@ -10835,7 +10835,7 @@
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1957
+        "line": 1956
       },
       "members": [
         {
@@ -10858,7 +10858,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 403
+        "line": 413
       },
       "name": "SmellyStruct",
       "properties": [
@@ -10870,7 +10870,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 404
+            "line": 414
           },
           "name": "property",
           "type": {
@@ -10885,7 +10885,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 405
+            "line": 415
           },
           "name": "yetAnoterOne",
           "type": {
@@ -10908,7 +10908,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2479
+        "line": 2478
       },
       "methods": [
         {
@@ -10917,7 +10917,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2488
+            "line": 2487
           },
           "name": "returnAnonymous",
           "returns": {
@@ -10933,7 +10933,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2480
+            "line": 2479
           },
           "name": "returnReturn",
           "returns": {
@@ -11094,7 +11094,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1892
+        "line": 1891
       },
       "methods": [
         {
@@ -11103,7 +11103,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1895
+            "line": 1894
           },
           "name": "canAccessStaticContext",
           "returns": {
@@ -11122,7 +11122,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1903
+            "line": 1902
           },
           "name": "staticVariable",
           "static": true,
@@ -11144,7 +11144,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 690
+          "line": 689
         },
         "parameters": [
           {
@@ -11158,7 +11158,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 689
+        "line": 688
       },
       "methods": [
         {
@@ -11168,7 +11168,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 696
+            "line": 695
           },
           "name": "staticMethod",
           "parameters": [
@@ -11195,7 +11195,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 700
+            "line": 699
           },
           "name": "justMethod",
           "returns": {
@@ -11216,7 +11216,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 712
+            "line": 711
           },
           "name": "BAR",
           "static": true,
@@ -11232,7 +11232,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 741
+            "line": 740
           },
           "name": "ConstObj",
           "static": true,
@@ -11249,7 +11249,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 707
+            "line": 706
           },
           "name": "Foo",
           "static": true,
@@ -11266,7 +11266,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 717
+            "line": 716
           },
           "name": "zooBar",
           "static": true,
@@ -11287,7 +11287,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 726
+            "line": 725
           },
           "name": "instance",
           "static": true,
@@ -11301,7 +11301,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 740
+            "line": 739
           },
           "name": "nonConstStatic",
           "static": true,
@@ -11316,7 +11316,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 690
+            "line": 689
           },
           "name": "value",
           "type": {
@@ -11334,7 +11334,7 @@
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 39
+        "line": 38
       },
       "members": [
         {
@@ -11372,7 +11372,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1677
+        "line": 1676
       },
       "name": "StripInternal",
       "properties": [
@@ -11382,7 +11382,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1678
+            "line": 1677
           },
           "name": "youSeeMe",
           "type": {
@@ -11402,7 +11402,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2240
+        "line": 2239
       },
       "name": "StructA",
       "properties": [
@@ -11414,7 +11414,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2241
+            "line": 2240
           },
           "name": "requiredString",
           "type": {
@@ -11429,7 +11429,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2243
+            "line": 2242
           },
           "name": "optionalNumber",
           "optional": true,
@@ -11445,7 +11445,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2242
+            "line": 2241
           },
           "name": "optionalString",
           "optional": true,
@@ -11466,7 +11466,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2249
+        "line": 2248
       },
       "name": "StructB",
       "properties": [
@@ -11478,7 +11478,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2250
+            "line": 2249
           },
           "name": "requiredString",
           "type": {
@@ -11493,7 +11493,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2251
+            "line": 2250
           },
           "name": "optionalBoolean",
           "optional": true,
@@ -11509,7 +11509,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2252
+            "line": 2251
           },
           "name": "optionalStructA",
           "optional": true,
@@ -11531,7 +11531,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2678
+        "line": 2677
       },
       "name": "StructParameterType",
       "properties": [
@@ -11543,7 +11543,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2679
+            "line": 2678
           },
           "name": "scope",
           "type": {
@@ -11558,7 +11558,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2680
+            "line": 2679
           },
           "name": "props",
           "optional": true,
@@ -11583,7 +11583,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2072
+        "line": 2071
       },
       "methods": [
         {
@@ -11592,7 +11592,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2084
+            "line": 2083
           },
           "name": "howManyVarArgsDidIPass",
           "parameters": [
@@ -11624,7 +11624,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2073
+            "line": 2072
           },
           "name": "roundTrip",
           "parameters": [
@@ -11660,7 +11660,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2254
+        "line": 2253
       },
       "methods": [
         {
@@ -11669,7 +11669,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2255
+            "line": 2254
           },
           "name": "isStructA",
           "parameters": [
@@ -11702,7 +11702,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2276
+            "line": 2275
           },
           "name": "isStructB",
           "parameters": [
@@ -11742,7 +11742,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2046
+        "line": 2045
       },
       "name": "StructWithJavaReservedWords",
       "properties": [
@@ -11754,7 +11754,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2047
+            "line": 2046
           },
           "name": "default",
           "type": {
@@ -11769,7 +11769,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2048
+            "line": 2047
           },
           "name": "assert",
           "optional": true,
@@ -11785,7 +11785,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2051
+            "line": 2050
           },
           "name": "result",
           "optional": true,
@@ -11801,7 +11801,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2052
+            "line": 2051
           },
           "name": "that",
           "optional": true,
@@ -11825,13 +11825,13 @@
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 205
+          "line": 212
         }
       },
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 197
+        "line": 204
       },
       "name": "Sum",
       "properties": [
@@ -11844,12 +11844,12 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 209
+            "line": 216
           },
           "name": "expression",
           "overrides": "jsii-calc.composition.CompositeOperation",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         },
         {
@@ -11859,13 +11859,13 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 201
+            "line": 208
           },
           "name": "parts",
           "type": {
             "collection": {
               "elementtype": {
-                "fqn": "@scope/jsii-calc-lib.Value"
+                "fqn": "@scope/jsii-calc-lib.NumericValue"
               },
               "kind": "array"
             }
@@ -11886,7 +11886,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2181
+          "line": 2180
         },
         "parameters": [
           {
@@ -11934,7 +11934,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2171
+        "line": 2170
       },
       "name": "SupportsNiceJavaBuilder",
       "properties": [
@@ -11946,7 +11946,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2182
+            "line": 2181
           },
           "name": "id",
           "overrides": "jsii-calc.SupportsNiceJavaBuilderWithRequiredProps",
@@ -11961,7 +11961,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2172
+            "line": 2171
           },
           "name": "rest",
           "type": {
@@ -11985,7 +11985,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2191
+        "line": 2190
       },
       "name": "SupportsNiceJavaBuilderProps",
       "properties": [
@@ -11998,7 +11998,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2201
+            "line": 2200
           },
           "name": "bar",
           "type": {
@@ -12015,7 +12015,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2196
+            "line": 2195
           },
           "name": "id",
           "optional": true,
@@ -12038,7 +12038,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2163
+          "line": 2162
         },
         "parameters": [
           {
@@ -12064,7 +12064,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2155
+        "line": 2154
       },
       "name": "SupportsNiceJavaBuilderWithRequiredProps",
       "properties": [
@@ -12075,7 +12075,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2157
+            "line": 2156
           },
           "name": "bar",
           "type": {
@@ -12090,7 +12090,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2164
+            "line": 2163
           },
           "name": "id",
           "type": {
@@ -12104,7 +12104,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2156
+            "line": 2155
           },
           "name": "propId",
           "optional": true,
@@ -12128,7 +12128,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 376
+        "line": 375
       },
       "methods": [
         {
@@ -12138,7 +12138,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 389
+            "line": 388
           },
           "name": "callerIsAsync",
           "returns": {
@@ -12153,7 +12153,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 377
+            "line": 376
           },
           "name": "callerIsMethod",
           "returns": {
@@ -12168,7 +12168,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 429
+            "line": 428
           },
           "name": "modifyOtherProperty",
           "parameters": [
@@ -12186,7 +12186,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 401
+            "line": 400
           },
           "name": "modifyValueOfTheProperty",
           "parameters": [
@@ -12204,7 +12204,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 442
+            "line": 441
           },
           "name": "readA",
           "returns": {
@@ -12219,7 +12219,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 433
+            "line": 432
           },
           "name": "retrieveOtherProperty",
           "returns": {
@@ -12234,7 +12234,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 413
+            "line": 412
           },
           "name": "retrieveReadOnlyProperty",
           "returns": {
@@ -12249,7 +12249,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 405
+            "line": 404
           },
           "name": "retrieveValueOfTheProperty",
           "returns": {
@@ -12264,7 +12264,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 393
+            "line": 392
           },
           "name": "virtualMethod",
           "parameters": [
@@ -12287,7 +12287,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 446
+            "line": 445
           },
           "name": "writeA",
           "parameters": [
@@ -12309,7 +12309,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 411
+            "line": 410
           },
           "name": "readonlyProperty",
           "type": {
@@ -12322,7 +12322,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 440
+            "line": 439
           },
           "name": "a",
           "type": {
@@ -12335,7 +12335,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 381
+            "line": 380
           },
           "name": "callerIsProperty",
           "type": {
@@ -12348,7 +12348,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 419
+            "line": 418
           },
           "name": "otherProperty",
           "type": {
@@ -12361,7 +12361,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 399
+            "line": 398
           },
           "name": "theProperty",
           "type": {
@@ -12374,7 +12374,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 427
+            "line": 426
           },
           "name": "valueOfOtherProperty",
           "type": {
@@ -12397,7 +12397,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 651
+        "line": 650
       },
       "methods": [
         {
@@ -12406,7 +12406,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 652
+            "line": 651
           },
           "name": "throwError"
         }
@@ -12423,7 +12423,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1997
+        "line": 1996
       },
       "name": "TopLevelStruct",
       "properties": [
@@ -12436,7 +12436,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2001
+            "line": 2000
           },
           "name": "required",
           "type": {
@@ -12452,7 +12452,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2011
+            "line": 2010
           },
           "name": "secondLevel",
           "type": {
@@ -12477,7 +12477,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2006
+            "line": 2005
           },
           "name": "optional",
           "optional": true,
@@ -12498,7 +12498,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2752
+        "line": 2751
       },
       "methods": [
         {
@@ -12508,7 +12508,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2756
+            "line": 2755
           },
           "name": "mode",
           "returns": {
@@ -12536,13 +12536,13 @@
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 101
+          "line": 108
         },
         "parameters": [
           {
             "name": "operand",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           }
         ]
@@ -12550,7 +12550,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 100
+        "line": 107
       },
       "name": "UnaryOperation",
       "properties": [
@@ -12561,11 +12561,11 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 101
+            "line": 108
           },
           "name": "operand",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         }
       ]
@@ -12580,7 +12580,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1112
+        "line": 1111
       },
       "name": "UnionProperties",
       "properties": [
@@ -12592,7 +12592,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1114
+            "line": 1113
           },
           "name": "bar",
           "type": {
@@ -12619,7 +12619,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1113
+            "line": 1112
           },
           "name": "foo",
           "optional": true,
@@ -12729,7 +12729,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1117
+        "line": 1116
       },
       "methods": [
         {
@@ -12738,7 +12738,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1118
+            "line": 1117
           },
           "name": "value",
           "returns": {
@@ -12765,7 +12765,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1168
+        "line": 1167
       },
       "methods": [
         {
@@ -12774,7 +12774,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1169
+            "line": 1168
           },
           "name": "hello",
           "returns": {
@@ -12798,7 +12798,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 597
+          "line": 596
         },
         "parameters": [
           {
@@ -12812,7 +12812,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 596
+        "line": 595
       },
       "methods": [
         {
@@ -12821,7 +12821,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 599
+            "line": 598
           },
           "name": "justRead",
           "returns": {
@@ -12836,7 +12836,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 608
+            "line": 607
           },
           "name": "readStringAndNumber",
           "parameters": [
@@ -12859,7 +12859,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 603
+            "line": 602
           },
           "name": "writeAndRead",
           "parameters": [
@@ -12886,7 +12886,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 597
+            "line": 596
           },
           "name": "obj",
           "type": {
@@ -12907,7 +12907,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 681
+          "line": 680
         },
         "parameters": [
           {
@@ -12921,7 +12921,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 680
+        "line": 679
       },
       "methods": [
         {
@@ -12930,7 +12930,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 683
+            "line": 682
           },
           "name": "asArray",
           "parameters": [
@@ -12969,7 +12969,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 667
+          "line": 666
         },
         "parameters": [
           {
@@ -12988,7 +12988,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 661
+        "line": 660
       },
       "methods": [
         {
@@ -12997,7 +12997,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 675
+            "line": 674
           },
           "name": "asArray",
           "parameters": [
@@ -13050,7 +13050,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 451
+        "line": 450
       },
       "methods": [
         {
@@ -13060,7 +13060,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 476
+            "line": 475
           },
           "name": "overrideMeAsync",
           "parameters": [
@@ -13083,7 +13083,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 480
+            "line": 479
           },
           "name": "overrideMeSync",
           "parameters": [
@@ -13107,7 +13107,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 458
+            "line": 457
           },
           "name": "parallelSumAsync",
           "parameters": [
@@ -13131,7 +13131,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 452
+            "line": 451
           },
           "name": "serialSumAsync",
           "parameters": [
@@ -13154,7 +13154,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 468
+            "line": 467
           },
           "name": "sumSync",
           "parameters": [
@@ -13191,7 +13191,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1921
+        "line": 1920
       },
       "methods": [
         {
@@ -13200,7 +13200,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1926
+            "line": 1925
           },
           "name": "callMe"
         },
@@ -13211,7 +13211,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1930
+            "line": 1929
           },
           "name": "overrideMe",
           "protected": true
@@ -13226,7 +13226,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1923
+            "line": 1922
           },
           "name": "methodWasCalled",
           "type": {
@@ -13248,7 +13248,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1937
+          "line": 1936
         },
         "parameters": [
           {
@@ -13263,7 +13263,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1936
+        "line": 1935
       },
       "name": "WithPrivatePropertyInConstructor",
       "properties": [
@@ -13274,7 +13274,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1939
+            "line": 1938
           },
           "name": "success",
           "type": {
@@ -13296,7 +13296,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 138
+        "line": 145
       },
       "methods": [
         {
@@ -13306,7 +13306,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 164
+            "line": 171
           },
           "name": "toString",
           "overrides": "@scope/jsii-calc-lib.Operation",
@@ -13330,11 +13330,11 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 162
+            "line": 169
           },
           "name": "expression",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         },
         {
@@ -13345,10 +13345,10 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 154
+            "line": 161
           },
           "name": "value",
-          "overrides": "@scope/jsii-calc-lib.Value",
+          "overrides": "@scope/jsii-calc-lib.NumericValue",
           "type": {
             "primitive": "number"
           }
@@ -13360,7 +13360,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 152
+            "line": 159
           },
           "name": "decorationPostfixes",
           "type": {
@@ -13379,7 +13379,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 147
+            "line": 154
           },
           "name": "decorationPrefixes",
           "type": {
@@ -13398,7 +13398,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 142
+            "line": 149
           },
           "name": "stringStyle",
           "type": {
@@ -13417,7 +13417,7 @@
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 184
+        "line": 191
       },
       "members": [
         {
@@ -13962,5 +13962,5 @@
     }
   },
   "version": "0.0.0",
-  "fingerprint": "cyoh4941c6DZUpcqFIkyprTV/kYc5HyNK4JT1ibPKIE="
+  "fingerprint": "E/GXhY9JNedt4a4BxZtUU+gi/wjwJJ7IqZ2ssgncT7Y="
 }
diff --git a/packages/jsii-diff/test/classes.test.ts b/packages/jsii-diff/test/classes.test.ts
index 7735c2c05e..4f16dc3b5e 100644
--- a/packages/jsii-diff/test/classes.test.ts
+++ b/packages/jsii-diff/test/classes.test.ts
@@ -22,7 +22,7 @@ test('okay to add a new function to a class', () =>
   `,
     `
     export class Foo {
-      public foo(): void { }
+      public bar(): void { }
     }
   `,
   ));
@@ -34,14 +34,14 @@ test('not okay to add a required argument to a method', () =>
     /newly required argument/,
     `
     export class Foo {
-      public foo(arg1: string): void {
+      public bar(arg1: string): void {
         Array.isArray(arg1);
       }
     }
   `,
     `
     export class Foo {
-      public foo(arg1: string, arg2: string): void {
+      public bar(arg1: string, arg2: string): void {
         Array.isArray(arg1);
         Array.isArray(arg2);
       }
@@ -55,7 +55,7 @@ test('okay to make a required argument optional', () =>
   expectNoError(
     `
     export class Foo {
-      public foo(arg1: string, arg2: string): void {
+      public bar(arg1: string, arg2: string): void {
         Array.isArray(arg1);
         Array.isArray(arg2);
       }
@@ -63,7 +63,7 @@ test('okay to make a required argument optional', () =>
   `,
     `
     export class Foo {
-      public foo(arg1: string, arg2?: string): void {
+      public bar(arg1: string, arg2?: string): void {
         Array.isArray(arg1);
         Array.isArray(arg2);
       }
@@ -77,7 +77,7 @@ test('okay to turn required arguments into varargs', () =>
   expectNoError(
     `
     export class Foo {
-      public foo(arg1: string, arg2: number, arg3: number): void {
+      public bar(arg1: string, arg2: number, arg3: number): void {
         Array.isArray(arg1);
         Array.isArray(arg2);
         Array.isArray(arg3);
@@ -86,7 +86,7 @@ test('okay to turn required arguments into varargs', () =>
   `,
     `
     export class Foo {
-      public foo(arg1: string, ...args: number[]): void {
+      public bar(arg1: string, ...args: number[]): void {
         Array.isArray(arg1);
         Array.isArray(args);
       }
@@ -101,14 +101,14 @@ test('not allowed to change argument type to a different scalar', () =>
     /method.*foo.*argument arg1, takes number \(formerly string\): string is not assignable to number/i,
     `
     export class Foo {
-      public foo(arg1: string): void {
+      public bar(arg1: string): void {
         Array.isArray(arg1);
       }
     }
   `,
     `
     export class Foo {
-      public foo(arg1: number): void {
+      public bar(arg1: number): void {
         Array.isArray(arg1);
       }
     }
@@ -125,7 +125,7 @@ test('cannot add any abstract members to a subclassable class', () =>
      * @subclassable
      */
     export abstract class Henk {
-      abstract readonly henk: string;
+      abstract readonly name: string;
     }
   `,
     `
@@ -133,7 +133,7 @@ test('cannot add any abstract members to a subclassable class', () =>
      * @subclassable
      */
     export abstract class Henk {
-      abstract readonly henk: string;
+      abstract readonly name: string;
       abstract readonly piet: string;
     }
   `,
@@ -149,7 +149,7 @@ test('cannot add any members to a subclassable interface, not even optional ones
      * @subclassable
      */
     export interface IHenk {
-      henk: string;
+      name: string;
     }
   `,
     `
@@ -157,7 +157,7 @@ test('cannot add any members to a subclassable interface, not even optional ones
      * @subclassable
      */
     export interface IHenk {
-      henk: string;
+      name: string;
       piet?: string;
     }
   `,
@@ -170,12 +170,12 @@ test('cannot make a member less visible', () =>
     /changed from 'public' to 'protected'/,
     `
     export class Henk {
-      public henk: string = 'henk';
+      public name: string = 'henk';
     }
   `,
     `
     export class Henk {
-      protected henk: string = 'henk';
+      protected name: string = 'henk';
     }
   `,
   ));
@@ -364,12 +364,12 @@ test('cannot make a class property optional', () =>
     /prop.*henk.*type Optional<string> \(formerly string\): output type is now optional/i,
     `
     export class Henk {
-      public henk: string = 'henk';
+      public name: string = 'henk';
     }
   `,
     `
     export class Henk {
-      public henk?: string = 'henk';
+      public name?: string = 'henk';
     }
   `,
   ));
@@ -500,12 +500,12 @@ test('change from method to property', () =>
     /changed from method to property/,
     `
     export class Boom {
-      foo() { return 12; }
+      public foo() { return 12; }
     }
     `,
     `
     export class Boom {
-      get foo() { return 12; }
+      public get foo() { return 12; }
     }
     `,
   ));
@@ -515,12 +515,12 @@ test('change from method with arguments to property', () =>
     /changed from method to property/,
     `
     export class Boom {
-      foo(arg: number) { return 12 * arg; }
+      public foo(arg: number) { return 12 * arg; }
     }
     `,
     `
     export class Boom {
-      get foo() { return 12; }
+      public get foo() { return 12; }
     }
     `,
   ));
@@ -530,12 +530,12 @@ test('change from property to method', () =>
     /changed from property to method/,
     `
     export class Boom {
-      get foo() { return 12; }
+      public get foo() { return 12; }
     }
     `,
     `
     export class Boom {
-      foo() { return 12; }
+      public foo() { return 12; }
     }
     `,
   ));
diff --git a/packages/jsii-diff/test/structs.test.ts b/packages/jsii-diff/test/structs.test.ts
index 491778bf7a..154b063e04 100644
--- a/packages/jsii-diff/test/structs.test.ts
+++ b/packages/jsii-diff/test/structs.test.ts
@@ -10,7 +10,7 @@ test('cannot add required fields to an input struct', () =>
       readonly henk: string;
     }
     export class Foo {
-      public foo(arg1: Henk): void {
+      public bar(arg1: Henk): void {
         Array.isArray(arg1);
       }
     }
@@ -21,7 +21,7 @@ test('cannot add required fields to an input struct', () =>
       readonly super: string;
     }
     export class Foo {
-      public foo(arg1: Henk): void {
+      public bar(arg1: Henk): void {
         Array.isArray(arg1);
       }
     }
@@ -37,7 +37,7 @@ test('can add required fields to an output struct', () =>
       readonly henk: string;
     }
     export class Foo {
-      public foo(): Henk {
+      public bar(): Henk {
         return { henk: 'henk' };
       }
     }
@@ -48,7 +48,7 @@ test('can add required fields to an output struct', () =>
       readonly super: string;
     }
     export class Foo {
-      public foo(): Henk {
+      public bar(): Henk {
         return { henk: 'henk', super: 'super' };
       }
     }
@@ -64,7 +64,7 @@ test('can change argument type to a supertype if it adds only optional fields',
       readonly henk: string;
     }
     export class Foo {
-      public foo(arg1: Henk): void {
+      public bar(arg1: Henk): void {
         Array.isArray(arg1);
       }
     }
@@ -77,7 +77,7 @@ test('can change argument type to a supertype if it adds only optional fields',
       readonly henk: string;
     }
     export class Foo {
-      public foo(arg1: Super): void {
+      public bar(arg1: Super): void {
         Array.isArray(arg1);
       }
     }
@@ -96,7 +96,7 @@ test('cannot take fields away from input struct', () =>
       readonly piet: string;
     }
     export class Foo {
-      public foo(arg1: Henk): void {
+      public bar(arg1: Henk): void {
         Array.isArray(arg1);
       }
     }
@@ -106,7 +106,7 @@ test('cannot take fields away from input struct', () =>
       readonly henk: string;
     }
     export class Foo {
-      public foo(arg1: Henk): void {
+      public bar(arg1: Henk): void {
         Array.isArray(arg1);
       }
     }
@@ -124,7 +124,7 @@ test('cannot take fields away from output struct', () =>
       readonly piet: string;
     }
     export class Foo {
-      public foo(): Henk {
+      public bar(): Henk {
         return { henk: 'henk', piet: 'piet' };
       }
     }
@@ -134,7 +134,7 @@ test('cannot take fields away from output struct', () =>
       readonly henk: string;
     }
     export class Foo {
-      public foo(): Henk {
+      public bar(): Henk {
         return { henk: 'henk' };
       }
     }
@@ -151,7 +151,7 @@ test('cannot change argument type to a supertype it adds required fields', () =>
       readonly henk: string;
     }
     export class Foo {
-      public foo(arg1: Henk): void {
+      public bar(arg1: Henk): void {
         Array.isArray(arg1);
       }
     }
@@ -164,7 +164,7 @@ test('cannot change argument type to a supertype it adds required fields', () =>
       readonly henk: string;
     }
     export class Foo {
-      public foo(arg1: Super): void {
+      public bar(arg1: Super): void {
         Array.isArray(arg1);
       }
     }
diff --git a/packages/jsii-diff/test/util.ts b/packages/jsii-diff/test/util.ts
index c5bc33424e..df88534cd3 100644
--- a/packages/jsii-diff/test/util.ts
+++ b/packages/jsii-diff/test/util.ts
@@ -30,13 +30,19 @@ export async function compare(
   original: string,
   updated: string,
 ): Promise<Mismatches> {
-  const ass1 = await sourceToAssemblyHelper(original);
+  const ass1 = sourceToAssemblyHelper(original);
+  await expect(ass1).resolves.not.toThrowError();
   const ts1 = new reflect.TypeSystem();
-  const originalAssembly = ts1.addAssembly(new reflect.Assembly(ts1, ass1));
+  const originalAssembly = ts1.addAssembly(
+    new reflect.Assembly(ts1, await ass1),
+  );
 
-  const ass2 = await sourceToAssemblyHelper(updated);
+  const ass2 = sourceToAssemblyHelper(updated);
+  await expect(ass2).resolves.not.toThrowError();
   const ts2 = new reflect.TypeSystem();
-  const updatedAssembly = ts2.addAssembly(new reflect.Assembly(ts2, ass2));
+  const updatedAssembly = ts2.addAssembly(
+    new reflect.Assembly(ts2, await ass2),
+  );
 
   return compareAssemblies(originalAssembly, updatedAssembly);
 }
diff --git a/packages/jsii-pacmak/bin/jsii-pacmak.ts b/packages/jsii-pacmak/bin/jsii-pacmak.ts
index f4254821a3..ed6fb9744b 100644
--- a/packages/jsii-pacmak/bin/jsii-pacmak.ts
+++ b/packages/jsii-pacmak/bin/jsii-pacmak.ts
@@ -101,6 +101,15 @@ import { ALL_BUILDERS, TargetName } from '../lib/targets';
         'Generate all configured targets in parallel (disabling this might help if you encounter EMFILE errors)',
       default: true,
     })
+    .option('dotnet-nuget-global-packages-folder', {
+      type: 'string',
+      desc: 'Configure a different NuGet package cache for NuGet',
+      default: undefined,
+      // This is a hidden option, folks need not bother it unless they're very advanced
+      hidden: true,
+      // This is expected to be a path, which should be normalized
+      normalize: true,
+    })
     .version(VERSION_DESC)
     .strict().argv;
 
diff --git a/packages/jsii-pacmak/lib/targets/dotnet.ts b/packages/jsii-pacmak/lib/targets/dotnet.ts
index b65602693e..40a0f463d7 100644
--- a/packages/jsii-pacmak/lib/targets/dotnet.ts
+++ b/packages/jsii-pacmak/lib/targets/dotnet.ts
@@ -53,9 +53,13 @@ export class DotnetBuilder implements TargetBuilder {
 
       // Build solution
       logging.debug('Building .NET');
-      await shell('dotnet', ['build', '--force', '-c', 'Release'], {
-        cwd: tempSourceDir.directory,
-      });
+      await shell(
+        'dotnet',
+        ['build', '--force', '--configuration', 'Release'],
+        {
+          cwd: tempSourceDir.directory,
+        },
+      );
 
       await this.copyOutArtifacts(tempSourceDir.object);
       if (this.options.clean) {
@@ -204,6 +208,22 @@ export class DotnetBuilder implements TargetBuilder {
       add.att('value', path.join(repo));
     });
 
+    if (this.options.arguments['dotnet-nuget-global-packages-folder']) {
+      // Ensure we're not using the configured cache folder
+      configuration
+        .ele('config')
+        .ele('add')
+        .att('key', 'globalPackagesFolder')
+        .att(
+          'value',
+          path.resolve(
+            this.options.arguments['dotnet-nuget-global-packages-folder'],
+            '.nuget',
+            'packages',
+          ),
+        );
+    }
+
     const xml = configuration.end({ pretty: true });
 
     // Write XML content to NuGet.config.
diff --git a/packages/jsii-pacmak/test/__snapshots__/jsii-pacmak.test.ts.snap b/packages/jsii-pacmak/test/__snapshots__/jsii-pacmak.test.ts.snap
index 3c95134c36..3455d3da43 100644
--- a/packages/jsii-pacmak/test/__snapshots__/jsii-pacmak.test.ts.snap
+++ b/packages/jsii-pacmak/test/__snapshots__/jsii-pacmak.test.ts.snap
@@ -2375,12 +2375,12 @@ exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/ 1`] = `
  ┃     ┃        ┃     ┣━ 📄 MyFirstStruct.cs
  ┃     ┃        ┃     ┣━ 📄 MyFirstStructProxy.cs
  ┃     ┃        ┃     ┣━ 📄 Number.cs
+ ┃     ┃        ┃     ┣━ 📄 NumericValue.cs
+ ┃     ┃        ┃     ┣━ 📄 NumericValueProxy.cs
  ┃     ┃        ┃     ┣━ 📄 Operation.cs
  ┃     ┃        ┃     ┣━ 📄 OperationProxy.cs
  ┃     ┃        ┃     ┣━ 📄 StructWithOnlyOptionals.cs
- ┃     ┃        ┃     ┣━ 📄 StructWithOnlyOptionalsProxy.cs
- ┃     ┃        ┃     ┣━ 📄 Value_.cs
- ┃     ┃        ┃     ┗━ 📄 ValueProxy.cs
+ ┃     ┃        ┃     ┗━ 📄 StructWithOnlyOptionalsProxy.cs
  ┃     ┃        ┗━ 📁 CustomSubmoduleName
  ┃     ┃           ┣━ 📄 IReflectable.cs
  ┃     ┃           ┣━ 📄 IReflectableEntry.cs
@@ -2419,10 +2419,10 @@ exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/ 1`] = `
  ┃        ┃                    ┣━ 📄 IThreeLevelsInterface.java
  ┃        ┃                    ┣━ 📄 MyFirstStruct.java
  ┃        ┃                    ┣━ 📄 Number.java
+ ┃        ┃                    ┣━ 📄 NumericValue.java
  ┃        ┃                    ┣━ 📄 Operation.java
  ┃        ┃                    ┣━ 📄 package-info.java
- ┃        ┃                    ┣━ 📄 StructWithOnlyOptionals.java
- ┃        ┃                    ┗━ 📄 Value.java
+ ┃        ┃                    ┗━ 📄 StructWithOnlyOptionals.java
  ┃        ┗━ 📁 resources
  ┃           ┗━ 📁 software
  ┃              ┗━ 📁 amazon
@@ -2768,7 +2768,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/dotnet/Amazon.JSII.
     },
     "@scope/jsii-calc-lib.Number": {
       "assembly": "@scope/jsii-calc-lib",
-      "base": "@scope/jsii-calc-lib.Value",
+      "base": "@scope/jsii-calc-lib.NumericValue",
       "docs": {
         "stability": "deprecated",
         "summary": "Represents a concrete number."
@@ -2832,7 +2832,60 @@ exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/dotnet/Amazon.JSII.
             "line": 35
           },
           "name": "value",
-          "overrides": "@scope/jsii-calc-lib.Value",
+          "overrides": "@scope/jsii-calc-lib.NumericValue",
+          "type": {
+            "primitive": "number"
+          }
+        }
+      ]
+    },
+    "@scope/jsii-calc-lib.NumericValue": {
+      "abstract": true,
+      "assembly": "@scope/jsii-calc-lib",
+      "base": "@scope/jsii-calc-base.Base",
+      "docs": {
+        "stability": "deprecated",
+        "summary": "Abstract class which represents a numeric value."
+      },
+      "fqn": "@scope/jsii-calc-lib.NumericValue",
+      "initializer": {},
+      "kind": "class",
+      "locationInModule": {
+        "filename": "lib/index.ts",
+        "line": 6
+      },
+      "methods": [
+        {
+          "docs": {
+            "stability": "deprecated",
+            "summary": "String representation of the value."
+          },
+          "locationInModule": {
+            "filename": "lib/index.ts",
+            "line": 15
+          },
+          "name": "toString",
+          "returns": {
+            "type": {
+              "primitive": "string"
+            }
+          }
+        }
+      ],
+      "name": "NumericValue",
+      "properties": [
+        {
+          "abstract": true,
+          "docs": {
+            "stability": "deprecated",
+            "summary": "The value."
+          },
+          "immutable": true,
+          "locationInModule": {
+            "filename": "lib/index.ts",
+            "line": 10
+          },
+          "name": "value",
           "type": {
             "primitive": "number"
           }
@@ -2842,7 +2895,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/dotnet/Amazon.JSII.
     "@scope/jsii-calc-lib.Operation": {
       "abstract": true,
       "assembly": "@scope/jsii-calc-lib",
-      "base": "@scope/jsii-calc-lib.Value",
+      "base": "@scope/jsii-calc-lib.NumericValue",
       "docs": {
         "stability": "deprecated",
         "summary": "Represents an operation on values."
@@ -2866,7 +2919,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/dotnet/Amazon.JSII.
             "line": 51
           },
           "name": "toString",
-          "overrides": "@scope/jsii-calc-lib.Value",
+          "overrides": "@scope/jsii-calc-lib.NumericValue",
           "returns": {
             "type": {
               "primitive": "string"
@@ -2942,59 +2995,6 @@ exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/dotnet/Amazon.JSII.
         }
       ]
     },
-    "@scope/jsii-calc-lib.Value": {
-      "abstract": true,
-      "assembly": "@scope/jsii-calc-lib",
-      "base": "@scope/jsii-calc-base.Base",
-      "docs": {
-        "stability": "deprecated",
-        "summary": "Abstract class which represents a numeric value."
-      },
-      "fqn": "@scope/jsii-calc-lib.Value",
-      "initializer": {},
-      "kind": "class",
-      "locationInModule": {
-        "filename": "lib/index.ts",
-        "line": 6
-      },
-      "methods": [
-        {
-          "docs": {
-            "stability": "deprecated",
-            "summary": "String representation of the value."
-          },
-          "locationInModule": {
-            "filename": "lib/index.ts",
-            "line": 15
-          },
-          "name": "toString",
-          "returns": {
-            "type": {
-              "primitive": "string"
-            }
-          }
-        }
-      ],
-      "name": "Value",
-      "properties": [
-        {
-          "abstract": true,
-          "docs": {
-            "stability": "deprecated",
-            "summary": "The value."
-          },
-          "immutable": true,
-          "locationInModule": {
-            "filename": "lib/index.ts",
-            "line": 10
-          },
-          "name": "value",
-          "type": {
-            "primitive": "number"
-          }
-        }
-      ]
-    },
     "@scope/jsii-calc-lib.submodule.IReflectable": {
       "assembly": "@scope/jsii-calc-lib",
       "docs": {
@@ -3214,7 +3214,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/dotnet/Amazon.JSII.
     }
   },
   "version": "0.0.0",
-  "fingerprint": "eQh0XE5tmf4g2rxlhgkrIZJ93RG55/oLM+RNpmaQyGs="
+  "fingerprint": "kLS1ei6Uc31/IKA//k3OZp65Lxz+2tLyQOO/qSYpvSE="
 }
 
 `;
@@ -3758,7 +3758,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
     /// </remarks>
     [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Number), fullyQualifiedName: "@scope/jsii-calc-lib.Number", parametersJson: "[{\\"docs\\":{\\"summary\\":\\"The number.\\"},\\"name\\":\\"value\\",\\"type\\":{\\"primitive\\":\\"number\\"}}]")]
     [System.Obsolete()]
-    public class Number : Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.IDoublable
+    public class Number : Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.IDoublable
     {
         /// <summary>Creates a Number object.</summary>
         /// <param name="value">The number.</param>
@@ -3812,6 +3812,99 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
 
 `;
 
+exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/NumericValue.cs 1`] = `
+using Amazon.JSII.Runtime.Deputy;
+
+#pragma warning disable CS0672,CS0809,CS1591
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
+{
+    /// <summary>Abstract class which represents a numeric value.</summary>
+    /// <remarks>
+    /// <strong>Stability</strong>: Deprecated
+    /// </remarks>
+    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue), fullyQualifiedName: "@scope/jsii-calc-lib.NumericValue")]
+    [System.Obsolete()]
+    public abstract class NumericValue : Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace.Base
+    {
+        protected NumericValue(): 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 NumericValue(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 NumericValue(DeputyProps props): base(props)
+        {
+        }
+
+        /// <summary>String representation of the value.</summary>
+        /// <remarks>
+        /// <strong>Stability</strong>: Deprecated
+        /// </remarks>
+        [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
+        [System.Obsolete()]
+        public override string ToString()
+        {
+            return InvokeInstanceMethod<string>(new System.Type[]{}, new object[]{});
+        }
+
+        /// <summary>The value.</summary>
+        /// <remarks>
+        /// <strong>Stability</strong>: Deprecated
+        /// </remarks>
+        [JsiiProperty(name: "value", typeJson: "{\\"primitive\\":\\"number\\"}")]
+        [System.Obsolete()]
+        public abstract double Value
+        {
+            get;
+        }
+    }
+}
+
+`;
+
+exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/NumericValueProxy.cs 1`] = `
+using Amazon.JSII.Runtime.Deputy;
+
+#pragma warning disable CS0672,CS0809,CS1591
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
+{
+    /// <summary>Abstract class which represents a numeric value.</summary>
+    /// <remarks>
+    /// <strong>Stability</strong>: Deprecated
+    /// </remarks>
+    [JsiiTypeProxy(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue), fullyQualifiedName: "@scope/jsii-calc-lib.NumericValue")]
+    [System.Obsolete()]
+    internal sealed class NumericValueProxy : Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue
+    {
+        private NumericValueProxy(ByRefValue reference): base(reference)
+        {
+        }
+
+        /// <summary>The value.</summary>
+        /// <remarks>
+        /// <strong>Stability</strong>: Deprecated
+        /// </remarks>
+        [JsiiProperty(name: "value", typeJson: "{\\"primitive\\":\\"number\\"}")]
+        [System.Obsolete()]
+        public override double Value
+        {
+            get => GetInstanceProperty<double>();
+        }
+    }
+}
+
+`;
+
 exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Operation.cs 1`] = `
 using Amazon.JSII.Runtime.Deputy;
 
@@ -3825,7 +3918,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
     /// </remarks>
     [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Operation), fullyQualifiedName: "@scope/jsii-calc-lib.Operation")]
     [System.Obsolete()]
-    public abstract class Operation : Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_
+    public abstract class Operation : Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue
     {
         protected Operation(): base(new DeputyProps(System.Array.Empty<object>()))
         {
@@ -4015,99 +4108,6 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
 
 `;
 
-exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Value_.cs 1`] = `
-using Amazon.JSII.Runtime.Deputy;
-
-#pragma warning disable CS0672,CS0809,CS1591
-
-namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
-{
-    /// <summary>Abstract class which represents a numeric value.</summary>
-    /// <remarks>
-    /// <strong>Stability</strong>: Deprecated
-    /// </remarks>
-    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_), fullyQualifiedName: "@scope/jsii-calc-lib.Value")]
-    [System.Obsolete()]
-    public abstract class Value_ : Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace.Base
-    {
-        protected Value_(): 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 Value_(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 Value_(DeputyProps props): base(props)
-        {
-        }
-
-        /// <summary>String representation of the value.</summary>
-        /// <remarks>
-        /// <strong>Stability</strong>: Deprecated
-        /// </remarks>
-        [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
-        [System.Obsolete()]
-        public override string ToString()
-        {
-            return InvokeInstanceMethod<string>(new System.Type[]{}, new object[]{});
-        }
-
-        /// <summary>The value.</summary>
-        /// <remarks>
-        /// <strong>Stability</strong>: Deprecated
-        /// </remarks>
-        [JsiiProperty(name: "value", typeJson: "{\\"primitive\\":\\"number\\"}")]
-        [System.Obsolete()]
-        public abstract double Value
-        {
-            get;
-        }
-    }
-}
-
-`;
-
-exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/ValueProxy.cs 1`] = `
-using Amazon.JSII.Runtime.Deputy;
-
-#pragma warning disable CS0672,CS0809,CS1591
-
-namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
-{
-    /// <summary>Abstract class which represents a numeric value.</summary>
-    /// <remarks>
-    /// <strong>Stability</strong>: Deprecated
-    /// </remarks>
-    [JsiiTypeProxy(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_), fullyQualifiedName: "@scope/jsii-calc-lib.Value")]
-    [System.Obsolete()]
-    internal sealed class ValueProxy : Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_
-    {
-        private ValueProxy(ByRefValue reference): base(reference)
-        {
-        }
-
-        /// <summary>The value.</summary>
-        /// <remarks>
-        /// <strong>Stability</strong>: Deprecated
-        /// </remarks>
-        [JsiiProperty(name: "value", typeJson: "{\\"primitive\\":\\"number\\"}")]
-        [System.Obsolete()]
-        public override double Value
-        {
-            get => GetInstanceProperty<double>();
-        }
-    }
-}
-
-`;
-
 exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CustomSubmoduleName/IReflectable.cs 1`] = `
 using Amazon.JSII.Runtime.Deputy;
 
@@ -4565,6 +4565,33 @@ func (n Number) GetValue() float64 {
 }
 
 
+type NumericValueIface interface {
+    GetValue() float64
+    SetValue()
+    ToString() string
+}
+
+type NumericValue struct {
+    Value float64
+}
+
+
+func (n NumericValue) GetValue() float64 {
+    return n.Value
+}
+
+
+func (n *NumericValue) ToString() string  {
+    jsii.NoOpRequest(jsii.NoOpApiRequest {
+
+        Class: "NumericValue",
+        Method: "ToString",
+        Args: []string{},
+
+    })
+    return "NOOP_RETURN_STRING"
+}
+
 type OperationIface interface {
     ToString() string
 }
@@ -4609,33 +4636,6 @@ func (s StructWithOnlyOptionals) GetOptional3() bool {
 }
 
 
-type ValueIface interface {
-    GetValue() float64
-    SetValue()
-    ToString() string
-}
-
-type Value struct {
-    Value float64
-}
-
-
-func (v Value) GetValue() float64 {
-    return v.Value
-}
-
-
-func (v *Value) ToString() string  {
-    jsii.NoOpRequest(jsii.NoOpApiRequest {
-
-        Class: "Value",
-        Method: "ToString",
-        Args: []string{},
-
-    })
-    return "NOOP_RETURN_STRING"
-}
-
 
 `;
 
@@ -5744,7 +5744,7 @@ package software.amazon.jsii.tests.calculator.lib;
 @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Deprecated)
 @Deprecated
 @software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.lib.$Module.class, fqn = "@scope/jsii-calc-lib.Number")
-public class Number extends software.amazon.jsii.tests.calculator.lib.Value implements software.amazon.jsii.tests.calculator.lib.IDoublable {
+public class Number extends software.amazon.jsii.tests.calculator.lib.NumericValue implements software.amazon.jsii.tests.calculator.lib.IDoublable {
 
     protected Number(final software.amazon.jsii.JsiiObjectRef objRef) {
         super(objRef);
@@ -5789,6 +5789,69 @@ public class Number extends software.amazon.jsii.tests.calculator.lib.Value impl
 
 `;
 
+exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/java/src/main/java/software/amazon/jsii/tests/calculator/lib/NumericValue.java 1`] = `
+package software.amazon.jsii.tests.calculator.lib;
+
+/**
+ * Abstract class which represents a numeric value.
+ */
+@javax.annotation.Generated(value = "jsii-pacmak")
+@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Deprecated)
+@Deprecated
+@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.lib.$Module.class, fqn = "@scope/jsii-calc-lib.NumericValue")
+public abstract class NumericValue extends software.amazon.jsii.tests.calculator.base.Base {
+
+    protected NumericValue(final software.amazon.jsii.JsiiObjectRef objRef) {
+        super(objRef);
+    }
+
+    protected NumericValue(final software.amazon.jsii.JsiiObject.InitializationMode initializationMode) {
+        super(initializationMode);
+    }
+
+    protected NumericValue() {
+        super(software.amazon.jsii.JsiiObject.InitializationMode.JSII);
+        software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this);
+    }
+
+    /**
+     * String representation of the value.
+     */
+    @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Deprecated)
+    @Deprecated
+    public @org.jetbrains.annotations.NotNull java.lang.String toString() {
+        return this.jsiiCall("toString", java.lang.String.class);
+    }
+
+    /**
+     * The value.
+     */
+    @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Deprecated)
+    @Deprecated
+    public abstract @org.jetbrains.annotations.NotNull java.lang.Number getValue();
+
+    /**
+     * A proxy class which represents a concrete javascript instance of this type.
+     */
+    final static class Jsii$Proxy extends software.amazon.jsii.tests.calculator.lib.NumericValue {
+        protected Jsii$Proxy(final software.amazon.jsii.JsiiObjectRef objRef) {
+            super(objRef);
+        }
+
+        /**
+         * The value.
+         */
+        @Override
+        @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Deprecated)
+        @Deprecated
+        public @org.jetbrains.annotations.NotNull java.lang.Number getValue() {
+            return this.jsiiGet("value", java.lang.Number.class);
+        }
+    }
+}
+
+`;
+
 exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/java/src/main/java/software/amazon/jsii/tests/calculator/lib/Operation.java 1`] = `
 package software.amazon.jsii.tests.calculator.lib;
 
@@ -5799,7 +5862,7 @@ package software.amazon.jsii.tests.calculator.lib;
 @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Deprecated)
 @Deprecated
 @software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.lib.$Module.class, fqn = "@scope/jsii-calc-lib.Operation")
-public abstract class Operation extends software.amazon.jsii.tests.calculator.lib.Value {
+public abstract class Operation extends software.amazon.jsii.tests.calculator.lib.NumericValue {
 
     protected Operation(final software.amazon.jsii.JsiiObjectRef objRef) {
         super(objRef);
@@ -6054,69 +6117,6 @@ public interface StructWithOnlyOptionals extends software.amazon.jsii.JsiiSerial
 
 `;
 
-exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/java/src/main/java/software/amazon/jsii/tests/calculator/lib/Value.java 1`] = `
-package software.amazon.jsii.tests.calculator.lib;
-
-/**
- * Abstract class which represents a numeric value.
- */
-@javax.annotation.Generated(value = "jsii-pacmak")
-@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Deprecated)
-@Deprecated
-@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.lib.$Module.class, fqn = "@scope/jsii-calc-lib.Value")
-public abstract class Value extends software.amazon.jsii.tests.calculator.base.Base {
-
-    protected Value(final software.amazon.jsii.JsiiObjectRef objRef) {
-        super(objRef);
-    }
-
-    protected Value(final software.amazon.jsii.JsiiObject.InitializationMode initializationMode) {
-        super(initializationMode);
-    }
-
-    protected Value() {
-        super(software.amazon.jsii.JsiiObject.InitializationMode.JSII);
-        software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this);
-    }
-
-    /**
-     * String representation of the value.
-     */
-    @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Deprecated)
-    @Deprecated
-    public @org.jetbrains.annotations.NotNull java.lang.String toString() {
-        return this.jsiiCall("toString", java.lang.String.class);
-    }
-
-    /**
-     * The value.
-     */
-    @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Deprecated)
-    @Deprecated
-    public abstract @org.jetbrains.annotations.NotNull java.lang.Number getValue();
-
-    /**
-     * A proxy class which represents a concrete javascript instance of this type.
-     */
-    final static class Jsii$Proxy extends software.amazon.jsii.tests.calculator.lib.Value {
-        protected Jsii$Proxy(final software.amazon.jsii.JsiiObjectRef objRef) {
-            super(objRef);
-        }
-
-        /**
-         * The value.
-         */
-        @Override
-        @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Deprecated)
-        @Deprecated
-        public @org.jetbrains.annotations.NotNull java.lang.Number getValue() {
-            return this.jsiiGet("value", java.lang.Number.class);
-        }
-    }
-}
-
-`;
-
 exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/java/src/main/java/software/amazon/jsii/tests/calculator/lib/package-info.java 1`] = `
 /**
  *
@@ -6135,9 +6135,9 @@ exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/java/src/main/resou
 @scope/jsii-calc-lib.IThreeLevelsInterface=software.amazon.jsii.tests.calculator.lib.IThreeLevelsInterface
 @scope/jsii-calc-lib.MyFirstStruct=software.amazon.jsii.tests.calculator.lib.MyFirstStruct
 @scope/jsii-calc-lib.Number=software.amazon.jsii.tests.calculator.lib.Number
+@scope/jsii-calc-lib.NumericValue=software.amazon.jsii.tests.calculator.lib.NumericValue
 @scope/jsii-calc-lib.Operation=software.amazon.jsii.tests.calculator.lib.Operation
 @scope/jsii-calc-lib.StructWithOnlyOptionals=software.amazon.jsii.tests.calculator.lib.StructWithOnlyOptionals
-@scope/jsii-calc-lib.Value=software.amazon.jsii.tests.calculator.lib.Value
 @scope/jsii-calc-lib.submodule.IReflectable=software.amazon.jsii.tests.calculator.custom_submodule_name.IReflectable
 @scope/jsii-calc-lib.submodule.NestingClass=software.amazon.jsii.tests.calculator.custom_submodule_name.NestingClass
 @scope/jsii-calc-lib.submodule.NestingClass.NestedClass=software.amazon.jsii.tests.calculator.custom_submodule_name.NestingClass$NestedClass
@@ -6487,6 +6487,101 @@ class MyFirstStruct:
         )
 
 
+class NumericValue(
+    scope.jsii_calc_base.Base,
+    metaclass=jsii.JSIIAbstractClass,
+    jsii_type="@scope/jsii-calc-lib.NumericValue",
+):
+    """Abstract class which represents a numeric value.
+
+    stability
+    :stability: deprecated
+    """
+
+    @builtins.staticmethod
+    def __jsii_proxy_class__():
+        return _NumericValueProxy
+
+    def __init__(self) -> None:
+        jsii.create(NumericValue, self, [])
+
+    @jsii.member(jsii_name="toString")
+    def to_string(self) -> builtins.str:
+        """String representation of the value.
+
+        stability
+        :stability: deprecated
+        """
+        return jsii.invoke(self, "toString", [])
+
+    @builtins.property # type: ignore
+    @jsii.member(jsii_name="value")
+    @abc.abstractmethod
+    def value(self) -> jsii.Number:
+        """The value.
+
+        stability
+        :stability: deprecated
+        """
+        ...
+
+
+class _NumericValueProxy(
+    NumericValue, jsii.proxy_for(scope.jsii_calc_base.Base) # type: ignore
+):
+    @builtins.property # type: ignore
+    @jsii.member(jsii_name="value")
+    def value(self) -> jsii.Number:
+        """The value.
+
+        stability
+        :stability: deprecated
+        """
+        return jsii.get(self, "value")
+
+
+class Operation(
+    NumericValue,
+    metaclass=jsii.JSIIAbstractClass,
+    jsii_type="@scope/jsii-calc-lib.Operation",
+):
+    """Represents an operation on values.
+
+    stability
+    :stability: deprecated
+    """
+
+    @builtins.staticmethod
+    def __jsii_proxy_class__():
+        return _OperationProxy
+
+    def __init__(self) -> None:
+        jsii.create(Operation, self, [])
+
+    @jsii.member(jsii_name="toString")
+    @abc.abstractmethod
+    def to_string(self) -> builtins.str:
+        """String representation of the value.
+
+        stability
+        :stability: deprecated
+        """
+        ...
+
+
+class _OperationProxy(
+    Operation, jsii.proxy_for(NumericValue) # type: ignore
+):
+    @jsii.member(jsii_name="toString")
+    def to_string(self) -> builtins.str:
+        """String representation of the value.
+
+        stability
+        :stability: deprecated
+        """
+        return jsii.invoke(self, "toString", [])
+
+
 @jsii.data_type(
     jsii_type="@scope/jsii-calc-lib.StructWithOnlyOptionals",
     jsii_struct_bases=[],
@@ -6561,61 +6656,12 @@ class StructWithOnlyOptionals:
         )
 
 
-class Value(
-    scope.jsii_calc_base.Base,
-    metaclass=jsii.JSIIAbstractClass,
-    jsii_type="@scope/jsii-calc-lib.Value",
-):
-    """Abstract class which represents a numeric value.
-
-    stability
-    :stability: deprecated
-    """
-
-    @builtins.staticmethod
-    def __jsii_proxy_class__():
-        return _ValueProxy
-
-    def __init__(self) -> None:
-        jsii.create(Value, self, [])
-
-    @jsii.member(jsii_name="toString")
-    def to_string(self) -> builtins.str:
-        """String representation of the value.
-
-        stability
-        :stability: deprecated
-        """
-        return jsii.invoke(self, "toString", [])
-
-    @builtins.property # type: ignore
-    @jsii.member(jsii_name="value")
-    @abc.abstractmethod
-    def value(self) -> jsii.Number:
-        """The value.
-
-        stability
-        :stability: deprecated
-        """
-        ...
-
-
-class _ValueProxy(
-    Value, jsii.proxy_for(scope.jsii_calc_base.Base) # type: ignore
-):
-    @builtins.property # type: ignore
-    @jsii.member(jsii_name="value")
-    def value(self) -> jsii.Number:
-        """The value.
-
-        stability
-        :stability: deprecated
-        """
-        return jsii.get(self, "value")
-
-
 @jsii.implements(IDoublable)
-class Number(Value, metaclass=jsii.JSIIMeta, jsii_type="@scope/jsii-calc-lib.Number"):
+class Number(
+    NumericValue,
+    metaclass=jsii.JSIIMeta,
+    jsii_type="@scope/jsii-calc-lib.Number",
+):
     """Represents a concrete number.
 
     stability
@@ -6653,48 +6699,6 @@ class Number(Value, metaclass=jsii.JSIIMeta, jsii_type="@scope/jsii-calc-lib.Num
         return jsii.get(self, "value")
 
 
-class Operation(
-    Value,
-    metaclass=jsii.JSIIAbstractClass,
-    jsii_type="@scope/jsii-calc-lib.Operation",
-):
-    """Represents an operation on values.
-
-    stability
-    :stability: deprecated
-    """
-
-    @builtins.staticmethod
-    def __jsii_proxy_class__():
-        return _OperationProxy
-
-    def __init__(self) -> None:
-        jsii.create(Operation, self, [])
-
-    @jsii.member(jsii_name="toString")
-    @abc.abstractmethod
-    def to_string(self) -> builtins.str:
-        """String representation of the value.
-
-        stability
-        :stability: deprecated
-        """
-        ...
-
-
-class _OperationProxy(
-    Operation, jsii.proxy_for(Value) # type: ignore
-):
-    @jsii.member(jsii_name="toString")
-    def to_string(self) -> builtins.str:
-        """String representation of the value.
-
-        stability
-        :stability: deprecated
-        """
-        return jsii.invoke(self, "toString", [])
-
-
 __all__ = [
     "EnumFromScopedModule",
     "IDoublable",
@@ -6702,9 +6706,9 @@ __all__ = [
     "IThreeLevelsInterface",
     "MyFirstStruct",
     "Number",
+    "NumericValue",
     "Operation",
     "StructWithOnlyOptionals",
-    "Value",
 ]
 
 publication.publish()
@@ -7199,7 +7203,7 @@ exports[`Generated code for "jsii-calc": <outDir>/ 1`] = `
  ┃     ┃           ┣━ 📄 JSII417PublicBaseOfBase.cs
  ┃     ┃           ┣━ 📄 Jsii487Derived.cs
  ┃     ┃           ┣━ 📄 Jsii496Derived.cs
- ┃     ┃           ┣━ 📄 JsiiAgent_.cs
+ ┃     ┃           ┣━ 📄 JsiiAgent.cs
  ┃     ┃           ┣━ 📄 JSObjectLiteralForInterface.cs
  ┃     ┃           ┣━ 📄 JSObjectLiteralToNative.cs
  ┃     ┃           ┣━ 📄 JSObjectLiteralToNativeClass.cs
@@ -7808,31 +7812,31 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
     "jsii-calc.DerivedClassHasNoProperties": {
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 325
+        "line": 324
       }
     },
     "jsii-calc.InterfaceInNamespaceIncludesClasses": {
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1206
+        "line": 1205
       }
     },
     "jsii-calc.InterfaceInNamespaceOnlyInterface": {
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1199
+        "line": 1198
       }
     },
     "jsii-calc.PythonSelf": {
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1090
+        "line": 1089
       }
     },
     "jsii-calc.composition": {
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 134
+        "line": 141
       }
     },
     "jsii-calc.submodule": {
@@ -7917,7 +7921,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1250
+        "line": 1249
       },
       "methods": [
         {
@@ -7927,7 +7931,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1256
+            "line": 1255
           },
           "name": "abstractMethod",
           "parameters": [
@@ -7950,7 +7954,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1252
+            "line": 1251
           },
           "name": "nonAbstractMethod",
           "returns": {
@@ -7969,7 +7973,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1258
+            "line": 1257
           },
           "name": "propFromInterface",
           "overrides": "jsii-calc.IInterfaceImplementedByAbstractClass",
@@ -7994,7 +7998,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1246
+        "line": 1245
       },
       "name": "AbstractClassBase",
       "properties": [
@@ -8006,7 +8010,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1247
+            "line": 1246
           },
           "name": "abstractProperty",
           "type": {
@@ -8029,7 +8033,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1273
+        "line": 1272
       },
       "methods": [
         {
@@ -8038,7 +8042,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1274
+            "line": 1273
           },
           "name": "giveMeAbstract",
           "returns": {
@@ -8053,7 +8057,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1278
+            "line": 1277
           },
           "name": "giveMeInterface",
           "returns": {
@@ -8072,7 +8076,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1282
+            "line": 1281
           },
           "name": "returnAbstractFromProperty",
           "type": {
@@ -8097,7 +8101,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 411
+        "line": 421
       },
       "methods": [
         {
@@ -8107,7 +8111,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 413
+            "line": 423
           },
           "name": "someMethod",
           "parameters": [
@@ -8132,7 +8136,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 419
+            "line": 429
           },
           "name": "workItAll",
           "parameters": [
@@ -8162,7 +8166,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 412
+            "line": 422
           },
           "name": "property",
           "protected": true,
@@ -8187,7 +8191,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 49
+          "line": 53
         },
         "parameters": [
           {
@@ -8196,7 +8200,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
             },
             "name": "lhs",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           },
           {
@@ -8205,7 +8209,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
             },
             "name": "rhs",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           }
         ]
@@ -8213,7 +8217,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 61
+        "line": 68
       },
       "methods": [
         {
@@ -8223,7 +8227,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 66
+            "line": 73
           },
           "name": "toString",
           "overrides": "@scope/jsii-calc-lib.Operation",
@@ -8244,10 +8248,10 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 62
+            "line": 69
           },
           "name": "value",
-          "overrides": "@scope/jsii-calc-lib.Value",
+          "overrides": "@scope/jsii-calc-lib.NumericValue",
           "type": {
             "primitive": "number"
           }
@@ -8270,7 +8274,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 63
+        "line": 62
       },
       "methods": [
         {
@@ -8279,7 +8283,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 232
+            "line": 231
           },
           "name": "anyIn",
           "parameters": [
@@ -8297,7 +8301,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 224
+            "line": 223
           },
           "name": "anyOut",
           "returns": {
@@ -8312,7 +8316,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 220
+            "line": 219
           },
           "name": "enumMethod",
           "parameters": [
@@ -8339,7 +8343,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 216
+            "line": 215
           },
           "name": "enumPropertyValue",
           "type": {
@@ -8352,7 +8356,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 180
+            "line": 179
           },
           "name": "anyArrayProperty",
           "type": {
@@ -8370,7 +8374,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 181
+            "line": 180
           },
           "name": "anyMapProperty",
           "type": {
@@ -8388,7 +8392,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 179
+            "line": 178
           },
           "name": "anyProperty",
           "type": {
@@ -8401,7 +8405,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 165
+            "line": 164
           },
           "name": "arrayProperty",
           "type": {
@@ -8419,7 +8423,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 68
+            "line": 67
           },
           "name": "booleanProperty",
           "type": {
@@ -8432,7 +8436,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 114
+            "line": 113
           },
           "name": "dateProperty",
           "type": {
@@ -8445,7 +8449,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 200
+            "line": 199
           },
           "name": "enumProperty",
           "type": {
@@ -8458,7 +8462,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 133
+            "line": 132
           },
           "name": "jsonProperty",
           "type": {
@@ -8471,7 +8475,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 150
+            "line": 149
           },
           "name": "mapProperty",
           "type": {
@@ -8489,7 +8493,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 99
+            "line": 98
           },
           "name": "numberProperty",
           "type": {
@@ -8502,7 +8506,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 83
+            "line": 82
           },
           "name": "stringProperty",
           "type": {
@@ -8515,7 +8519,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 192
+            "line": 191
           },
           "name": "unionArrayProperty",
           "type": {
@@ -8527,7 +8531,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
                       "primitive": "number"
                     },
                     {
-                      "fqn": "@scope/jsii-calc-lib.Value"
+                      "fqn": "@scope/jsii-calc-lib.NumericValue"
                     }
                   ]
                 }
@@ -8542,7 +8546,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 193
+            "line": 192
           },
           "name": "unionMapProperty",
           "type": {
@@ -8572,7 +8576,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 191
+            "line": 190
           },
           "name": "unionProperty",
           "type": {
@@ -8600,7 +8604,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 186
+            "line": 185
           },
           "name": "unknownArrayProperty",
           "type": {
@@ -8618,7 +8622,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 187
+            "line": 186
           },
           "name": "unknownMapProperty",
           "type": {
@@ -8636,7 +8640,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 185
+            "line": 184
           },
           "name": "unknownProperty",
           "type": {
@@ -8649,7 +8653,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 197
+            "line": 196
           },
           "name": "optionalEnumValue",
           "optional": true,
@@ -8668,7 +8672,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 33
+        "line": 32
       },
       "members": [
         {
@@ -8706,7 +8710,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 615
+        "line": 614
       },
       "methods": [
         {
@@ -8715,7 +8719,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 623
+            "line": 622
           },
           "name": "getBar",
           "parameters": [
@@ -8740,7 +8744,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 619
+            "line": 618
           },
           "name": "getFoo",
           "parameters": [
@@ -8763,7 +8767,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 634
+            "line": 633
           },
           "name": "setBar",
           "parameters": [
@@ -8794,7 +8798,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 630
+            "line": 629
           },
           "name": "setFoo",
           "parameters": [
@@ -8827,7 +8831,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2683
+          "line": 2682
         },
         "parameters": [
           {
@@ -8847,7 +8851,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2682
+        "line": 2681
       },
       "name": "AmbiguousParameters",
       "properties": [
@@ -8858,7 +8862,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2685
+            "line": 2684
           },
           "name": "props",
           "type": {
@@ -8872,7 +8876,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2684
+            "line": 2683
           },
           "name": "scope",
           "type": {
@@ -8898,7 +8902,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2212
+        "line": 2211
       },
       "methods": [
         {
@@ -8907,7 +8911,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2216
+            "line": 2215
           },
           "name": "provideAsClass",
           "overrides": "jsii-calc.IAnonymousImplementationProvider",
@@ -8923,7 +8927,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2220
+            "line": 2219
           },
           "name": "provideAsInterface",
           "overrides": "jsii-calc.IAnonymousImplementationProvider",
@@ -8950,7 +8954,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 333
+        "line": 332
       },
       "methods": [
         {
@@ -8960,7 +8964,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 334
+            "line": 333
           },
           "name": "callMe",
           "returns": {
@@ -8977,7 +8981,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 353
+            "line": 352
           },
           "name": "callMe2",
           "returns": {
@@ -8995,7 +8999,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 363
+            "line": 362
           },
           "name": "callMeDoublePromise",
           "returns": {
@@ -9010,7 +9014,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 371
+            "line": 370
           },
           "name": "dontOverrideMe",
           "returns": {
@@ -9026,7 +9030,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 342
+            "line": 341
           },
           "name": "overrideMe",
           "parameters": [
@@ -9050,7 +9054,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 346
+            "line": 345
           },
           "name": "overrideMeToo",
           "returns": {
@@ -9076,7 +9080,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1539
+        "line": 1538
       },
       "methods": [
         {
@@ -9085,7 +9089,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1540
+            "line": 1539
           },
           "name": "methodOne"
         },
@@ -9095,7 +9099,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1546
+            "line": 1545
           },
           "name": "methodTwo"
         }
@@ -9116,7 +9120,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2477
+        "line": 2476
       },
       "name": "BaseJsii976"
     },
@@ -9137,7 +9141,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2421
+        "line": 2420
       },
       "methods": [
         {
@@ -9146,7 +9150,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2424
+            "line": 2423
           },
           "name": "ring",
           "overrides": "jsii-calc.IBell"
@@ -9160,7 +9164,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2422
+            "line": 2421
           },
           "name": "rung",
           "type": {
@@ -9185,7 +9189,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 49
+          "line": 53
         },
         "parameters": [
           {
@@ -9194,7 +9198,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
             },
             "name": "lhs",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           },
           {
@@ -9203,7 +9207,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
             },
             "name": "rhs",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           }
         ]
@@ -9214,7 +9218,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 43
+        "line": 47
       },
       "methods": [
         {
@@ -9224,7 +9228,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 53
+            "line": 60
           },
           "name": "hello",
           "overrides": "@scope/jsii-calc-lib.IFriendly",
@@ -9245,11 +9249,11 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 49
+            "line": 54
           },
           "name": "lhs",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         },
         {
@@ -9260,11 +9264,11 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 49
+            "line": 55
           },
           "name": "rhs",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         }
       ]
@@ -9285,7 +9289,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2767
+        "line": 2766
       },
       "methods": [
         {
@@ -9294,7 +9298,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2768
+            "line": 2767
           },
           "name": "check",
           "returns": {
@@ -9312,7 +9316,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2785
+            "line": 2784
           },
           "name": "giveItBack",
           "parameters": [
@@ -9352,7 +9356,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 287
+          "line": 297
         },
         "parameters": [
           {
@@ -9370,7 +9374,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 282
+        "line": 292
       },
       "methods": [
         {
@@ -9380,7 +9384,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 320
+            "line": 330
           },
           "name": "add",
           "parameters": [
@@ -9399,7 +9403,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 327
+            "line": 337
           },
           "name": "mul",
           "parameters": [
@@ -9418,7 +9422,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 341
+            "line": 351
           },
           "name": "neg"
         },
@@ -9429,7 +9433,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 334
+            "line": 344
           },
           "name": "pow",
           "parameters": [
@@ -9448,7 +9452,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 360
+            "line": 370
           },
           "name": "readUnionValue",
           "returns": {
@@ -9468,12 +9472,12 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 348
+            "line": 358
           },
           "name": "expression",
           "overrides": "jsii-calc.composition.CompositeOperation",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         },
         {
@@ -9484,13 +9488,13 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 310
+            "line": 320
           },
           "name": "operationsLog",
           "type": {
             "collection": {
               "elementtype": {
-                "fqn": "@scope/jsii-calc-lib.Value"
+                "fqn": "@scope/jsii-calc-lib.NumericValue"
               },
               "kind": "array"
             }
@@ -9504,7 +9508,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 305
+            "line": 315
           },
           "name": "operationsMap",
           "type": {
@@ -9512,7 +9516,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
               "elementtype": {
                 "collection": {
                   "elementtype": {
-                    "fqn": "@scope/jsii-calc-lib.Value"
+                    "fqn": "@scope/jsii-calc-lib.NumericValue"
                   },
                   "kind": "array"
                 }
@@ -9528,11 +9532,11 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 300
+            "line": 310
           },
           "name": "curr",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         },
         {
@@ -9542,7 +9546,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 315
+            "line": 325
           },
           "name": "maxValue",
           "optional": true,
@@ -9557,7 +9561,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 355
+            "line": 365
           },
           "name": "unionProperty",
           "optional": true,
@@ -9590,7 +9594,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 243
+        "line": 253
       },
       "name": "CalculatorProps",
       "properties": [
@@ -9605,7 +9609,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 251
+            "line": 261
           },
           "name": "initialValue",
           "optional": true,
@@ -9623,7 +9627,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 258
+            "line": 268
           },
           "name": "maximumValue",
           "optional": true,
@@ -9646,7 +9650,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2501
+        "line": 2500
       },
       "name": "ChildStruct982",
       "properties": [
@@ -9658,7 +9662,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2502
+            "line": 2501
           },
           "name": "bar",
           "type": {
@@ -9684,7 +9688,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1802
+        "line": 1801
       },
       "name": "ClassThatImplementsTheInternalInterface",
       "properties": [
@@ -9694,7 +9698,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1806
+            "line": 1805
           },
           "name": "a",
           "overrides": "jsii-calc.IAnotherPublicInterface",
@@ -9708,7 +9712,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1807
+            "line": 1806
           },
           "name": "b",
           "overrides": "jsii-calc.INonInternalInterface",
@@ -9722,7 +9726,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1808
+            "line": 1807
           },
           "name": "c",
           "overrides": "jsii-calc.INonInternalInterface",
@@ -9736,7 +9740,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1809
+            "line": 1808
           },
           "name": "d",
           "type": {
@@ -9762,7 +9766,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1812
+        "line": 1811
       },
       "name": "ClassThatImplementsThePrivateInterface",
       "properties": [
@@ -9772,7 +9776,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1814
+            "line": 1813
           },
           "name": "a",
           "overrides": "jsii-calc.IAnotherPublicInterface",
@@ -9786,7 +9790,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1815
+            "line": 1814
           },
           "name": "b",
           "overrides": "jsii-calc.INonInternalInterface",
@@ -9800,7 +9804,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1816
+            "line": 1815
           },
           "name": "c",
           "overrides": "jsii-calc.INonInternalInterface",
@@ -9814,7 +9818,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1817
+            "line": 1816
           },
           "name": "e",
           "type": {
@@ -9835,7 +9839,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2118
+          "line": 2117
         },
         "parameters": [
           {
@@ -9865,7 +9869,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2108
+        "line": 2107
       },
       "methods": [
         {
@@ -9874,7 +9878,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2123
+            "line": 2122
           },
           "name": "createAList",
           "returns": {
@@ -9895,7 +9899,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2127
+            "line": 2126
           },
           "name": "createAMap",
           "returns": {
@@ -9919,7 +9923,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2116
+            "line": 2115
           },
           "name": "staticArray",
           "static": true,
@@ -9938,7 +9942,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2112
+            "line": 2111
           },
           "name": "staticMap",
           "static": true,
@@ -9957,7 +9961,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2110
+            "line": 2109
           },
           "name": "array",
           "type": {
@@ -9975,7 +9979,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2109
+            "line": 2108
           },
           "name": "map",
           "type": {
@@ -10010,7 +10014,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1885
+        "line": 1884
       },
       "name": "ClassWithDocs"
     },
@@ -10026,7 +10030,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2058
+          "line": 2057
         },
         "parameters": [
           {
@@ -10040,7 +10044,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2055
+        "line": 2054
       },
       "methods": [
         {
@@ -10049,7 +10053,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2062
+            "line": 2061
           },
           "name": "import",
           "parameters": [
@@ -10076,7 +10080,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2056
+            "line": 2055
           },
           "name": "int",
           "type": {
@@ -10099,7 +10103,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1293
+        "line": 1292
       },
       "name": "ClassWithMutableObjectLiteralProperty",
       "properties": [
@@ -10109,7 +10113,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1294
+            "line": 1293
           },
           "name": "mutableObject",
           "type": {
@@ -10131,7 +10135,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1320
+        "line": 1319
       },
       "methods": [
         {
@@ -10140,7 +10144,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1322
+            "line": 1321
           },
           "name": "create",
           "parameters": [
@@ -10174,7 +10178,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1330
+            "line": 1329
           },
           "name": "readOnlyString",
           "overrides": "jsii-calc.IInterfaceWithProperties",
@@ -10188,7 +10192,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1331
+            "line": 1330
           },
           "name": "readWriteString",
           "overrides": "jsii-calc.IInterfaceWithProperties",
@@ -10209,7 +10213,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2640
+        "line": 2639
       },
       "methods": [
         {
@@ -10218,7 +10222,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2641
+            "line": 2640
           },
           "name": "makeInstance",
           "returns": {
@@ -10234,7 +10238,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2645
+            "line": 2644
           },
           "name": "makeStructInstance",
           "returns": {
@@ -10253,7 +10257,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2649
+            "line": 2648
           },
           "name": "unionProperty",
           "optional": true,
@@ -10296,7 +10300,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2653
+        "line": 2652
       },
       "name": "ConfusingToJacksonStruct",
       "properties": [
@@ -10308,7 +10312,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2654
+            "line": 2653
           },
           "name": "unionProperty",
           "optional": true,
@@ -10353,7 +10357,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1842
+          "line": 1841
         },
         "parameters": [
           {
@@ -10367,7 +10371,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1841
+        "line": 1840
       },
       "name": "ConstructorPassesThisOut"
     },
@@ -10385,7 +10389,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1587
+        "line": 1586
       },
       "methods": [
         {
@@ -10394,7 +10398,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1604
+            "line": 1603
           },
           "name": "hiddenInterface",
           "returns": {
@@ -10410,7 +10414,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1608
+            "line": 1607
           },
           "name": "hiddenInterfaces",
           "returns": {
@@ -10431,7 +10435,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1612
+            "line": 1611
           },
           "name": "hiddenSubInterfaces",
           "returns": {
@@ -10452,7 +10456,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1588
+            "line": 1587
           },
           "name": "makeClass",
           "returns": {
@@ -10468,7 +10472,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1592
+            "line": 1591
           },
           "name": "makeInterface",
           "returns": {
@@ -10484,7 +10488,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1596
+            "line": 1595
           },
           "name": "makeInterface2",
           "returns": {
@@ -10500,7 +10504,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1600
+            "line": 1599
           },
           "name": "makeInterfaces",
           "returns": {
@@ -10530,7 +10534,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2664
+          "line": 2663
         },
         "parameters": [
           {
@@ -10544,7 +10548,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2663
+        "line": 2662
       },
       "methods": [
         {
@@ -10553,7 +10557,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2666
+            "line": 2665
           },
           "name": "workItBaby",
           "returns": {
@@ -10581,7 +10585,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2306
+        "line": 2305
       },
       "methods": [
         {
@@ -10592,7 +10596,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2312
+            "line": 2311
           },
           "name": "staticImplementedByObjectLiteral",
           "parameters": [
@@ -10618,7 +10622,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2338
+            "line": 2337
           },
           "name": "staticImplementedByPrivateClass",
           "parameters": [
@@ -10644,7 +10648,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2327
+            "line": 2326
           },
           "name": "staticImplementedByPublicClass",
           "parameters": [
@@ -10670,7 +10674,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2349
+            "line": 2348
           },
           "name": "staticWhenTypedAsClass",
           "parameters": [
@@ -10696,7 +10700,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2359
+            "line": 2358
           },
           "name": "implementedByObjectLiteral",
           "parameters": [
@@ -10721,7 +10725,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2385
+            "line": 2384
           },
           "name": "implementedByPrivateClass",
           "parameters": [
@@ -10746,7 +10750,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2374
+            "line": 2373
           },
           "name": "implementedByPublicClass",
           "parameters": [
@@ -10771,7 +10775,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2396
+            "line": 2395
           },
           "name": "whenTypedAsClass",
           "parameters": [
@@ -10805,7 +10809,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1820
+        "line": 1819
       },
       "methods": [
         {
@@ -10814,7 +10818,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1821
+            "line": 1820
           },
           "name": "consumeAnotherPublicInterface",
           "parameters": [
@@ -10837,7 +10841,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1825
+            "line": 1824
           },
           "name": "consumeNonInternalInterface",
           "parameters": [
@@ -10872,7 +10876,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1981
+        "line": 1980
       },
       "methods": [
         {
@@ -10881,7 +10885,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1982
+            "line": 1981
           },
           "name": "render",
           "parameters": [
@@ -10905,7 +10909,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1988
+            "line": 1987
           },
           "name": "renderArbitrary",
           "parameters": [
@@ -10933,7 +10937,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1992
+            "line": 1991
           },
           "name": "renderMap",
           "parameters": [
@@ -10970,7 +10974,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 318
+          "line": 317
         },
         "parameters": [
           {
@@ -10999,7 +11003,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 317
+        "line": 316
       },
       "name": "DefaultedConstructorArgument",
       "properties": [
@@ -11010,7 +11014,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 319
+            "line": 318
           },
           "name": "arg1",
           "type": {
@@ -11024,7 +11028,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 321
+            "line": 320
           },
           "name": "arg3",
           "type": {
@@ -11038,7 +11042,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 320
+            "line": 319
           },
           "name": "arg2",
           "optional": true,
@@ -11064,7 +11068,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2508
+        "line": 2507
       },
       "methods": [
         {
@@ -11074,7 +11078,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2515
+            "line": 2514
           },
           "name": "takeThis",
           "returns": {
@@ -11091,7 +11095,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2520
+            "line": 2519
           },
           "name": "takeThisToo",
           "returns": {
@@ -11265,7 +11269,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 326
+        "line": 325
       },
       "name": "Base",
       "namespace": "DerivedClassHasNoProperties",
@@ -11276,7 +11280,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 327
+            "line": 326
           },
           "name": "prop",
           "type": {
@@ -11300,7 +11304,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 330
+        "line": 329
       },
       "name": "Derived",
       "namespace": "DerivedClassHasNoProperties"
@@ -11319,7 +11323,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 541
+        "line": 540
       },
       "name": "DerivedStruct",
       "properties": [
@@ -11331,7 +11335,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 547
+            "line": 546
           },
           "name": "anotherRequired",
           "type": {
@@ -11346,7 +11350,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 546
+            "line": 545
           },
           "name": "bool",
           "type": {
@@ -11362,7 +11366,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 545
+            "line": 544
           },
           "name": "nonPrimitive",
           "type": {
@@ -11378,14 +11382,14 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 553
+            "line": 552
           },
           "name": "anotherOptional",
           "optional": true,
           "type": {
             "collection": {
               "elementtype": {
-                "fqn": "@scope/jsii-calc-lib.Value"
+                "fqn": "@scope/jsii-calc-lib.NumericValue"
               },
               "kind": "map"
             }
@@ -11399,7 +11403,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 549
+            "line": 548
           },
           "name": "optionalAny",
           "optional": true,
@@ -11415,7 +11419,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 548
+            "line": 547
           },
           "name": "optionalArray",
           "optional": true,
@@ -11440,7 +11444,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2026
+        "line": 2025
       },
       "name": "DiamondInheritanceBaseLevelStruct",
       "properties": [
@@ -11452,7 +11456,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2027
+            "line": 2026
           },
           "name": "baseLevelProperty",
           "type": {
@@ -11474,7 +11478,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2030
+        "line": 2029
       },
       "name": "DiamondInheritanceFirstMidLevelStruct",
       "properties": [
@@ -11486,7 +11490,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2032
+            "line": 2031
           },
           "name": "firstMidLevelProperty",
           "type": {
@@ -11508,7 +11512,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2035
+        "line": 2034
       },
       "name": "DiamondInheritanceSecondMidLevelStruct",
       "properties": [
@@ -11520,7 +11524,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2037
+            "line": 2036
           },
           "name": "secondMidLevelProperty",
           "type": {
@@ -11543,7 +11547,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2040
+        "line": 2039
       },
       "name": "DiamondInheritanceTopLevelStruct",
       "properties": [
@@ -11555,7 +11559,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2043
+            "line": 2042
           },
           "name": "topLevelProperty",
           "type": {
@@ -11575,7 +11579,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2530
+        "line": 2529
       },
       "name": "DisappointingCollectionSource",
       "properties": [
@@ -11589,7 +11593,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2532
+            "line": 2531
           },
           "name": "maybeList",
           "optional": true,
@@ -11613,7 +11617,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2534
+            "line": 2533
           },
           "name": "maybeMap",
           "optional": true,
@@ -11643,7 +11647,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1297
+        "line": 1296
       },
       "methods": [
         {
@@ -11652,7 +11656,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1312
+            "line": 1311
           },
           "name": "changePrivatePropertyValue",
           "parameters": [
@@ -11670,7 +11674,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1304
+            "line": 1303
           },
           "name": "privateMethodValue",
           "returns": {
@@ -11685,7 +11689,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1308
+            "line": 1307
           },
           "name": "privatePropertyValue",
           "returns": {
@@ -11712,7 +11716,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1353
+        "line": 1352
       },
       "methods": [
         {
@@ -11721,7 +11725,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1354
+            "line": 1353
           },
           "name": "method",
           "parameters": [
@@ -11827,7 +11831,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1430
+        "line": 1429
       },
       "methods": [
         {
@@ -11836,7 +11840,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1431
+            "line": 1430
           },
           "name": "optionalAndVariadic",
           "parameters": [
@@ -11882,7 +11886,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 485
+        "line": 484
       },
       "methods": [
         {
@@ -11892,7 +11896,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 490
+            "line": 489
           },
           "name": "hello",
           "overrides": "@scope/jsii-calc-lib.IFriendly",
@@ -11909,7 +11913,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 486
+            "line": 485
           },
           "name": "next",
           "overrides": "jsii-calc.IRandomNumberGenerator",
@@ -11935,7 +11939,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2794
+          "line": 2793
         },
         "parameters": [
           {
@@ -11949,7 +11953,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2793
+        "line": 2792
       },
       "name": "DynamicPropertyBearer",
       "properties": [
@@ -11959,7 +11963,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2796
+            "line": 2795
           },
           "name": "dynamicProperty",
           "type": {
@@ -11972,7 +11976,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2794
+            "line": 2793
           },
           "name": "valueStore",
           "type": {
@@ -11994,7 +11998,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2805
+          "line": 2804
         },
         "parameters": [
           {
@@ -12008,7 +12012,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2804
+        "line": 2803
       },
       "methods": [
         {
@@ -12019,7 +12023,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2816
+            "line": 2815
           },
           "name": "overrideValue",
           "parameters": [
@@ -12049,7 +12053,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2805
+            "line": 2804
           },
           "name": "originalValue",
           "type": {
@@ -12067,7 +12071,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 45
+        "line": 44
       },
       "methods": [
         {
@@ -12076,7 +12080,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 51
+            "line": 50
           },
           "name": "randomIntegerLikeEnum",
           "returns": {
@@ -12092,7 +12096,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 46
+            "line": 45
           },
           "name": "randomStringLikeEnum",
           "returns": {
@@ -12119,7 +12123,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1643
+        "line": 1642
       },
       "methods": [
         {
@@ -12130,7 +12134,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1648
+            "line": 1647
           },
           "name": "doesKeyExist",
           "parameters": [
@@ -12161,7 +12165,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1668
+            "line": 1667
           },
           "name": "prop1IsNull",
           "returns": {
@@ -12183,7 +12187,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1658
+            "line": 1657
           },
           "name": "prop2IsUndefined",
           "returns": {
@@ -12211,7 +12215,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1638
+        "line": 1637
       },
       "name": "EraseUndefinedHashValuesOptions",
       "properties": [
@@ -12223,7 +12227,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1639
+            "line": 1638
           },
           "name": "option1",
           "optional": true,
@@ -12239,7 +12243,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1640
+            "line": 1639
           },
           "name": "option2",
           "optional": true,
@@ -12398,7 +12402,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1516
+          "line": 1515
         },
         "parameters": [
           {
@@ -12412,7 +12416,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1515
+        "line": 1514
       },
       "name": "ExportedBaseClass",
       "properties": [
@@ -12423,7 +12427,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1516
+            "line": 1515
           },
           "name": "success",
           "type": {
@@ -12442,7 +12446,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1757
+        "line": 1756
       },
       "name": "ExtendsInternalInterface",
       "properties": [
@@ -12454,7 +12458,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1758
+            "line": 1757
           },
           "name": "boom",
           "type": {
@@ -12469,7 +12473,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1698
+            "line": 1697
           },
           "name": "prop",
           "type": {
@@ -12659,7 +12663,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 556
+        "line": 555
       },
       "methods": [
         {
@@ -12669,7 +12673,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 574
+            "line": 573
           },
           "name": "derivedToFirst",
           "parameters": [
@@ -12693,7 +12697,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 567
+            "line": 566
           },
           "name": "readDerivedNonPrimitive",
           "parameters": [
@@ -12717,7 +12721,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 560
+            "line": 559
           },
           "name": "readFirstNumber",
           "parameters": [
@@ -12744,7 +12748,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 578
+            "line": 577
           },
           "name": "structLiteral",
           "type": {
@@ -12802,7 +12806,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 532
+        "line": 531
       },
       "methods": [
         {
@@ -12811,7 +12815,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 533
+            "line": 532
           },
           "name": "betterGreeting",
           "parameters": [
@@ -12841,7 +12845,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2208
+        "line": 2207
       },
       "methods": [
         {
@@ -12851,7 +12855,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2210
+            "line": 2209
           },
           "name": "provideAsClass",
           "returns": {
@@ -12867,7 +12871,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2209
+            "line": 2208
           },
           "name": "provideAsInterface",
           "returns": {
@@ -12888,7 +12892,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2227
+        "line": 2226
       },
       "methods": [
         {
@@ -12898,7 +12902,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2229
+            "line": 2228
           },
           "name": "verb",
           "returns": {
@@ -12918,7 +12922,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2228
+            "line": 2227
           },
           "name": "value",
           "type": {
@@ -12936,7 +12940,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1778
+        "line": 1777
       },
       "name": "IAnotherPublicInterface",
       "properties": [
@@ -12947,7 +12951,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1779
+            "line": 1778
           },
           "name": "a",
           "type": {
@@ -12965,7 +12969,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2417
+        "line": 2416
       },
       "methods": [
         {
@@ -12975,7 +12979,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2418
+            "line": 2417
           },
           "name": "ring"
         }
@@ -12992,7 +12996,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2406
+        "line": 2405
       },
       "methods": [
         {
@@ -13002,7 +13006,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2407
+            "line": 2406
           },
           "name": "yourTurn",
           "parameters": [
@@ -13027,7 +13031,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2413
+        "line": 2412
       },
       "methods": [
         {
@@ -13037,7 +13041,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2414
+            "line": 2413
           },
           "name": "yourTurn",
           "parameters": [
@@ -13150,7 +13154,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1769
+        "line": 1768
       },
       "name": "IExtendsPrivateInterface",
       "properties": [
@@ -13162,7 +13166,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1770
+            "line": 1769
           },
           "name": "moreThings",
           "type": {
@@ -13181,7 +13185,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1754
+            "line": 1753
           },
           "name": "private",
           "type": {
@@ -13255,7 +13259,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 12
+        "line": 16
       },
       "methods": [
         {
@@ -13266,7 +13270,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 22
+            "line": 26
           },
           "name": "farewell",
           "returns": {
@@ -13284,7 +13288,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 17
+            "line": 21
           },
           "name": "goodbye",
           "returns": {
@@ -13309,7 +13313,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 36
+        "line": 40
       },
       "name": "IFriendlyRandomGenerator"
     },
@@ -13323,7 +13327,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1242
+        "line": 1241
       },
       "name": "IInterfaceImplementedByAbstractClass",
       "properties": [
@@ -13335,7 +13339,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1243
+            "line": 1242
           },
           "name": "propFromInterface",
           "type": {
@@ -13357,7 +13361,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1345
+        "line": 1344
       },
       "name": "IInterfaceThatShouldNotBeADataType",
       "properties": [
@@ -13369,7 +13373,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1347
+            "line": 1346
           },
           "name": "otherValue",
           "type": {
@@ -13387,7 +13391,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1709
+        "line": 1708
       },
       "methods": [
         {
@@ -13397,7 +13401,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1710
+            "line": 1709
           },
           "name": "visible"
         }
@@ -13413,7 +13417,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1335
+        "line": 1334
       },
       "methods": [
         {
@@ -13423,7 +13427,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1338
+            "line": 1337
           },
           "name": "doThings"
         }
@@ -13438,7 +13442,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1336
+            "line": 1335
           },
           "name": "value",
           "type": {
@@ -13457,7 +13461,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1220
+        "line": 1219
       },
       "methods": [
         {
@@ -13467,7 +13471,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1221
+            "line": 1220
           },
           "name": "hello",
           "parameters": [
@@ -13498,7 +13502,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 586
+        "line": 585
       },
       "name": "IInterfaceWithProperties",
       "properties": [
@@ -13510,7 +13514,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 587
+            "line": 586
           },
           "name": "readOnlyString",
           "type": {
@@ -13524,7 +13528,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 588
+            "line": 587
           },
           "name": "readWriteString",
           "type": {
@@ -13545,7 +13549,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 591
+        "line": 590
       },
       "name": "IInterfaceWithPropertiesExtension",
       "properties": [
@@ -13556,7 +13560,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 593
+            "line": 592
           },
           "name": "foo",
           "type": {
@@ -13713,7 +13717,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1289
+        "line": 1288
       },
       "name": "IMutableObjectLiteral",
       "properties": [
@@ -13724,7 +13728,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1290
+            "line": 1289
           },
           "name": "value",
           "type": {
@@ -13745,7 +13749,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1787
+        "line": 1786
       },
       "name": "INonInternalInterface",
       "properties": [
@@ -13756,7 +13760,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1784
+            "line": 1783
           },
           "name": "b",
           "type": {
@@ -13770,7 +13774,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1788
+            "line": 1787
           },
           "name": "c",
           "type": {
@@ -13789,7 +13793,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2542
+        "line": 2541
       },
       "methods": [
         {
@@ -13799,7 +13803,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2544
+            "line": 2543
           },
           "name": "wasSet",
           "returns": {
@@ -13818,7 +13822,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2543
+            "line": 2542
           },
           "name": "property",
           "type": {
@@ -13837,7 +13841,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2731
+        "line": 2730
       },
       "methods": [
         {
@@ -13847,7 +13851,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2732
+            "line": 2731
           },
           "name": "optional",
           "returns": {
@@ -13869,7 +13873,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1512
+        "line": 1511
       },
       "name": "IPrivatelyImplemented",
       "properties": [
@@ -13881,7 +13885,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1513
+            "line": 1512
           },
           "name": "success",
           "type": {
@@ -13899,7 +13903,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1558
+        "line": 1557
       },
       "methods": [
         {
@@ -13909,7 +13913,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1559
+            "line": 1558
           },
           "name": "bye",
           "returns": {
@@ -13930,7 +13934,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1562
+        "line": 1561
       },
       "methods": [
         {
@@ -13940,7 +13944,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1563
+            "line": 1562
           },
           "name": "ciao",
           "returns": {
@@ -13962,7 +13966,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 28
+        "line": 32
       },
       "methods": [
         {
@@ -13974,7 +13978,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 33
+            "line": 37
           },
           "name": "next",
           "returns": {
@@ -13996,7 +14000,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2473
+        "line": 2472
       },
       "name": "IReturnJsii976",
       "properties": [
@@ -14008,7 +14012,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2474
+            "line": 2473
           },
           "name": "foo",
           "type": {
@@ -14026,7 +14030,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 639
+        "line": 638
       },
       "methods": [
         {
@@ -14036,7 +14040,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 640
+            "line": 639
           },
           "name": "obtainNumber",
           "returns": {
@@ -14056,7 +14060,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 642
+            "line": 641
           },
           "name": "numberProp",
           "type": {
@@ -14118,7 +14122,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2660
+        "line": 2659
       },
       "methods": [
         {
@@ -14128,7 +14132,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2661
+            "line": 2660
           },
           "name": "returnStruct",
           "returns": {
@@ -14154,7 +14158,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1761
+        "line": 1760
       },
       "name": "ImplementInternalInterface",
       "properties": [
@@ -14164,7 +14168,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1762
+            "line": 1761
           },
           "name": "prop",
           "type": {
@@ -14187,7 +14191,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2224
+        "line": 2223
       },
       "name": "Implementation",
       "properties": [
@@ -14198,7 +14202,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2225
+            "line": 2224
           },
           "name": "value",
           "type": {
@@ -14224,7 +14228,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1716
+        "line": 1715
       },
       "methods": [
         {
@@ -14233,7 +14237,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1717
+            "line": 1716
           },
           "name": "visible",
           "overrides": "jsii-calc.IInterfaceWithInternal"
@@ -14256,7 +14260,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1735
+        "line": 1734
       },
       "name": "ImplementsInterfaceWithInternalSubclass"
     },
@@ -14274,7 +14278,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1765
+        "line": 1764
       },
       "name": "ImplementsPrivateInterface",
       "properties": [
@@ -14284,7 +14288,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1766
+            "line": 1765
           },
           "name": "private",
           "type": {
@@ -14306,7 +14310,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1176
+        "line": 1175
       },
       "name": "ImplictBaseOfBase",
       "properties": [
@@ -14318,7 +14322,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1177
+            "line": 1176
           },
           "name": "goo",
           "type": {
@@ -14345,7 +14349,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1565
+        "line": 1564
       },
       "methods": [
         {
@@ -14354,7 +14358,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1566
+            "line": 1565
           },
           "name": "ciao",
           "overrides": "jsii-calc.IPublicInterface2",
@@ -14378,7 +14382,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2694
+        "line": 2693
       },
       "methods": [
         {
@@ -14387,7 +14391,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2705
+            "line": 2704
           },
           "name": "listOfInterfaces",
           "returns": {
@@ -14408,7 +14412,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2695
+            "line": 2694
           },
           "name": "listOfStructs",
           "returns": {
@@ -14429,7 +14433,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2715
+            "line": 2714
           },
           "name": "mapOfInterfaces",
           "returns": {
@@ -14450,7 +14454,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2699
+            "line": 2698
           },
           "name": "mapOfStructs",
           "returns": {
@@ -14482,7 +14486,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1207
+        "line": 1206
       },
       "name": "Foo",
       "namespace": "InterfaceInNamespaceIncludesClasses",
@@ -14493,7 +14497,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1208
+            "line": 1207
           },
           "name": "bar",
           "optional": true,
@@ -14513,7 +14517,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1211
+        "line": 1210
       },
       "name": "Hello",
       "namespace": "InterfaceInNamespaceIncludesClasses",
@@ -14526,7 +14530,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1212
+            "line": 1211
           },
           "name": "foo",
           "type": {
@@ -14545,7 +14549,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1201
+        "line": 1200
       },
       "name": "Hello",
       "namespace": "InterfaceInNamespaceOnlyInterface",
@@ -14558,7 +14562,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1202
+            "line": 1201
           },
           "name": "foo",
           "type": {
@@ -14577,7 +14581,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2096
+        "line": 2095
       },
       "methods": [
         {
@@ -14586,7 +14590,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2097
+            "line": 2096
           },
           "name": "makeInterfaces",
           "parameters": [
@@ -14629,7 +14633,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2741
+        "line": 2740
       },
       "methods": [
         {
@@ -14638,7 +14642,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2742
+            "line": 2741
           },
           "name": "myself",
           "returns": {
@@ -14796,7 +14800,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 517
+        "line": 516
       },
       "methods": [
         {
@@ -14805,7 +14809,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 518
+            "line": 517
           },
           "name": "giveMeFriendly",
           "returns": {
@@ -14820,7 +14824,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 524
+            "line": 523
           },
           "name": "giveMeFriendlyGenerator",
           "returns": {
@@ -14846,7 +14850,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 247
+        "line": 246
       },
       "methods": [
         {
@@ -14855,7 +14859,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 248
+            "line": 247
           },
           "name": "returnLiteral",
           "returns": {
@@ -14881,7 +14885,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 256
+        "line": 255
       },
       "name": "JSObjectLiteralToNativeClass",
       "properties": [
@@ -14891,7 +14895,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 257
+            "line": 256
           },
           "name": "propA",
           "type": {
@@ -14904,7 +14908,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 258
+            "line": 257
           },
           "name": "propB",
           "type": {
@@ -14927,7 +14931,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 745
+        "line": 744
       },
       "methods": [
         {
@@ -14936,7 +14940,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 746
+            "line": 745
           },
           "name": "abstract"
         },
@@ -14946,7 +14950,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 750
+            "line": 749
           },
           "name": "assert"
         },
@@ -14956,7 +14960,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 754
+            "line": 753
           },
           "name": "boolean"
         },
@@ -14966,7 +14970,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 758
+            "line": 757
           },
           "name": "break"
         },
@@ -14976,7 +14980,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 762
+            "line": 761
           },
           "name": "byte"
         },
@@ -14986,7 +14990,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 766
+            "line": 765
           },
           "name": "case"
         },
@@ -14996,7 +15000,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 770
+            "line": 769
           },
           "name": "catch"
         },
@@ -15006,7 +15010,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 774
+            "line": 773
           },
           "name": "char"
         },
@@ -15016,7 +15020,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 778
+            "line": 777
           },
           "name": "class"
         },
@@ -15026,7 +15030,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 782
+            "line": 781
           },
           "name": "const"
         },
@@ -15036,7 +15040,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 786
+            "line": 785
           },
           "name": "continue"
         },
@@ -15046,7 +15050,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 790
+            "line": 789
           },
           "name": "default"
         },
@@ -15056,7 +15060,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 798
+            "line": 797
           },
           "name": "do"
         },
@@ -15066,7 +15070,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 794
+            "line": 793
           },
           "name": "double"
         },
@@ -15076,7 +15080,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 802
+            "line": 801
           },
           "name": "else"
         },
@@ -15086,7 +15090,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 806
+            "line": 805
           },
           "name": "enum"
         },
@@ -15096,7 +15100,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 810
+            "line": 809
           },
           "name": "extends"
         },
@@ -15106,7 +15110,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 814
+            "line": 813
           },
           "name": "false"
         },
@@ -15116,7 +15120,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 818
+            "line": 817
           },
           "name": "final"
         },
@@ -15126,7 +15130,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 822
+            "line": 821
           },
           "name": "finally"
         },
@@ -15136,7 +15140,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 826
+            "line": 825
           },
           "name": "float"
         },
@@ -15146,7 +15150,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 830
+            "line": 829
           },
           "name": "for"
         },
@@ -15156,7 +15160,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 834
+            "line": 833
           },
           "name": "goto"
         },
@@ -15166,7 +15170,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 838
+            "line": 837
           },
           "name": "if"
         },
@@ -15176,7 +15180,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 842
+            "line": 841
           },
           "name": "implements"
         },
@@ -15186,7 +15190,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 846
+            "line": 845
           },
           "name": "import"
         },
@@ -15196,7 +15200,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 850
+            "line": 849
           },
           "name": "instanceof"
         },
@@ -15206,7 +15210,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 854
+            "line": 853
           },
           "name": "int"
         },
@@ -15216,7 +15220,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 858
+            "line": 857
           },
           "name": "interface"
         },
@@ -15226,7 +15230,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 862
+            "line": 861
           },
           "name": "long"
         },
@@ -15236,7 +15240,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 866
+            "line": 865
           },
           "name": "native"
         },
@@ -15246,7 +15250,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 870
+            "line": 869
           },
           "name": "new"
         },
@@ -15256,7 +15260,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 874
+            "line": 873
           },
           "name": "null"
         },
@@ -15266,7 +15270,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 878
+            "line": 877
           },
           "name": "package"
         },
@@ -15276,7 +15280,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 882
+            "line": 881
           },
           "name": "private"
         },
@@ -15286,7 +15290,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 886
+            "line": 885
           },
           "name": "protected"
         },
@@ -15296,7 +15300,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 890
+            "line": 889
           },
           "name": "public"
         },
@@ -15306,7 +15310,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 894
+            "line": 893
           },
           "name": "return"
         },
@@ -15316,7 +15320,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 898
+            "line": 897
           },
           "name": "short"
         },
@@ -15326,7 +15330,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 902
+            "line": 901
           },
           "name": "static"
         },
@@ -15336,7 +15340,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 906
+            "line": 905
           },
           "name": "strictfp"
         },
@@ -15346,7 +15350,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 910
+            "line": 909
           },
           "name": "super"
         },
@@ -15356,7 +15360,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 914
+            "line": 913
           },
           "name": "switch"
         },
@@ -15366,7 +15370,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 918
+            "line": 917
           },
           "name": "synchronized"
         },
@@ -15376,7 +15380,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 922
+            "line": 921
           },
           "name": "this"
         },
@@ -15386,7 +15390,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 926
+            "line": 925
           },
           "name": "throw"
         },
@@ -15396,7 +15400,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 930
+            "line": 929
           },
           "name": "throws"
         },
@@ -15406,7 +15410,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 934
+            "line": 933
           },
           "name": "transient"
         },
@@ -15416,7 +15420,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 938
+            "line": 937
           },
           "name": "true"
         },
@@ -15426,7 +15430,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 942
+            "line": 941
           },
           "name": "try"
         },
@@ -15436,7 +15440,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 946
+            "line": 945
           },
           "name": "void"
         },
@@ -15446,7 +15450,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 950
+            "line": 949
           },
           "name": "volatile"
         }
@@ -15459,7 +15463,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 954
+            "line": 953
           },
           "name": "while",
           "type": {
@@ -15526,7 +15530,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1528
+        "line": 1527
       },
       "name": "JsiiAgent",
       "properties": [
@@ -15538,9 +15542,9 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1532
+            "line": 1531
           },
-          "name": "jsiiAgent",
+          "name": "value",
           "optional": true,
           "static": true,
           "type": {
@@ -15560,7 +15564,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2575
+        "line": 2574
       },
       "methods": [
         {
@@ -15569,7 +15573,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2620
+            "line": 2619
           },
           "name": "anyArray",
           "returns": {
@@ -15585,7 +15589,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2616
+            "line": 2615
           },
           "name": "anyBooleanFalse",
           "returns": {
@@ -15601,7 +15605,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2612
+            "line": 2611
           },
           "name": "anyBooleanTrue",
           "returns": {
@@ -15617,7 +15621,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2592
+            "line": 2591
           },
           "name": "anyDate",
           "returns": {
@@ -15633,7 +15637,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2608
+            "line": 2607
           },
           "name": "anyEmptyString",
           "returns": {
@@ -15649,7 +15653,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2588
+            "line": 2587
           },
           "name": "anyFunction",
           "returns": {
@@ -15665,7 +15669,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2624
+            "line": 2623
           },
           "name": "anyHash",
           "returns": {
@@ -15681,7 +15685,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2580
+            "line": 2579
           },
           "name": "anyNull",
           "returns": {
@@ -15697,7 +15701,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2596
+            "line": 2595
           },
           "name": "anyNumber",
           "returns": {
@@ -15713,7 +15717,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2628
+            "line": 2627
           },
           "name": "anyRef",
           "returns": {
@@ -15729,7 +15733,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2604
+            "line": 2603
           },
           "name": "anyString",
           "returns": {
@@ -15745,7 +15749,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2584
+            "line": 2583
           },
           "name": "anyUndefined",
           "returns": {
@@ -15761,7 +15765,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2600
+            "line": 2599
           },
           "name": "anyZero",
           "returns": {
@@ -15777,7 +15781,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2576
+            "line": 2575
           },
           "name": "stringify",
           "parameters": [
@@ -15811,7 +15815,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1439
+        "line": 1438
       },
       "name": "LoadBalancedFargateServiceProps",
       "properties": [
@@ -15826,7 +15830,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1482
+            "line": 1481
           },
           "name": "containerPort",
           "optional": true,
@@ -15845,7 +15849,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1453
+            "line": 1452
           },
           "name": "cpu",
           "optional": true,
@@ -15864,7 +15868,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1475
+            "line": 1474
           },
           "name": "memoryMiB",
           "optional": true,
@@ -15882,7 +15886,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1489
+            "line": 1488
           },
           "name": "publicLoadBalancer",
           "optional": true,
@@ -15900,7 +15904,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1496
+            "line": 1495
           },
           "name": "publicTasks",
           "optional": true,
@@ -15924,7 +15928,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 396
+        "line": 406
       },
       "methods": [
         {
@@ -15933,7 +15937,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 397
+            "line": 407
           },
           "name": "property",
           "returns": {
@@ -15952,7 +15956,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 401
+            "line": 411
           },
           "name": "elite",
           "type": {
@@ -15976,7 +15980,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 49
+          "line": 53
         },
         "parameters": [
           {
@@ -15985,7 +15989,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
             },
             "name": "lhs",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           },
           {
@@ -15994,7 +15998,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
             },
             "name": "rhs",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           }
         ]
@@ -16006,7 +16010,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 74
+        "line": 81
       },
       "methods": [
         {
@@ -16016,7 +16020,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 88
+            "line": 95
           },
           "name": "farewell",
           "overrides": "jsii-calc.IFriendlier",
@@ -16033,7 +16037,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 84
+            "line": 91
           },
           "name": "goodbye",
           "overrides": "jsii-calc.IFriendlier",
@@ -16050,7 +16054,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 92
+            "line": 99
           },
           "name": "next",
           "overrides": "jsii-calc.IRandomNumberGenerator",
@@ -16067,7 +16071,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 80
+            "line": 87
           },
           "name": "toString",
           "overrides": "@scope/jsii-calc-lib.Operation",
@@ -16088,10 +16092,10 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 76
+            "line": 83
           },
           "name": "value",
-          "overrides": "@scope/jsii-calc-lib.Value",
+          "overrides": "@scope/jsii-calc-lib.NumericValue",
           "type": {
             "primitive": "number"
           }
@@ -16112,13 +16116,13 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 101
+          "line": 108
         },
         "parameters": [
           {
             "name": "operand",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           }
         ]
@@ -16129,7 +16133,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 109
+        "line": 116
       },
       "methods": [
         {
@@ -16139,7 +16143,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 126
+            "line": 133
           },
           "name": "farewell",
           "overrides": "jsii-calc.IFriendlier",
@@ -16156,7 +16160,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 122
+            "line": 129
           },
           "name": "goodbye",
           "overrides": "jsii-calc.IFriendlier",
@@ -16173,7 +16177,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 118
+            "line": 125
           },
           "name": "hello",
           "overrides": "@scope/jsii-calc-lib.IFriendly",
@@ -16190,7 +16194,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 114
+            "line": 121
           },
           "name": "toString",
           "overrides": "@scope/jsii-calc-lib.Operation",
@@ -16211,10 +16215,10 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 110
+            "line": 117
           },
           "name": "value",
-          "overrides": "@scope/jsii-calc-lib.Value",
+          "overrides": "@scope/jsii-calc-lib.NumericValue",
           "type": {
             "primitive": "number"
           }
@@ -16262,7 +16266,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2449
+        "line": 2448
       },
       "name": "NestedStruct",
       "properties": [
@@ -16275,7 +16279,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2453
+            "line": 2452
           },
           "name": "numberProp",
           "type": {
@@ -16299,7 +16303,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1126
+        "line": 1125
       },
       "methods": [
         {
@@ -16310,7 +16314,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1157
+            "line": 1156
           },
           "name": "cryptoSha256",
           "returns": {
@@ -16328,7 +16332,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1131
+            "line": 1130
           },
           "name": "fsReadFile",
           "returns": {
@@ -16345,7 +16349,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1140
+            "line": 1139
           },
           "name": "fsReadFileSync",
           "returns": {
@@ -16365,7 +16369,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1149
+            "line": 1148
           },
           "name": "osPlatform",
           "type": {
@@ -16387,7 +16391,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1369
+          "line": 1368
         },
         "parameters": [
           {
@@ -16408,7 +16412,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1366
+        "line": 1365
       },
       "methods": [
         {
@@ -16417,7 +16421,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1377
+            "line": 1376
           },
           "name": "giveMeUndefined",
           "parameters": [
@@ -16436,7 +16440,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1387
+            "line": 1386
           },
           "name": "giveMeUndefinedInsideAnObject",
           "parameters": [
@@ -16454,7 +16458,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1416
+            "line": 1415
           },
           "name": "verifyPropertyIsUndefined"
         }
@@ -16467,7 +16471,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1367
+            "line": 1366
           },
           "name": "changeMeToUndefined",
           "optional": true,
@@ -16487,7 +16491,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1425
+        "line": 1424
       },
       "name": "NullShouldBeTreatedAsUndefinedData",
       "properties": [
@@ -16499,7 +16503,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1427
+            "line": 1426
           },
           "name": "arrayWithThreeElementsAndUndefinedAsSecondArgument",
           "type": {
@@ -16519,7 +16523,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1426
+            "line": 1425
           },
           "name": "thisShouldBeUndefined",
           "optional": true,
@@ -16542,7 +16546,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 506
+          "line": 505
         },
         "parameters": [
           {
@@ -16556,7 +16560,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 505
+        "line": 504
       },
       "methods": [
         {
@@ -16565,7 +16569,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 512
+            "line": 511
           },
           "name": "isSameGenerator",
           "parameters": [
@@ -16588,7 +16592,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 508
+            "line": 507
           },
           "name": "nextTimes100",
           "returns": {
@@ -16606,7 +16610,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 506
+            "line": 505
           },
           "name": "generator",
           "type": {
@@ -16630,7 +16634,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 264
+        "line": 263
       },
       "methods": [
         {
@@ -16640,7 +16644,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 268
+            "line": 267
           },
           "name": "sumFromArray",
           "parameters": [
@@ -16649,7 +16653,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
               "type": {
                 "collection": {
                   "elementtype": {
-                    "fqn": "@scope/jsii-calc-lib.Value"
+                    "fqn": "@scope/jsii-calc-lib.NumericValue"
                   },
                   "kind": "array"
                 }
@@ -16669,7 +16673,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 279
+            "line": 278
           },
           "name": "sumFromMap",
           "parameters": [
@@ -16678,7 +16682,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
               "type": {
                 "collection": {
                   "elementtype": {
-                    "fqn": "@scope/jsii-calc-lib.Value"
+                    "fqn": "@scope/jsii-calc-lib.NumericValue"
                   },
                   "kind": "map"
                 }
@@ -16703,7 +16707,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2546
+        "line": 2545
       },
       "methods": [
         {
@@ -16712,7 +16716,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2547
+            "line": 2546
           },
           "name": "provide",
           "returns": {
@@ -16770,7 +16774,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1224
+          "line": 1223
         },
         "parameters": [
           {
@@ -16784,7 +16788,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1223
+        "line": 1222
       },
       "methods": [
         {
@@ -16793,7 +16797,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1232
+            "line": 1231
           },
           "name": "invokeWithOptional"
         },
@@ -16803,7 +16807,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1228
+            "line": 1227
           },
           "name": "invokeWithoutOptional"
         }
@@ -16822,7 +16826,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 310
+          "line": 309
         },
         "parameters": [
           {
@@ -16849,7 +16853,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 309
+        "line": 308
       },
       "name": "OptionalConstructorArgument",
       "properties": [
@@ -16860,7 +16864,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 311
+            "line": 310
           },
           "name": "arg1",
           "type": {
@@ -16874,7 +16878,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 312
+            "line": 311
           },
           "name": "arg2",
           "type": {
@@ -16888,7 +16892,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 313
+            "line": 312
           },
           "name": "arg3",
           "optional": true,
@@ -16908,7 +16912,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1867
+        "line": 1866
       },
       "name": "OptionalStruct",
       "properties": [
@@ -16920,7 +16924,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1868
+            "line": 1867
           },
           "name": "field",
           "optional": true,
@@ -16942,7 +16946,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1862
+          "line": 1861
         },
         "parameters": [
           {
@@ -16957,7 +16961,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1858
+        "line": 1857
       },
       "name": "OptionalStructConsumer",
       "properties": [
@@ -16968,7 +16972,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1859
+            "line": 1858
           },
           "name": "parameterWasUndefined",
           "type": {
@@ -16982,7 +16986,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1860
+            "line": 1859
           },
           "name": "fieldValue",
           "optional": true,
@@ -17007,7 +17011,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2135
+        "line": 2134
       },
       "methods": [
         {
@@ -17016,7 +17020,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2147
+            "line": 2146
           },
           "name": "overrideMe",
           "protected": true,
@@ -17032,7 +17036,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2143
+            "line": 2142
           },
           "name": "switchModes"
         },
@@ -17042,7 +17046,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2139
+            "line": 2138
           },
           "name": "valueFromProtected",
           "returns": {
@@ -17061,7 +17065,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2136
+            "line": 2135
           },
           "name": "overrideReadOnly",
           "protected": true,
@@ -17075,7 +17079,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2137
+            "line": 2136
           },
           "name": "overrideReadWrite",
           "protected": true,
@@ -17099,7 +17103,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 645
+        "line": 644
       },
       "methods": [
         {
@@ -17108,7 +17112,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 646
+            "line": 645
           },
           "name": "test",
           "parameters": [
@@ -17139,7 +17143,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2498
+        "line": 2497
       },
       "name": "ParentStruct982",
       "properties": [
@@ -17151,7 +17155,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2499
+            "line": 2498
           },
           "name": "foo",
           "type": {
@@ -17175,7 +17179,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1833
+        "line": 1832
       },
       "methods": [
         {
@@ -17185,7 +17189,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1834
+            "line": 1833
           },
           "name": "consumePartiallyInitializedThis",
           "parameters": [
@@ -17231,7 +17235,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 495
+        "line": 494
       },
       "methods": [
         {
@@ -17240,7 +17244,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 496
+            "line": 495
           },
           "name": "sayHello",
           "parameters": [
@@ -17275,7 +17279,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 227
+          "line": 234
         },
         "parameters": [
           {
@@ -17284,7 +17288,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
             },
             "name": "base",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           },
           {
@@ -17293,7 +17297,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
             },
             "name": "pow",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           }
         ]
@@ -17301,7 +17305,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 221
+        "line": 228
       },
       "name": "Power",
       "properties": [
@@ -17313,11 +17317,11 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 227
+            "line": 235
           },
           "name": "base",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         },
         {
@@ -17329,12 +17333,12 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 231
+            "line": 241
           },
           "name": "expression",
           "overrides": "jsii-calc.composition.CompositeOperation",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         },
         {
@@ -17345,11 +17349,11 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 227
+            "line": 236
           },
           "name": "pow",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         }
       ]
@@ -17369,7 +17373,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 392
+        "line": 402
       },
       "name": "PropertyNamedProperty",
       "properties": [
@@ -17380,7 +17384,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 393
+            "line": 403
           },
           "name": "property",
           "type": {
@@ -17394,7 +17398,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 394
+            "line": 404
           },
           "name": "yetAnoterOne",
           "type": {
@@ -17417,7 +17421,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1553
+        "line": 1552
       },
       "methods": [
         {
@@ -17426,7 +17430,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1554
+            "line": 1553
           },
           "name": "hello"
         }
@@ -17447,7 +17451,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 957
+        "line": 956
       },
       "methods": [
         {
@@ -17456,7 +17460,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 958
+            "line": 957
           },
           "name": "and"
         },
@@ -17466,7 +17470,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 962
+            "line": 961
           },
           "name": "as"
         },
@@ -17476,7 +17480,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 966
+            "line": 965
           },
           "name": "assert"
         },
@@ -17486,7 +17490,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 970
+            "line": 969
           },
           "name": "async"
         },
@@ -17496,7 +17500,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 974
+            "line": 973
           },
           "name": "await"
         },
@@ -17506,7 +17510,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 978
+            "line": 977
           },
           "name": "break"
         },
@@ -17516,7 +17520,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 982
+            "line": 981
           },
           "name": "class"
         },
@@ -17526,7 +17530,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 986
+            "line": 985
           },
           "name": "continue"
         },
@@ -17536,7 +17540,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 990
+            "line": 989
           },
           "name": "def"
         },
@@ -17546,7 +17550,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 994
+            "line": 993
           },
           "name": "del"
         },
@@ -17556,7 +17560,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 998
+            "line": 997
           },
           "name": "elif"
         },
@@ -17566,7 +17570,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1002
+            "line": 1001
           },
           "name": "else"
         },
@@ -17576,7 +17580,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1006
+            "line": 1005
           },
           "name": "except"
         },
@@ -17586,7 +17590,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1010
+            "line": 1009
           },
           "name": "finally"
         },
@@ -17596,7 +17600,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1014
+            "line": 1013
           },
           "name": "for"
         },
@@ -17606,7 +17610,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1018
+            "line": 1017
           },
           "name": "from"
         },
@@ -17616,7 +17620,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1022
+            "line": 1021
           },
           "name": "global"
         },
@@ -17626,7 +17630,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1026
+            "line": 1025
           },
           "name": "if"
         },
@@ -17636,7 +17640,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1030
+            "line": 1029
           },
           "name": "import"
         },
@@ -17646,7 +17650,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1034
+            "line": 1033
           },
           "name": "in"
         },
@@ -17656,7 +17660,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1038
+            "line": 1037
           },
           "name": "is"
         },
@@ -17666,7 +17670,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1042
+            "line": 1041
           },
           "name": "lambda"
         },
@@ -17676,7 +17680,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1046
+            "line": 1045
           },
           "name": "nonlocal"
         },
@@ -17686,7 +17690,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1050
+            "line": 1049
           },
           "name": "not"
         },
@@ -17696,7 +17700,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1054
+            "line": 1053
           },
           "name": "or"
         },
@@ -17706,7 +17710,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1058
+            "line": 1057
           },
           "name": "pass"
         },
@@ -17716,7 +17720,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1062
+            "line": 1061
           },
           "name": "raise"
         },
@@ -17726,7 +17730,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1066
+            "line": 1065
           },
           "name": "return"
         },
@@ -17736,7 +17740,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1070
+            "line": 1069
           },
           "name": "try"
         },
@@ -17746,7 +17750,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1074
+            "line": 1073
           },
           "name": "while"
         },
@@ -17756,7 +17760,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1078
+            "line": 1077
           },
           "name": "with"
         },
@@ -17766,7 +17770,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1082
+            "line": 1081
           },
           "name": "yield"
         }
@@ -17785,7 +17789,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1092
+          "line": 1091
         },
         "parameters": [
           {
@@ -17799,7 +17803,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1091
+        "line": 1090
       },
       "methods": [
         {
@@ -17808,7 +17812,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1094
+            "line": 1093
           },
           "name": "method",
           "parameters": [
@@ -17836,7 +17840,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1092
+            "line": 1091
           },
           "name": "self",
           "type": {
@@ -17857,7 +17861,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1100
+          "line": 1099
         },
         "parameters": [
           {
@@ -17871,7 +17875,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1099
+        "line": 1098
       },
       "name": "ClassWithSelfKwarg",
       "namespace": "PythonSelf",
@@ -17883,7 +17887,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1100
+            "line": 1099
           },
           "name": "props",
           "type": {
@@ -17901,7 +17905,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1107
+        "line": 1106
       },
       "methods": [
         {
@@ -17911,7 +17915,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1108
+            "line": 1107
           },
           "name": "method",
           "parameters": [
@@ -17942,7 +17946,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1103
+        "line": 1102
       },
       "name": "StructWithSelf",
       "namespace": "PythonSelf",
@@ -17955,7 +17959,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1104
+            "line": 1103
           },
           "name": "self",
           "type": {
@@ -17979,7 +17983,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1183
+        "line": 1182
       },
       "methods": [
         {
@@ -17988,7 +17992,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1186
+            "line": 1185
           },
           "name": "loadFoo",
           "returns": {
@@ -18004,7 +18008,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1190
+            "line": 1189
           },
           "name": "saveFoo",
           "parameters": [
@@ -18025,7 +18029,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1184
+            "line": 1183
           },
           "name": "foo",
           "optional": true,
@@ -18052,7 +18056,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1507
+        "line": 1506
       },
       "name": "ReturnsPrivateImplementationOfInterface",
       "properties": [
@@ -18063,7 +18067,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1508
+            "line": 1507
           },
           "name": "privateImplementation",
           "type": {
@@ -18084,7 +18088,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2442
+        "line": 2441
       },
       "name": "RootStruct",
       "properties": [
@@ -18097,7 +18101,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2446
+            "line": 2445
           },
           "name": "stringProp",
           "type": {
@@ -18112,7 +18116,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2447
+            "line": 2446
           },
           "name": "nestedStruct",
           "optional": true,
@@ -18131,7 +18135,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2455
+        "line": 2454
       },
       "methods": [
         {
@@ -18140,7 +18144,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2456
+            "line": 2455
           },
           "name": "validate",
           "parameters": [
@@ -18170,7 +18174,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 288
+        "line": 287
       },
       "methods": [
         {
@@ -18179,7 +18183,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 296
+            "line": 295
           },
           "name": "methodWithDefaultedArguments",
           "parameters": [
@@ -18212,7 +18216,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 304
+            "line": 303
           },
           "name": "methodWithOptionalAnyArgument",
           "parameters": [
@@ -18232,7 +18236,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 292
+            "line": 291
           },
           "name": "methodWithOptionalArguments",
           "parameters": [
@@ -18270,7 +18274,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2014
+        "line": 2013
       },
       "name": "SecondLevelStruct",
       "properties": [
@@ -18283,7 +18287,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2018
+            "line": 2017
           },
           "name": "deeperRequiredProp",
           "type": {
@@ -18299,7 +18303,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2023
+            "line": 2022
           },
           "name": "deeperOptionalProp",
           "optional": true,
@@ -18325,7 +18329,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1624
+        "line": 1623
       },
       "methods": [
         {
@@ -18334,7 +18338,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1627
+            "line": 1626
           },
           "name": "interface1",
           "returns": {
@@ -18349,7 +18353,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1631
+            "line": 1630
           },
           "name": "interface2",
           "returns": {
@@ -18372,7 +18376,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1966
+        "line": 1965
       },
       "methods": [
         {
@@ -18381,7 +18385,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1968
+            "line": 1967
           },
           "name": "isSingletonInt",
           "parameters": [
@@ -18411,7 +18415,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1973
+        "line": 1972
       },
       "members": [
         {
@@ -18435,7 +18439,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1949
+        "line": 1948
       },
       "methods": [
         {
@@ -18444,7 +18448,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1952
+            "line": 1951
           },
           "name": "isSingletonString",
           "parameters": [
@@ -18474,7 +18478,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1957
+        "line": 1956
       },
       "members": [
         {
@@ -18497,7 +18501,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 403
+        "line": 413
       },
       "name": "SmellyStruct",
       "properties": [
@@ -18509,7 +18513,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 404
+            "line": 414
           },
           "name": "property",
           "type": {
@@ -18524,7 +18528,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 405
+            "line": 415
           },
           "name": "yetAnoterOne",
           "type": {
@@ -18547,7 +18551,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2479
+        "line": 2478
       },
       "methods": [
         {
@@ -18556,7 +18560,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2488
+            "line": 2487
           },
           "name": "returnAnonymous",
           "returns": {
@@ -18572,7 +18576,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2480
+            "line": 2479
           },
           "name": "returnReturn",
           "returns": {
@@ -18733,7 +18737,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1892
+        "line": 1891
       },
       "methods": [
         {
@@ -18742,7 +18746,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1895
+            "line": 1894
           },
           "name": "canAccessStaticContext",
           "returns": {
@@ -18761,7 +18765,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1903
+            "line": 1902
           },
           "name": "staticVariable",
           "static": true,
@@ -18783,7 +18787,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 690
+          "line": 689
         },
         "parameters": [
           {
@@ -18797,7 +18801,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 689
+        "line": 688
       },
       "methods": [
         {
@@ -18807,7 +18811,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 696
+            "line": 695
           },
           "name": "staticMethod",
           "parameters": [
@@ -18834,7 +18838,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 700
+            "line": 699
           },
           "name": "justMethod",
           "returns": {
@@ -18855,7 +18859,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 712
+            "line": 711
           },
           "name": "BAR",
           "static": true,
@@ -18871,7 +18875,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 741
+            "line": 740
           },
           "name": "ConstObj",
           "static": true,
@@ -18888,7 +18892,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 707
+            "line": 706
           },
           "name": "Foo",
           "static": true,
@@ -18905,7 +18909,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 717
+            "line": 716
           },
           "name": "zooBar",
           "static": true,
@@ -18926,7 +18930,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 726
+            "line": 725
           },
           "name": "instance",
           "static": true,
@@ -18940,7 +18944,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 740
+            "line": 739
           },
           "name": "nonConstStatic",
           "static": true,
@@ -18955,7 +18959,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 690
+            "line": 689
           },
           "name": "value",
           "type": {
@@ -18973,7 +18977,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 39
+        "line": 38
       },
       "members": [
         {
@@ -19011,7 +19015,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1677
+        "line": 1676
       },
       "name": "StripInternal",
       "properties": [
@@ -19021,7 +19025,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1678
+            "line": 1677
           },
           "name": "youSeeMe",
           "type": {
@@ -19041,7 +19045,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2240
+        "line": 2239
       },
       "name": "StructA",
       "properties": [
@@ -19053,7 +19057,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2241
+            "line": 2240
           },
           "name": "requiredString",
           "type": {
@@ -19068,7 +19072,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2243
+            "line": 2242
           },
           "name": "optionalNumber",
           "optional": true,
@@ -19084,7 +19088,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2242
+            "line": 2241
           },
           "name": "optionalString",
           "optional": true,
@@ -19105,7 +19109,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2249
+        "line": 2248
       },
       "name": "StructB",
       "properties": [
@@ -19117,7 +19121,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2250
+            "line": 2249
           },
           "name": "requiredString",
           "type": {
@@ -19132,7 +19136,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2251
+            "line": 2250
           },
           "name": "optionalBoolean",
           "optional": true,
@@ -19148,7 +19152,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2252
+            "line": 2251
           },
           "name": "optionalStructA",
           "optional": true,
@@ -19170,7 +19174,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2678
+        "line": 2677
       },
       "name": "StructParameterType",
       "properties": [
@@ -19182,7 +19186,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2679
+            "line": 2678
           },
           "name": "scope",
           "type": {
@@ -19197,7 +19201,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2680
+            "line": 2679
           },
           "name": "props",
           "optional": true,
@@ -19222,7 +19226,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2072
+        "line": 2071
       },
       "methods": [
         {
@@ -19231,7 +19235,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2084
+            "line": 2083
           },
           "name": "howManyVarArgsDidIPass",
           "parameters": [
@@ -19263,7 +19267,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2073
+            "line": 2072
           },
           "name": "roundTrip",
           "parameters": [
@@ -19299,7 +19303,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2254
+        "line": 2253
       },
       "methods": [
         {
@@ -19308,7 +19312,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2255
+            "line": 2254
           },
           "name": "isStructA",
           "parameters": [
@@ -19341,7 +19345,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2276
+            "line": 2275
           },
           "name": "isStructB",
           "parameters": [
@@ -19381,7 +19385,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2046
+        "line": 2045
       },
       "name": "StructWithJavaReservedWords",
       "properties": [
@@ -19393,7 +19397,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2047
+            "line": 2046
           },
           "name": "default",
           "type": {
@@ -19408,7 +19412,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2048
+            "line": 2047
           },
           "name": "assert",
           "optional": true,
@@ -19424,7 +19428,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2051
+            "line": 2050
           },
           "name": "result",
           "optional": true,
@@ -19440,7 +19444,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2052
+            "line": 2051
           },
           "name": "that",
           "optional": true,
@@ -19464,13 +19468,13 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 205
+          "line": 212
         }
       },
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 197
+        "line": 204
       },
       "name": "Sum",
       "properties": [
@@ -19483,12 +19487,12 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 209
+            "line": 216
           },
           "name": "expression",
           "overrides": "jsii-calc.composition.CompositeOperation",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         },
         {
@@ -19498,13 +19502,13 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 201
+            "line": 208
           },
           "name": "parts",
           "type": {
             "collection": {
               "elementtype": {
-                "fqn": "@scope/jsii-calc-lib.Value"
+                "fqn": "@scope/jsii-calc-lib.NumericValue"
               },
               "kind": "array"
             }
@@ -19525,7 +19529,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2181
+          "line": 2180
         },
         "parameters": [
           {
@@ -19573,7 +19577,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2171
+        "line": 2170
       },
       "name": "SupportsNiceJavaBuilder",
       "properties": [
@@ -19585,7 +19589,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2182
+            "line": 2181
           },
           "name": "id",
           "overrides": "jsii-calc.SupportsNiceJavaBuilderWithRequiredProps",
@@ -19600,7 +19604,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2172
+            "line": 2171
           },
           "name": "rest",
           "type": {
@@ -19624,7 +19628,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2191
+        "line": 2190
       },
       "name": "SupportsNiceJavaBuilderProps",
       "properties": [
@@ -19637,7 +19641,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2201
+            "line": 2200
           },
           "name": "bar",
           "type": {
@@ -19654,7 +19658,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2196
+            "line": 2195
           },
           "name": "id",
           "optional": true,
@@ -19677,7 +19681,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2163
+          "line": 2162
         },
         "parameters": [
           {
@@ -19703,7 +19707,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2155
+        "line": 2154
       },
       "name": "SupportsNiceJavaBuilderWithRequiredProps",
       "properties": [
@@ -19714,7 +19718,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2157
+            "line": 2156
           },
           "name": "bar",
           "type": {
@@ -19729,7 +19733,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2164
+            "line": 2163
           },
           "name": "id",
           "type": {
@@ -19743,7 +19747,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2156
+            "line": 2155
           },
           "name": "propId",
           "optional": true,
@@ -19767,7 +19771,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 376
+        "line": 375
       },
       "methods": [
         {
@@ -19777,7 +19781,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 389
+            "line": 388
           },
           "name": "callerIsAsync",
           "returns": {
@@ -19792,7 +19796,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 377
+            "line": 376
           },
           "name": "callerIsMethod",
           "returns": {
@@ -19807,7 +19811,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 429
+            "line": 428
           },
           "name": "modifyOtherProperty",
           "parameters": [
@@ -19825,7 +19829,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 401
+            "line": 400
           },
           "name": "modifyValueOfTheProperty",
           "parameters": [
@@ -19843,7 +19847,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 442
+            "line": 441
           },
           "name": "readA",
           "returns": {
@@ -19858,7 +19862,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 433
+            "line": 432
           },
           "name": "retrieveOtherProperty",
           "returns": {
@@ -19873,7 +19877,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 413
+            "line": 412
           },
           "name": "retrieveReadOnlyProperty",
           "returns": {
@@ -19888,7 +19892,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 405
+            "line": 404
           },
           "name": "retrieveValueOfTheProperty",
           "returns": {
@@ -19903,7 +19907,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 393
+            "line": 392
           },
           "name": "virtualMethod",
           "parameters": [
@@ -19926,7 +19930,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 446
+            "line": 445
           },
           "name": "writeA",
           "parameters": [
@@ -19948,7 +19952,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 411
+            "line": 410
           },
           "name": "readonlyProperty",
           "type": {
@@ -19961,7 +19965,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 440
+            "line": 439
           },
           "name": "a",
           "type": {
@@ -19974,7 +19978,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 381
+            "line": 380
           },
           "name": "callerIsProperty",
           "type": {
@@ -19987,7 +19991,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 419
+            "line": 418
           },
           "name": "otherProperty",
           "type": {
@@ -20000,7 +20004,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 399
+            "line": 398
           },
           "name": "theProperty",
           "type": {
@@ -20013,7 +20017,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 427
+            "line": 426
           },
           "name": "valueOfOtherProperty",
           "type": {
@@ -20036,7 +20040,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 651
+        "line": 650
       },
       "methods": [
         {
@@ -20045,7 +20049,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 652
+            "line": 651
           },
           "name": "throwError"
         }
@@ -20062,7 +20066,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1997
+        "line": 1996
       },
       "name": "TopLevelStruct",
       "properties": [
@@ -20075,7 +20079,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2001
+            "line": 2000
           },
           "name": "required",
           "type": {
@@ -20091,7 +20095,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2011
+            "line": 2010
           },
           "name": "secondLevel",
           "type": {
@@ -20116,7 +20120,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2006
+            "line": 2005
           },
           "name": "optional",
           "optional": true,
@@ -20137,7 +20141,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2752
+        "line": 2751
       },
       "methods": [
         {
@@ -20147,7 +20151,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2756
+            "line": 2755
           },
           "name": "mode",
           "returns": {
@@ -20175,13 +20179,13 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 101
+          "line": 108
         },
         "parameters": [
           {
             "name": "operand",
             "type": {
-              "fqn": "@scope/jsii-calc-lib.Value"
+              "fqn": "@scope/jsii-calc-lib.NumericValue"
             }
           }
         ]
@@ -20189,7 +20193,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 100
+        "line": 107
       },
       "name": "UnaryOperation",
       "properties": [
@@ -20200,11 +20204,11 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 101
+            "line": 108
           },
           "name": "operand",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         }
       ]
@@ -20219,7 +20223,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1112
+        "line": 1111
       },
       "name": "UnionProperties",
       "properties": [
@@ -20231,7 +20235,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1114
+            "line": 1113
           },
           "name": "bar",
           "type": {
@@ -20258,7 +20262,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1113
+            "line": 1112
           },
           "name": "foo",
           "optional": true,
@@ -20368,7 +20372,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1117
+        "line": 1116
       },
       "methods": [
         {
@@ -20377,7 +20381,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1118
+            "line": 1117
           },
           "name": "value",
           "returns": {
@@ -20404,7 +20408,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1168
+        "line": 1167
       },
       "methods": [
         {
@@ -20413,7 +20417,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1169
+            "line": 1168
           },
           "name": "hello",
           "returns": {
@@ -20437,7 +20441,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 597
+          "line": 596
         },
         "parameters": [
           {
@@ -20451,7 +20455,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 596
+        "line": 595
       },
       "methods": [
         {
@@ -20460,7 +20464,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 599
+            "line": 598
           },
           "name": "justRead",
           "returns": {
@@ -20475,7 +20479,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 608
+            "line": 607
           },
           "name": "readStringAndNumber",
           "parameters": [
@@ -20498,7 +20502,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 603
+            "line": 602
           },
           "name": "writeAndRead",
           "parameters": [
@@ -20525,7 +20529,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 597
+            "line": 596
           },
           "name": "obj",
           "type": {
@@ -20546,7 +20550,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 681
+          "line": 680
         },
         "parameters": [
           {
@@ -20560,7 +20564,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 680
+        "line": 679
       },
       "methods": [
         {
@@ -20569,7 +20573,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 683
+            "line": 682
           },
           "name": "asArray",
           "parameters": [
@@ -20608,7 +20612,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 667
+          "line": 666
         },
         "parameters": [
           {
@@ -20627,7 +20631,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 661
+        "line": 660
       },
       "methods": [
         {
@@ -20636,7 +20640,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 675
+            "line": 674
           },
           "name": "asArray",
           "parameters": [
@@ -20689,7 +20693,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 451
+        "line": 450
       },
       "methods": [
         {
@@ -20699,7 +20703,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 476
+            "line": 475
           },
           "name": "overrideMeAsync",
           "parameters": [
@@ -20722,7 +20726,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 480
+            "line": 479
           },
           "name": "overrideMeSync",
           "parameters": [
@@ -20746,7 +20750,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 458
+            "line": 457
           },
           "name": "parallelSumAsync",
           "parameters": [
@@ -20770,7 +20774,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 452
+            "line": 451
           },
           "name": "serialSumAsync",
           "parameters": [
@@ -20793,7 +20797,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 468
+            "line": 467
           },
           "name": "sumSync",
           "parameters": [
@@ -20830,7 +20834,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1921
+        "line": 1920
       },
       "methods": [
         {
@@ -20839,7 +20843,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1926
+            "line": 1925
           },
           "name": "callMe"
         },
@@ -20850,7 +20854,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1930
+            "line": 1929
           },
           "name": "overrideMe",
           "protected": true
@@ -20865,7 +20869,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1923
+            "line": 1922
           },
           "name": "methodWasCalled",
           "type": {
@@ -20887,7 +20891,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1937
+          "line": 1936
         },
         "parameters": [
           {
@@ -20902,7 +20906,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1936
+        "line": 1935
       },
       "name": "WithPrivatePropertyInConstructor",
       "properties": [
@@ -20913,7 +20917,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1939
+            "line": 1938
           },
           "name": "success",
           "type": {
@@ -20935,7 +20939,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 138
+        "line": 145
       },
       "methods": [
         {
@@ -20945,7 +20949,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 164
+            "line": 171
           },
           "name": "toString",
           "overrides": "@scope/jsii-calc-lib.Operation",
@@ -20969,11 +20973,11 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 162
+            "line": 169
           },
           "name": "expression",
           "type": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.NumericValue"
           }
         },
         {
@@ -20984,10 +20988,10 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 154
+            "line": 161
           },
           "name": "value",
-          "overrides": "@scope/jsii-calc-lib.Value",
+          "overrides": "@scope/jsii-calc-lib.NumericValue",
           "type": {
             "primitive": "number"
           }
@@ -20999,7 +21003,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 152
+            "line": 159
           },
           "name": "decorationPostfixes",
           "type": {
@@ -21018,7 +21022,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 147
+            "line": 154
           },
           "name": "decorationPrefixes",
           "type": {
@@ -21037,7 +21041,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 142
+            "line": 149
           },
           "name": "stringStyle",
           "type": {
@@ -21056,7 +21060,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 184
+        "line": 191
       },
       "members": [
         {
@@ -21601,7 +21605,7 @@ exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.Calcu
     }
   },
   "version": "0.0.0",
-  "fingerprint": "cyoh4941c6DZUpcqFIkyprTV/kYc5HyNK4JT1ibPKIE="
+  "fingerprint": "E/GXhY9JNedt4a4BxZtUU+gi/wjwJJ7IqZ2ssgncT7Y="
 }
 
 `;
@@ -22012,7 +22016,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     /// <remarks>
     /// <strong>Stability</strong>: Experimental
     /// </remarks>
-    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Add), fullyQualifiedName: "jsii-calc.Add", parametersJson: "[{\\"docs\\":{\\"summary\\":\\"Left-hand side operand.\\"},\\"name\\":\\"lhs\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}},{\\"docs\\":{\\"summary\\":\\"Right-hand side operand.\\"},\\"name\\":\\"rhs\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}}]")]
+    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Add), fullyQualifiedName: "jsii-calc.Add", parametersJson: "[{\\"docs\\":{\\"summary\\":\\"Left-hand side operand.\\"},\\"name\\":\\"lhs\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}},{\\"docs\\":{\\"summary\\":\\"Right-hand side operand.\\"},\\"name\\":\\"rhs\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}}]")]
     public class Add : Amazon.JSII.Tests.CalculatorNamespace.BinaryOperation
     {
         /// <summary>Creates a BinaryOperation.</summary>
@@ -22021,7 +22025,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        public Add(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ lhs, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ rhs): base(new DeputyProps(new object[]{lhs, rhs}))
+        public Add(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue lhs, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue rhs): base(new DeputyProps(new object[]{lhs, rhs}))
         {
         }
 
@@ -22250,7 +22254,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "unionArrayProperty", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"union\\":{\\"types\\":[{\\"primitive\\":\\"number\\"},{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}]}},\\"kind\\":\\"array\\"}}")]
+        [JsiiProperty(name: "unionArrayProperty", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"union\\":{\\"types\\":[{\\"primitive\\":\\"number\\"},{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}]}},\\"kind\\":\\"array\\"}}")]
         public virtual object[] UnionArrayProperty
         {
             get => GetInstanceProperty<object[]>();
@@ -22804,7 +22808,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     /// <remarks>
     /// <strong>Stability</strong>: Experimental
     /// </remarks>
-    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.BinaryOperation), fullyQualifiedName: "jsii-calc.BinaryOperation", parametersJson: "[{\\"docs\\":{\\"summary\\":\\"Left-hand side operand.\\"},\\"name\\":\\"lhs\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}},{\\"docs\\":{\\"summary\\":\\"Right-hand side operand.\\"},\\"name\\":\\"rhs\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}}]")]
+    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.BinaryOperation), fullyQualifiedName: "jsii-calc.BinaryOperation", parametersJson: "[{\\"docs\\":{\\"summary\\":\\"Left-hand side operand.\\"},\\"name\\":\\"lhs\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}},{\\"docs\\":{\\"summary\\":\\"Right-hand side operand.\\"},\\"name\\":\\"rhs\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}}]")]
     public abstract class BinaryOperation : Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Operation, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.IFriendly
     {
         /// <summary>Creates a BinaryOperation.</summary>
@@ -22813,7 +22817,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        protected BinaryOperation(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ lhs, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ rhs): base(new DeputyProps(new object[]{lhs, rhs}))
+        protected BinaryOperation(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue lhs, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue rhs): base(new DeputyProps(new object[]{lhs, rhs}))
         {
         }
 
@@ -22845,20 +22849,20 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "lhs", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}")]
-        public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ Lhs
+        [JsiiProperty(name: "lhs", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}")]
+        public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue Lhs
         {
-            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_>();
+            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue>();
         }
 
         /// <summary>Right-hand side operand.</summary>
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "rhs", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}")]
-        public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ Rhs
+        [JsiiProperty(name: "rhs", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}")]
+        public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue Rhs
         {
-            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_>();
+            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue>();
         }
     }
 }
@@ -23111,40 +23115,40 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "expression", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}")]
-        public override Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ Expression
+        [JsiiProperty(name: "expression", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}")]
+        public override Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue Expression
         {
-            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_>();
+            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue>();
         }
 
         /// <summary>A log of all operations.</summary>
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "operationsLog", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"},\\"kind\\":\\"array\\"}}")]
-        public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_[] OperationsLog
+        [JsiiProperty(name: "operationsLog", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"},\\"kind\\":\\"array\\"}}")]
+        public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue[] OperationsLog
         {
-            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_[]>();
+            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue[]>();
         }
 
         /// <summary>A map of per operation name of all operations performed.</summary>
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "operationsMap", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"},\\"kind\\":\\"array\\"}},\\"kind\\":\\"map\\"}}")]
-        public virtual System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_[]> OperationsMap
+        [JsiiProperty(name: "operationsMap", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"},\\"kind\\":\\"array\\"}},\\"kind\\":\\"map\\"}}")]
+        public virtual System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue[]> OperationsMap
         {
-            get => GetInstanceProperty<System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_[]>>();
+            get => GetInstanceProperty<System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue[]>>();
         }
 
         /// <summary>The current value.</summary>
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "curr", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}")]
-        public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ Curr
+        [JsiiProperty(name: "curr", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}")]
+        public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue Curr
         {
-            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_>();
+            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue>();
             set => SetInstanceProperty(value);
         }
 
@@ -23865,8 +23869,8 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Composition
         /// 
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "expression", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}")]
-        public abstract Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ Expression
+        [JsiiProperty(name: "expression", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}")]
+        public abstract Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue Expression
         {
             get;
         }
@@ -23963,10 +23967,10 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Composition
         /// 
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "expression", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}")]
-        public override Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ Expression
+        [JsiiProperty(name: "expression", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}")]
+        public override Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue Expression
         {
-            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_>();
+            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue>();
         }
     }
 }
@@ -24975,8 +24979,8 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "anotherOptional", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"},\\"kind\\":\\"map\\"}}", isOptional: true, isOverride: true)]
-        public System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_>? AnotherOptional
+        [JsiiProperty(name: "anotherOptional", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"},\\"kind\\":\\"map\\"}}", isOptional: true, isOverride: true)]
+        public System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue>? AnotherOptional
         {
             get;
             set;
@@ -25095,10 +25099,10 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "anotherOptional", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"},\\"kind\\":\\"map\\"}}", isOptional: true)]
-        public System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_>? AnotherOptional
+        [JsiiProperty(name: "anotherOptional", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"},\\"kind\\":\\"map\\"}}", isOptional: true)]
+        public System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue>? AnotherOptional
         {
-            get => GetInstanceProperty<System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_>?>();
+            get => GetInstanceProperty<System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue>?>();
         }
 
         /// <remarks>
@@ -27428,9 +27432,9 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "anotherOptional", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"},\\"kind\\":\\"map\\"}}", isOptional: true)]
+        [JsiiProperty(name: "anotherOptional", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"},\\"kind\\":\\"map\\"}}", isOptional: true)]
         [Amazon.JSII.Runtime.Deputy.JsiiOptional]
-        System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_>? AnotherOptional
+        System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue>? AnotherOptional
         {
             get
             {
@@ -32056,7 +32060,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
 
 `;
 
-exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JsiiAgent_.cs 1`] = `
+exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JsiiAgent.cs 1`] = `
 using Amazon.JSII.Runtime.Deputy;
 
 #pragma warning disable CS0672,CS0809,CS1591
@@ -32067,27 +32071,27 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     /// <remarks>
     /// <strong>Stability</strong>: Experimental
     /// </remarks>
-    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.JsiiAgent_), fullyQualifiedName: "jsii-calc.JsiiAgent")]
-    public class JsiiAgent_ : DeputyBase
+    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.JsiiAgent), fullyQualifiedName: "jsii-calc.JsiiAgent")]
+    public class JsiiAgent : DeputyBase
     {
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        public JsiiAgent_(): base(new DeputyProps(System.Array.Empty<object>()))
+        public JsiiAgent(): 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 JsiiAgent_(ByRefValue reference): base(reference)
+        protected JsiiAgent(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 JsiiAgent_(DeputyProps props): base(props)
+        protected JsiiAgent(DeputyProps props): base(props)
         {
         }
 
@@ -32096,10 +32100,10 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "jsiiAgent", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
-        public static string? JsiiAgent
+        [JsiiProperty(name: "value", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
+        public static string? Value
         {
-            get => GetStaticProperty<string?>(typeof(Amazon.JSII.Tests.CalculatorNamespace.JsiiAgent_));
+            get => GetStaticProperty<string?>(typeof(Amazon.JSII.Tests.CalculatorNamespace.JsiiAgent));
         }
     }
 }
@@ -32560,7 +32564,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     /// <remarks>
     /// <strong>Stability</strong>: Experimental
     /// </remarks>
-    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Multiply), fullyQualifiedName: "jsii-calc.Multiply", parametersJson: "[{\\"docs\\":{\\"summary\\":\\"Left-hand side operand.\\"},\\"name\\":\\"lhs\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}},{\\"docs\\":{\\"summary\\":\\"Right-hand side operand.\\"},\\"name\\":\\"rhs\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}}]")]
+    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Multiply), fullyQualifiedName: "jsii-calc.Multiply", parametersJson: "[{\\"docs\\":{\\"summary\\":\\"Left-hand side operand.\\"},\\"name\\":\\"lhs\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}},{\\"docs\\":{\\"summary\\":\\"Right-hand side operand.\\"},\\"name\\":\\"rhs\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}}]")]
     public class Multiply : Amazon.JSII.Tests.CalculatorNamespace.BinaryOperation, Amazon.JSII.Tests.CalculatorNamespace.IFriendlier, Amazon.JSII.Tests.CalculatorNamespace.IRandomNumberGenerator
     {
         /// <summary>Creates a BinaryOperation.</summary>
@@ -32569,7 +32573,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        public Multiply(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ lhs, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ rhs): base(new DeputyProps(new object[]{lhs, rhs}))
+        public Multiply(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue lhs, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue rhs): base(new DeputyProps(new object[]{lhs, rhs}))
         {
         }
 
@@ -32694,13 +32698,13 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     /// <remarks>
     /// <strong>Stability</strong>: Experimental
     /// </remarks>
-    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Negate), fullyQualifiedName: "jsii-calc.Negate", parametersJson: "[{\\"name\\":\\"operand\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}}]")]
+    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Negate), fullyQualifiedName: "jsii-calc.Negate", parametersJson: "[{\\"name\\":\\"operand\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}}]")]
     public class Negate : Amazon.JSII.Tests.CalculatorNamespace.UnaryOperation, Amazon.JSII.Tests.CalculatorNamespace.IFriendlier
     {
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        public Negate(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ operand): base(new DeputyProps(new object[]{operand}))
+        public Negate(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue operand): base(new DeputyProps(new object[]{operand}))
         {
         }
 
@@ -33218,20 +33222,20 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiMethod(name: "sumFromArray", returnsJson: "{\\"type\\":{\\"primitive\\":\\"number\\"}}", parametersJson: "[{\\"name\\":\\"values\\",\\"type\\":{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"},\\"kind\\":\\"array\\"}}}]")]
-        public virtual double SumFromArray(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_[] values)
+        [JsiiMethod(name: "sumFromArray", returnsJson: "{\\"type\\":{\\"primitive\\":\\"number\\"}}", parametersJson: "[{\\"name\\":\\"values\\",\\"type\\":{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"},\\"kind\\":\\"array\\"}}}]")]
+        public virtual double SumFromArray(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue[] values)
         {
-            return InvokeInstanceMethod<double>(new System.Type[]{typeof(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_[])}, new object[]{values});
+            return InvokeInstanceMethod<double>(new System.Type[]{typeof(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue[])}, new object[]{values});
         }
 
         /// <summary>Returns the sum of all values in a map.</summary>
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiMethod(name: "sumFromMap", returnsJson: "{\\"type\\":{\\"primitive\\":\\"number\\"}}", parametersJson: "[{\\"name\\":\\"values\\",\\"type\\":{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"},\\"kind\\":\\"map\\"}}}]")]
-        public virtual double SumFromMap(System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_> values)
+        [JsiiMethod(name: "sumFromMap", returnsJson: "{\\"type\\":{\\"primitive\\":\\"number\\"}}", parametersJson: "[{\\"name\\":\\"values\\",\\"type\\":{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"},\\"kind\\":\\"map\\"}}}]")]
+        public virtual double SumFromMap(System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue> values)
         {
-            return InvokeInstanceMethod<double>(new System.Type[]{typeof(System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_>)}, new object[]{values});
+            return InvokeInstanceMethod<double>(new System.Type[]{typeof(System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue>)}, new object[]{values});
         }
     }
 }
@@ -33894,7 +33898,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     /// <remarks>
     /// <strong>Stability</strong>: Experimental
     /// </remarks>
-    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Power), fullyQualifiedName: "jsii-calc.Power", parametersJson: "[{\\"docs\\":{\\"summary\\":\\"The base of the power.\\"},\\"name\\":\\"base\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}},{\\"docs\\":{\\"summary\\":\\"The number of times to multiply.\\"},\\"name\\":\\"pow\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}}]")]
+    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Power), fullyQualifiedName: "jsii-calc.Power", parametersJson: "[{\\"docs\\":{\\"summary\\":\\"The base of the power.\\"},\\"name\\":\\"base\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}},{\\"docs\\":{\\"summary\\":\\"The number of times to multiply.\\"},\\"name\\":\\"pow\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}}]")]
     public class Power : Amazon.JSII.Tests.CalculatorNamespace.Composition.CompositeOperation
     {
         /// <summary>Creates a Power operation.</summary>
@@ -33903,7 +33907,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        public Power(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ @base, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ pow): base(new DeputyProps(new object[]{@base, pow}))
+        public Power(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue @base, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue pow): base(new DeputyProps(new object[]{@base, pow}))
         {
         }
 
@@ -33925,10 +33929,10 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "base", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}")]
-        public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ Base
+        [JsiiProperty(name: "base", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}")]
+        public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue Base
         {
-            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_>();
+            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue>();
         }
 
         /// <summary>The expression that this operation consists of.</summary>
@@ -33937,20 +33941,20 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// 
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "expression", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}")]
-        public override Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ Expression
+        [JsiiProperty(name: "expression", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}")]
+        public override Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue Expression
         {
-            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_>();
+            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue>();
         }
 
         /// <summary>The number of times to multiply.</summary>
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "pow", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}")]
-        public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ Pow
+        [JsiiProperty(name: "pow", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}")]
+        public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue Pow
         {
-            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_>();
+            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue>();
         }
     }
 }
@@ -37107,20 +37111,20 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// 
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "expression", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}")]
-        public override Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ Expression
+        [JsiiProperty(name: "expression", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}")]
+        public override Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue Expression
         {
-            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_>();
+            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue>();
         }
 
         /// <summary>The parts to sum.</summary>
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "parts", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"},\\"kind\\":\\"array\\"}}")]
-        public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_[] Parts
+        [JsiiProperty(name: "parts", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"},\\"kind\\":\\"array\\"}}")]
+        public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue[] Parts
         {
-            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_[]>();
+            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue[]>();
             set => SetInstanceProperty(value);
         }
     }
@@ -37741,13 +37745,13 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     /// <remarks>
     /// <strong>Stability</strong>: Experimental
     /// </remarks>
-    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.UnaryOperation), fullyQualifiedName: "jsii-calc.UnaryOperation", parametersJson: "[{\\"name\\":\\"operand\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}}]")]
+    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.UnaryOperation), fullyQualifiedName: "jsii-calc.UnaryOperation", parametersJson: "[{\\"name\\":\\"operand\\",\\"type\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}}]")]
     public abstract class UnaryOperation : Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Operation
     {
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        protected UnaryOperation(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ operand): base(new DeputyProps(new object[]{operand}))
+        protected UnaryOperation(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue operand): base(new DeputyProps(new object[]{operand}))
         {
         }
 
@@ -37768,10 +37772,10 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "operand", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.Value\\"}")]
-        public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_ Operand
+        [JsiiProperty(name: "operand", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"}")]
+        public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue Operand
         {
-            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Value_>();
+            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue>();
         }
     }
 }
@@ -41722,17 +41726,17 @@ type Jsii496Derived struct {
 }
 
 type JsiiAgentIface interface {
-    GetJsiiAgent() string
-    SetJsiiAgent()
+    GetValue() string
+    SetValue()
 }
 
 type JsiiAgent struct {
-    JsiiAgent string
+    Value string
 }
 
 
-func (j JsiiAgent) GetJsiiAgent() string {
-    return j.JsiiAgent
+func (j JsiiAgent) GetValue() string {
+    return j.Value
 }
 
 
@@ -42307,7 +42311,7 @@ func (o *ObjectRefsInCollections) SumFromArray() float64  {
 
         Class: "ObjectRefsInCollections",
         Method: "SumFromArray",
-        Args: []string{"Array<@scope/jsii-calc-lib.Value>",},
+        Args: []string{"Array<@scope/jsii-calc-lib.NumericValue>",},
 
     })
     return 0.0
@@ -42318,7 +42322,7 @@ func (o *ObjectRefsInCollections) SumFromMap() float64  {
 
         Class: "ObjectRefsInCollections",
         Method: "SumFromMap",
-        Args: []string{"Map<string => @scope/jsii-calc-lib.Value>",},
+        Args: []string{"Map<string => @scope/jsii-calc-lib.NumericValue>",},
 
     })
     return 0.0
@@ -45391,7 +45395,7 @@ public class Add extends software.amazon.jsii.tests.calculator.BinaryOperation {
      * @param rhs Right-hand side operand. This parameter is required.
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public Add(final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value lhs, final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value rhs) {
+    public Add(final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue lhs, final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue rhs) {
         super(software.amazon.jsii.JsiiObject.InitializationMode.JSII);
         software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this, new Object[] { java.util.Objects.requireNonNull(lhs, "lhs is required"), java.util.Objects.requireNonNull(rhs, "rhs is required") });
     }
@@ -46326,7 +46330,7 @@ public abstract class BinaryOperation extends software.amazon.jsii.tests.calcula
      * @param rhs Right-hand side operand. This parameter is required.
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    protected BinaryOperation(final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value lhs, final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value rhs) {
+    protected BinaryOperation(final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue lhs, final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue rhs) {
         super(software.amazon.jsii.JsiiObject.InitializationMode.JSII);
         software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this, new Object[] { java.util.Objects.requireNonNull(lhs, "lhs is required"), java.util.Objects.requireNonNull(rhs, "rhs is required") });
     }
@@ -46348,8 +46352,8 @@ public abstract class BinaryOperation extends software.amazon.jsii.tests.calcula
      * EXPERIMENTAL
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value getLhs() {
-        return this.jsiiGet("lhs", software.amazon.jsii.tests.calculator.lib.Value.class);
+    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue getLhs() {
+        return this.jsiiGet("lhs", software.amazon.jsii.tests.calculator.lib.NumericValue.class);
     }
 
     /**
@@ -46358,8 +46362,8 @@ public abstract class BinaryOperation extends software.amazon.jsii.tests.calcula
      * EXPERIMENTAL
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value getRhs() {
-        return this.jsiiGet("rhs", software.amazon.jsii.tests.calculator.lib.Value.class);
+    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue getRhs() {
+        return this.jsiiGet("rhs", software.amazon.jsii.tests.calculator.lib.NumericValue.class);
     }
 
     /**
@@ -46608,8 +46612,8 @@ public class Calculator extends software.amazon.jsii.tests.calculator.compositio
      */
     @Override
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value getExpression() {
-        return this.jsiiGet("expression", software.amazon.jsii.tests.calculator.lib.Value.class);
+    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue getExpression() {
+        return this.jsiiGet("expression", software.amazon.jsii.tests.calculator.lib.NumericValue.class);
     }
 
     /**
@@ -46618,8 +46622,8 @@ public class Calculator extends software.amazon.jsii.tests.calculator.compositio
      * EXPERIMENTAL
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public @org.jetbrains.annotations.NotNull java.util.List<software.amazon.jsii.tests.calculator.lib.Value> getOperationsLog() {
-        return java.util.Collections.unmodifiableList(this.jsiiGet("operationsLog", software.amazon.jsii.NativeType.listOf(software.amazon.jsii.NativeType.forClass(software.amazon.jsii.tests.calculator.lib.Value.class))));
+    public @org.jetbrains.annotations.NotNull java.util.List<software.amazon.jsii.tests.calculator.lib.NumericValue> getOperationsLog() {
+        return java.util.Collections.unmodifiableList(this.jsiiGet("operationsLog", software.amazon.jsii.NativeType.listOf(software.amazon.jsii.NativeType.forClass(software.amazon.jsii.tests.calculator.lib.NumericValue.class))));
     }
 
     /**
@@ -46628,8 +46632,8 @@ public class Calculator extends software.amazon.jsii.tests.calculator.compositio
      * EXPERIMENTAL
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public @org.jetbrains.annotations.NotNull java.util.Map<java.lang.String, java.util.List<software.amazon.jsii.tests.calculator.lib.Value>> getOperationsMap() {
-        return java.util.Collections.unmodifiableMap(this.jsiiGet("operationsMap", software.amazon.jsii.NativeType.mapOf(software.amazon.jsii.NativeType.listOf(software.amazon.jsii.NativeType.forClass(software.amazon.jsii.tests.calculator.lib.Value.class)))));
+    public @org.jetbrains.annotations.NotNull java.util.Map<java.lang.String, java.util.List<software.amazon.jsii.tests.calculator.lib.NumericValue>> getOperationsMap() {
+        return java.util.Collections.unmodifiableMap(this.jsiiGet("operationsMap", software.amazon.jsii.NativeType.mapOf(software.amazon.jsii.NativeType.listOf(software.amazon.jsii.NativeType.forClass(software.amazon.jsii.tests.calculator.lib.NumericValue.class)))));
     }
 
     /**
@@ -46638,8 +46642,8 @@ public class Calculator extends software.amazon.jsii.tests.calculator.compositio
      * EXPERIMENTAL
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value getCurr() {
-        return this.jsiiGet("curr", software.amazon.jsii.tests.calculator.lib.Value.class);
+    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue getCurr() {
+        return this.jsiiGet("curr", software.amazon.jsii.tests.calculator.lib.NumericValue.class);
     }
 
     /**
@@ -46648,7 +46652,7 @@ public class Calculator extends software.amazon.jsii.tests.calculator.compositio
      * EXPERIMENTAL
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public void setCurr(final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value value) {
+    public void setCurr(final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue value) {
         this.jsiiSet("curr", java.util.Objects.requireNonNull(value, "curr is required"));
     }
 
@@ -48679,7 +48683,7 @@ public interface DerivedStruct extends software.amazon.jsii.JsiiSerializable, so
      * EXPERIMENTAL
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    default @org.jetbrains.annotations.Nullable java.util.Map<java.lang.String, software.amazon.jsii.tests.calculator.lib.Value> getAnotherOptional() {
+    default @org.jetbrains.annotations.Nullable java.util.Map<java.lang.String, software.amazon.jsii.tests.calculator.lib.NumericValue> getAnotherOptional() {
         return null;
     }
 
@@ -48714,7 +48718,7 @@ public interface DerivedStruct extends software.amazon.jsii.JsiiSerializable, so
         private java.time.Instant anotherRequired;
         private java.lang.Boolean bool;
         private software.amazon.jsii.tests.calculator.DoubleTrouble nonPrimitive;
-        private java.util.Map<java.lang.String, software.amazon.jsii.tests.calculator.lib.Value> anotherOptional;
+        private java.util.Map<java.lang.String, software.amazon.jsii.tests.calculator.lib.NumericValue> anotherOptional;
         private java.lang.Object optionalAny;
         private java.util.List<java.lang.String> optionalArray;
         private java.lang.Number anumber;
@@ -48761,8 +48765,8 @@ public interface DerivedStruct extends software.amazon.jsii.JsiiSerializable, so
          */
         @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
         @SuppressWarnings("unchecked")
-        public Builder anotherOptional(java.util.Map<java.lang.String, ? extends software.amazon.jsii.tests.calculator.lib.Value> anotherOptional) {
-            this.anotherOptional = (java.util.Map<java.lang.String, software.amazon.jsii.tests.calculator.lib.Value>)anotherOptional;
+        public Builder anotherOptional(java.util.Map<java.lang.String, ? extends software.amazon.jsii.tests.calculator.lib.NumericValue> anotherOptional) {
+            this.anotherOptional = (java.util.Map<java.lang.String, software.amazon.jsii.tests.calculator.lib.NumericValue>)anotherOptional;
             return this;
         }
 
@@ -48844,7 +48848,7 @@ public interface DerivedStruct extends software.amazon.jsii.JsiiSerializable, so
         private final java.time.Instant anotherRequired;
         private final java.lang.Boolean bool;
         private final software.amazon.jsii.tests.calculator.DoubleTrouble nonPrimitive;
-        private final java.util.Map<java.lang.String, software.amazon.jsii.tests.calculator.lib.Value> anotherOptional;
+        private final java.util.Map<java.lang.String, software.amazon.jsii.tests.calculator.lib.NumericValue> anotherOptional;
         private final java.lang.Object optionalAny;
         private final java.util.List<java.lang.String> optionalArray;
         private final java.lang.Number anumber;
@@ -48860,7 +48864,7 @@ public interface DerivedStruct extends software.amazon.jsii.JsiiSerializable, so
             this.anotherRequired = this.jsiiGet("anotherRequired", java.time.Instant.class);
             this.bool = this.jsiiGet("bool", java.lang.Boolean.class);
             this.nonPrimitive = this.jsiiGet("nonPrimitive", software.amazon.jsii.tests.calculator.DoubleTrouble.class);
-            this.anotherOptional = this.jsiiGet("anotherOptional", software.amazon.jsii.NativeType.mapOf(software.amazon.jsii.NativeType.forClass(software.amazon.jsii.tests.calculator.lib.Value.class)));
+            this.anotherOptional = this.jsiiGet("anotherOptional", software.amazon.jsii.NativeType.mapOf(software.amazon.jsii.NativeType.forClass(software.amazon.jsii.tests.calculator.lib.NumericValue.class)));
             this.optionalAny = this.jsiiGet("optionalAny", java.lang.Object.class);
             this.optionalArray = this.jsiiGet("optionalArray", software.amazon.jsii.NativeType.listOf(software.amazon.jsii.NativeType.forClass(java.lang.String.class)));
             this.anumber = this.jsiiGet("anumber", java.lang.Number.class);
@@ -48872,12 +48876,12 @@ public interface DerivedStruct extends software.amazon.jsii.JsiiSerializable, so
          * Constructor that initializes the object based on literal property values passed by the {@link Builder}.
          */
         @SuppressWarnings("unchecked")
-        private Jsii$Proxy(final java.time.Instant anotherRequired, final java.lang.Boolean bool, final software.amazon.jsii.tests.calculator.DoubleTrouble nonPrimitive, final java.util.Map<java.lang.String, ? extends software.amazon.jsii.tests.calculator.lib.Value> anotherOptional, final java.lang.Object optionalAny, final java.util.List<java.lang.String> optionalArray, final java.lang.Number anumber, final java.lang.String astring, final java.util.List<java.lang.String> firstOptional) {
+        private Jsii$Proxy(final java.time.Instant anotherRequired, final java.lang.Boolean bool, final software.amazon.jsii.tests.calculator.DoubleTrouble nonPrimitive, final java.util.Map<java.lang.String, ? extends software.amazon.jsii.tests.calculator.lib.NumericValue> anotherOptional, final java.lang.Object optionalAny, final java.util.List<java.lang.String> optionalArray, final java.lang.Number anumber, final java.lang.String astring, final java.util.List<java.lang.String> firstOptional) {
             super(software.amazon.jsii.JsiiObject.InitializationMode.JSII);
             this.anotherRequired = java.util.Objects.requireNonNull(anotherRequired, "anotherRequired is required");
             this.bool = java.util.Objects.requireNonNull(bool, "bool is required");
             this.nonPrimitive = java.util.Objects.requireNonNull(nonPrimitive, "nonPrimitive is required");
-            this.anotherOptional = (java.util.Map<java.lang.String, software.amazon.jsii.tests.calculator.lib.Value>)anotherOptional;
+            this.anotherOptional = (java.util.Map<java.lang.String, software.amazon.jsii.tests.calculator.lib.NumericValue>)anotherOptional;
             this.optionalAny = optionalAny;
             this.optionalArray = optionalArray;
             this.anumber = java.util.Objects.requireNonNull(anumber, "anumber is required");
@@ -48901,7 +48905,7 @@ public interface DerivedStruct extends software.amazon.jsii.JsiiSerializable, so
         }
 
         @Override
-        public java.util.Map<java.lang.String, software.amazon.jsii.tests.calculator.lib.Value> getAnotherOptional() {
+        public java.util.Map<java.lang.String, software.amazon.jsii.tests.calculator.lib.NumericValue> getAnotherOptional() {
             return this.anotherOptional;
         }
 
@@ -54544,8 +54548,8 @@ public class JsiiAgent extends software.amazon.jsii.JsiiObject {
      * EXPERIMENTAL
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public static @org.jetbrains.annotations.Nullable java.lang.String getJsiiAgent() {
-        return software.amazon.jsii.JsiiObject.jsiiStaticGet(software.amazon.jsii.tests.calculator.JsiiAgent.class, "jsiiAgent", java.lang.String.class);
+    public static @org.jetbrains.annotations.Nullable java.lang.String getValue() {
+        return software.amazon.jsii.JsiiObject.jsiiStaticGet(software.amazon.jsii.tests.calculator.JsiiAgent.class, "value", java.lang.String.class);
     }
 }
 
@@ -55104,7 +55108,7 @@ public class Multiply extends software.amazon.jsii.tests.calculator.BinaryOperat
      * @param rhs Right-hand side operand. This parameter is required.
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public Multiply(final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value lhs, final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value rhs) {
+    public Multiply(final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue lhs, final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue rhs) {
         super(software.amazon.jsii.JsiiObject.InitializationMode.JSII);
         software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this, new Object[] { java.util.Objects.requireNonNull(lhs, "lhs is required"), java.util.Objects.requireNonNull(rhs, "rhs is required") });
     }
@@ -55194,7 +55198,7 @@ public class Negate extends software.amazon.jsii.tests.calculator.UnaryOperation
      * @param operand This parameter is required.
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public Negate(final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value operand) {
+    public Negate(final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue operand) {
         super(software.amazon.jsii.JsiiObject.InitializationMode.JSII);
         software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this, new Object[] { java.util.Objects.requireNonNull(operand, "operand is required") });
     }
@@ -55851,7 +55855,7 @@ public class ObjectRefsInCollections extends software.amazon.jsii.JsiiObject {
      * @param values This parameter is required.
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public @org.jetbrains.annotations.NotNull java.lang.Number sumFromArray(final @org.jetbrains.annotations.NotNull java.util.List<software.amazon.jsii.tests.calculator.lib.Value> values) {
+    public @org.jetbrains.annotations.NotNull java.lang.Number sumFromArray(final @org.jetbrains.annotations.NotNull java.util.List<software.amazon.jsii.tests.calculator.lib.NumericValue> values) {
         return this.jsiiCall("sumFromArray", java.lang.Number.class, new Object[] { java.util.Objects.requireNonNull(values, "values is required") });
     }
 
@@ -55863,7 +55867,7 @@ public class ObjectRefsInCollections extends software.amazon.jsii.JsiiObject {
      * @param values This parameter is required.
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public @org.jetbrains.annotations.NotNull java.lang.Number sumFromMap(final @org.jetbrains.annotations.NotNull java.util.Map<java.lang.String, software.amazon.jsii.tests.calculator.lib.Value> values) {
+    public @org.jetbrains.annotations.NotNull java.lang.Number sumFromMap(final @org.jetbrains.annotations.NotNull java.util.Map<java.lang.String, software.amazon.jsii.tests.calculator.lib.NumericValue> values) {
         return this.jsiiCall("sumFromMap", java.lang.Number.class, new Object[] { java.util.Objects.requireNonNull(values, "values is required") });
     }
 }
@@ -56676,7 +56680,7 @@ public class Power extends software.amazon.jsii.tests.calculator.composition.Com
      * @param pow The number of times to multiply. This parameter is required.
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public Power(final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value base, final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value pow) {
+    public Power(final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue base, final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue pow) {
         super(software.amazon.jsii.JsiiObject.InitializationMode.JSII);
         software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this, new Object[] { java.util.Objects.requireNonNull(base, "base is required"), java.util.Objects.requireNonNull(pow, "pow is required") });
     }
@@ -56687,8 +56691,8 @@ public class Power extends software.amazon.jsii.tests.calculator.composition.Com
      * EXPERIMENTAL
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value getBase() {
-        return this.jsiiGet("base", software.amazon.jsii.tests.calculator.lib.Value.class);
+    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue getBase() {
+        return this.jsiiGet("base", software.amazon.jsii.tests.calculator.lib.NumericValue.class);
     }
 
     /**
@@ -56700,8 +56704,8 @@ public class Power extends software.amazon.jsii.tests.calculator.composition.Com
      */
     @Override
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value getExpression() {
-        return this.jsiiGet("expression", software.amazon.jsii.tests.calculator.lib.Value.class);
+    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue getExpression() {
+        return this.jsiiGet("expression", software.amazon.jsii.tests.calculator.lib.NumericValue.class);
     }
 
     /**
@@ -56710,8 +56714,8 @@ public class Power extends software.amazon.jsii.tests.calculator.composition.Com
      * EXPERIMENTAL
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value getPow() {
-        return this.jsiiGet("pow", software.amazon.jsii.tests.calculator.lib.Value.class);
+    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue getPow() {
+        return this.jsiiGet("pow", software.amazon.jsii.tests.calculator.lib.NumericValue.class);
     }
 }
 
@@ -59397,8 +59401,8 @@ public class Sum extends software.amazon.jsii.tests.calculator.composition.Compo
      */
     @Override
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value getExpression() {
-        return this.jsiiGet("expression", software.amazon.jsii.tests.calculator.lib.Value.class);
+    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue getExpression() {
+        return this.jsiiGet("expression", software.amazon.jsii.tests.calculator.lib.NumericValue.class);
     }
 
     /**
@@ -59407,8 +59411,8 @@ public class Sum extends software.amazon.jsii.tests.calculator.composition.Compo
      * EXPERIMENTAL
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public @org.jetbrains.annotations.NotNull java.util.List<software.amazon.jsii.tests.calculator.lib.Value> getParts() {
-        return java.util.Collections.unmodifiableList(this.jsiiGet("parts", software.amazon.jsii.NativeType.listOf(software.amazon.jsii.NativeType.forClass(software.amazon.jsii.tests.calculator.lib.Value.class))));
+    public @org.jetbrains.annotations.NotNull java.util.List<software.amazon.jsii.tests.calculator.lib.NumericValue> getParts() {
+        return java.util.Collections.unmodifiableList(this.jsiiGet("parts", software.amazon.jsii.NativeType.listOf(software.amazon.jsii.NativeType.forClass(software.amazon.jsii.tests.calculator.lib.NumericValue.class))));
     }
 
     /**
@@ -59417,7 +59421,7 @@ public class Sum extends software.amazon.jsii.tests.calculator.composition.Compo
      * EXPERIMENTAL
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public void setParts(final @org.jetbrains.annotations.NotNull java.util.List<software.amazon.jsii.tests.calculator.lib.Value> value) {
+    public void setParts(final @org.jetbrains.annotations.NotNull java.util.List<software.amazon.jsii.tests.calculator.lib.NumericValue> value) {
         this.jsiiSet("parts", java.util.Objects.requireNonNull(value, "parts is required"));
     }
 }
@@ -60369,7 +60373,7 @@ public abstract class UnaryOperation extends software.amazon.jsii.tests.calculat
      * @param operand This parameter is required.
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    protected UnaryOperation(final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value operand) {
+    protected UnaryOperation(final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue operand) {
         super(software.amazon.jsii.JsiiObject.InitializationMode.JSII);
         software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this, new Object[] { java.util.Objects.requireNonNull(operand, "operand is required") });
     }
@@ -60378,8 +60382,8 @@ public abstract class UnaryOperation extends software.amazon.jsii.tests.calculat
      * EXPERIMENTAL
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value getOperand() {
-        return this.jsiiGet("operand", software.amazon.jsii.tests.calculator.lib.Value.class);
+    public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue getOperand() {
+        return this.jsiiGet("operand", software.amazon.jsii.tests.calculator.lib.NumericValue.class);
     }
 
     /**
@@ -61148,7 +61152,7 @@ public abstract class CompositeOperation extends software.amazon.jsii.tests.calc
      * EXPERIMENTAL
      */
     @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-    public abstract @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value getExpression();
+    public abstract @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue getExpression();
 
     /**
      * The value.
@@ -61261,8 +61265,8 @@ public abstract class CompositeOperation extends software.amazon.jsii.tests.calc
          */
         @Override
         @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental)
-        public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.Value getExpression() {
-            return this.jsiiGet("expression", software.amazon.jsii.tests.calculator.lib.Value.class);
+        public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.lib.NumericValue getExpression() {
+            return this.jsiiGet("expression", software.amazon.jsii.tests.calculator.lib.NumericValue.class);
         }
 
         /**
@@ -63702,7 +63706,7 @@ class AllTypes(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.AllTypes"):
     @jsii.member(jsii_name="unionArrayProperty")
     def union_array_property(
         self,
-    ) -> typing.List[typing.Union[jsii.Number, scope.jsii_calc_lib.Value]]:
+    ) -> typing.List[typing.Union[jsii.Number, scope.jsii_calc_lib.NumericValue]]:
         """
         stability
         :stability: experimental
@@ -63712,7 +63716,7 @@ class AllTypes(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.AllTypes"):
     @union_array_property.setter # type: ignore
     def union_array_property(
         self,
-        value: typing.List[typing.Union[jsii.Number, scope.jsii_calc_lib.Value]],
+        value: typing.List[typing.Union[jsii.Number, scope.jsii_calc_lib.NumericValue]],
     ) -> None:
         jsii.set(self, "unionArrayProperty", value)
 
@@ -64077,8 +64081,8 @@ class BinaryOperation(
 
     def __init__(
         self,
-        lhs: scope.jsii_calc_lib.Value,
-        rhs: scope.jsii_calc_lib.Value,
+        lhs: scope.jsii_calc_lib.NumericValue,
+        rhs: scope.jsii_calc_lib.NumericValue,
     ) -> None:
         """Creates a BinaryOperation.
 
@@ -64101,7 +64105,7 @@ class BinaryOperation(
 
     @builtins.property # type: ignore
     @jsii.member(jsii_name="lhs")
-    def lhs(self) -> scope.jsii_calc_lib.Value:
+    def lhs(self) -> scope.jsii_calc_lib.NumericValue:
         """Left-hand side operand.
 
         stability
@@ -64111,7 +64115,7 @@ class BinaryOperation(
 
     @builtins.property # type: ignore
     @jsii.member(jsii_name="rhs")
-    def rhs(self) -> scope.jsii_calc_lib.Value:
+    def rhs(self) -> scope.jsii_calc_lib.NumericValue:
         """Right-hand side operand.
 
         stability
@@ -64289,7 +64293,7 @@ class Calculator(
 
     @builtins.property # type: ignore
     @jsii.member(jsii_name="expression")
-    def expression(self) -> scope.jsii_calc_lib.Value:
+    def expression(self) -> scope.jsii_calc_lib.NumericValue:
         """Returns the expression.
 
         stability
@@ -64299,7 +64303,7 @@ class Calculator(
 
     @builtins.property # type: ignore
     @jsii.member(jsii_name="operationsLog")
-    def operations_log(self) -> typing.List[scope.jsii_calc_lib.Value]:
+    def operations_log(self) -> typing.List[scope.jsii_calc_lib.NumericValue]:
         """A log of all operations.
 
         stability
@@ -64311,7 +64315,7 @@ class Calculator(
     @jsii.member(jsii_name="operationsMap")
     def operations_map(
         self,
-    ) -> typing.Mapping[builtins.str, typing.List[scope.jsii_calc_lib.Value]]:
+    ) -> typing.Mapping[builtins.str, typing.List[scope.jsii_calc_lib.NumericValue]]:
         """A map of per operation name of all operations performed.
 
         stability
@@ -64321,7 +64325,7 @@ class Calculator(
 
     @builtins.property # type: ignore
     @jsii.member(jsii_name="curr")
-    def curr(self) -> scope.jsii_calc_lib.Value:
+    def curr(self) -> scope.jsii_calc_lib.NumericValue:
         """The current value.
 
         stability
@@ -64330,7 +64334,7 @@ class Calculator(
         return jsii.get(self, "curr")
 
     @curr.setter # type: ignore
-    def curr(self, value: scope.jsii_calc_lib.Value) -> None:
+    def curr(self, value: scope.jsii_calc_lib.NumericValue) -> None:
         jsii.set(self, "curr", value)
 
     @builtins.property # type: ignore
@@ -65329,7 +65333,7 @@ class DerivedStruct(scope.jsii_calc_lib.MyFirstStruct):
         another_required: datetime.datetime,
         bool: builtins.bool,
         non_primitive: "DoubleTrouble",
-        another_optional: typing.Optional[typing.Mapping[builtins.str, scope.jsii_calc_lib.Value]] = None,
+        another_optional: typing.Optional[typing.Mapping[builtins.str, scope.jsii_calc_lib.NumericValue]] = None,
         optional_any: typing.Any = None,
         optional_array: typing.Optional[typing.List[builtins.str]] = None,
     ) -> None:
@@ -65429,7 +65433,7 @@ class DerivedStruct(scope.jsii_calc_lib.MyFirstStruct):
     @builtins.property
     def another_optional(
         self,
-    ) -> typing.Optional[typing.Mapping[builtins.str, scope.jsii_calc_lib.Value]]:
+    ) -> typing.Optional[typing.Mapping[builtins.str, scope.jsii_calc_lib.NumericValue]]:
         """This is optional.
 
         stability
@@ -66472,7 +66476,7 @@ class GiveMeStructs(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.GiveMeStructs"
         another_required: datetime.datetime,
         bool: builtins.bool,
         non_primitive: "DoubleTrouble",
-        another_optional: typing.Optional[typing.Mapping[builtins.str, scope.jsii_calc_lib.Value]] = None,
+        another_optional: typing.Optional[typing.Mapping[builtins.str, scope.jsii_calc_lib.NumericValue]] = None,
         optional_any: typing.Any = None,
         optional_array: typing.Optional[typing.List[builtins.str]] = None,
         anumber: jsii.Number,
@@ -66515,7 +66519,7 @@ class GiveMeStructs(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.GiveMeStructs"
         another_required: datetime.datetime,
         bool: builtins.bool,
         non_primitive: "DoubleTrouble",
-        another_optional: typing.Optional[typing.Mapping[builtins.str, scope.jsii_calc_lib.Value]] = None,
+        another_optional: typing.Optional[typing.Mapping[builtins.str, scope.jsii_calc_lib.NumericValue]] = None,
         optional_any: typing.Any = None,
         optional_array: typing.Optional[typing.List[builtins.str]] = None,
         anumber: jsii.Number,
@@ -69195,14 +69199,14 @@ class JsiiAgent(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.JsiiAgent"):
         jsii.create(JsiiAgent, self, [])
 
     @jsii.python.classproperty # type: ignore
-    @jsii.member(jsii_name="jsiiAgent")
-    def jsii_agent(cls) -> typing.Optional[builtins.str]:
+    @jsii.member(jsii_name="value")
+    def value(cls) -> typing.Optional[builtins.str]:
         """Returns the value of the JSII_AGENT environment variable.
 
         stability
         :stability: experimental
         """
-        return jsii.sget(cls, "jsiiAgent")
+        return jsii.sget(cls, "value")
 
 
 class JsonFormatter(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.JsonFormatter"):
@@ -69538,8 +69542,8 @@ class Multiply(
 
     def __init__(
         self,
-        lhs: scope.jsii_calc_lib.Value,
-        rhs: scope.jsii_calc_lib.Value,
+        lhs: scope.jsii_calc_lib.NumericValue,
+        rhs: scope.jsii_calc_lib.NumericValue,
     ) -> None:
         """Creates a BinaryOperation.
 
@@ -69925,7 +69929,7 @@ class ObjectRefsInCollections(
     @jsii.member(jsii_name="sumFromArray")
     def sum_from_array(
         self,
-        values: typing.List[scope.jsii_calc_lib.Value],
+        values: typing.List[scope.jsii_calc_lib.NumericValue],
     ) -> jsii.Number:
         """Returns the sum of all values.
 
@@ -69939,7 +69943,7 @@ class ObjectRefsInCollections(
     @jsii.member(jsii_name="sumFromMap")
     def sum_from_map(
         self,
-        values: typing.Mapping[builtins.str, scope.jsii_calc_lib.Value],
+        values: typing.Mapping[builtins.str, scope.jsii_calc_lib.NumericValue],
     ) -> jsii.Number:
         """Returns the sum of all values in a map.
 
@@ -70389,8 +70393,8 @@ class Power(
 
     def __init__(
         self,
-        base: scope.jsii_calc_lib.Value,
-        pow: scope.jsii_calc_lib.Value,
+        base: scope.jsii_calc_lib.NumericValue,
+        pow: scope.jsii_calc_lib.NumericValue,
     ) -> None:
         """Creates a Power operation.
 
@@ -70404,7 +70408,7 @@ class Power(
 
     @builtins.property # type: ignore
     @jsii.member(jsii_name="base")
-    def base(self) -> scope.jsii_calc_lib.Value:
+    def base(self) -> scope.jsii_calc_lib.NumericValue:
         """The base of the power.
 
         stability
@@ -70414,7 +70418,7 @@ class Power(
 
     @builtins.property # type: ignore
     @jsii.member(jsii_name="expression")
-    def expression(self) -> scope.jsii_calc_lib.Value:
+    def expression(self) -> scope.jsii_calc_lib.NumericValue:
         """The expression that this operation consists of.
 
         Must be implemented by derived classes.
@@ -70426,7 +70430,7 @@ class Power(
 
     @builtins.property # type: ignore
     @jsii.member(jsii_name="pow")
-    def pow(self) -> scope.jsii_calc_lib.Value:
+    def pow(self) -> scope.jsii_calc_lib.NumericValue:
         """The number of times to multiply.
 
         stability
@@ -71922,7 +71926,7 @@ class Sum(
 
     @builtins.property # type: ignore
     @jsii.member(jsii_name="expression")
-    def expression(self) -> scope.jsii_calc_lib.Value:
+    def expression(self) -> scope.jsii_calc_lib.NumericValue:
         """The expression that this operation consists of.
 
         Must be implemented by derived classes.
@@ -71934,7 +71938,7 @@ class Sum(
 
     @builtins.property # type: ignore
     @jsii.member(jsii_name="parts")
-    def parts(self) -> typing.List[scope.jsii_calc_lib.Value]:
+    def parts(self) -> typing.List[scope.jsii_calc_lib.NumericValue]:
         """The parts to sum.
 
         stability
@@ -71943,7 +71947,7 @@ class Sum(
         return jsii.get(self, "parts")
 
     @parts.setter # type: ignore
-    def parts(self, value: typing.List[scope.jsii_calc_lib.Value]) -> None:
+    def parts(self, value: typing.List[scope.jsii_calc_lib.NumericValue]) -> None:
         jsii.set(self, "parts", value)
 
 
@@ -72377,7 +72381,7 @@ class UnaryOperation(
     def __jsii_proxy_class__():
         return _UnaryOperationProxy
 
-    def __init__(self, operand: scope.jsii_calc_lib.Value) -> None:
+    def __init__(self, operand: scope.jsii_calc_lib.NumericValue) -> None:
         """
         :param operand: -
 
@@ -72388,7 +72392,7 @@ class UnaryOperation(
 
     @builtins.property # type: ignore
     @jsii.member(jsii_name="operand")
-    def operand(self) -> scope.jsii_calc_lib.Value:
+    def operand(self) -> scope.jsii_calc_lib.NumericValue:
         """
         stability
         :stability: experimental
@@ -72895,8 +72899,8 @@ class Add(BinaryOperation, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Add"):
 
     def __init__(
         self,
-        lhs: scope.jsii_calc_lib.Value,
-        rhs: scope.jsii_calc_lib.Value,
+        lhs: scope.jsii_calc_lib.NumericValue,
+        rhs: scope.jsii_calc_lib.NumericValue,
     ) -> None:
         """Creates a BinaryOperation.
 
@@ -73467,7 +73471,7 @@ class Negate(UnaryOperation, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Negat
     :stability: experimental
     """
 
-    def __init__(self, operand: scope.jsii_calc_lib.Value) -> None:
+    def __init__(self, operand: scope.jsii_calc_lib.NumericValue) -> None:
         """
         :param operand: -
 
@@ -73879,7 +73883,7 @@ class CompositeOperation(
     @builtins.property # type: ignore
     @jsii.member(jsii_name="expression")
     @abc.abstractmethod
-    def expression(self) -> scope.jsii_calc_lib.Value:
+    def expression(self) -> scope.jsii_calc_lib.NumericValue:
         """The expression that this operation consists of.
 
         Must be implemented by derived classes.
@@ -73970,7 +73974,7 @@ class _CompositeOperationProxy(
 ):
     @builtins.property # type: ignore
     @jsii.member(jsii_name="expression")
-    def expression(self) -> scope.jsii_calc_lib.Value:
+    def expression(self) -> scope.jsii_calc_lib.NumericValue:
         """The expression that this operation consists of.
 
         Must be implemented by derived classes.
diff --git a/packages/jsii-pacmak/test/build-test.sh b/packages/jsii-pacmak/test/build-test.sh
index 1dcf8e3b34..bbe51633ed 100755
--- a/packages/jsii-pacmak/test/build-test.sh
+++ b/packages/jsii-pacmak/test/build-test.sh
@@ -34,19 +34,23 @@ else
 fi
 python3 -m pip install --upgrade pip~=20.2 twine~=3.2
 
+# Provision a specific NuGet package cache
+NUGET_CACHE=${outdir}/.nuget/packages
+OPTS="--dotnet-nuget-global-packages-folder=${NUGET_CACHE}"
+
 # Single target, recursive build to a certain location
 clean_dists
 echo "Testing SINGLE TARGET, RECURSIVE build."
-../bin/jsii-pacmak -o ${outdir} --recurse ../../jsii-calc
+../bin/jsii-pacmak ${OPTS} -o ${outdir} --recurse ../../jsii-calc
 
 # Multiple targets, build one-by-one into own directory
 clean_dists
 echo "Testing ONE-BY-ONE build."
 for dir in $packagedirs; do
-    ../bin/jsii-pacmak $dir
+    ../bin/jsii-pacmak ${OPTS} $dir
 done
 
 # Multiple targets, build all at once into own directory
 clean_dists
 echo "Testing ALL-AT-ONCE build."
-../bin/jsii-pacmak --no-parallel $packagedirs
+../bin/jsii-pacmak ${OPTS} --no-parallel $packagedirs
diff --git a/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap b/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap
index a06859e170..9b20d40f1b 100644
--- a/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap
+++ b/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap
@@ -90,7 +90,7 @@ exports[`jsii-tree --all 1`] = `
  │ │ │   │   ├─┬ expression property (experimental)
  │ │ │   │   │ ├── abstract
  │ │ │   │   │ ├── immutable
- │ │ │   │   │ └── type: @scope/jsii-calc-lib.Value
+ │ │ │   │   │ └── type: @scope/jsii-calc-lib.NumericValue
  │ │ │   │   ├─┬ value property (experimental)
  │ │ │   │   │ ├── immutable
  │ │ │   │   │ └── type: number
@@ -269,9 +269,9 @@ exports[`jsii-tree --all 1`] = `
  │   │   ├─┬ <initializer>(lhs,rhs) initializer (experimental)
  │   │   │ └─┬ parameters
  │   │   │   ├─┬ lhs
- │   │   │   │ └── type: @scope/jsii-calc-lib.Value
+ │   │   │   │ └── type: @scope/jsii-calc-lib.NumericValue
  │   │   │   └─┬ rhs
- │   │   │     └── type: @scope/jsii-calc-lib.Value
+ │   │   │     └── type: @scope/jsii-calc-lib.NumericValue
  │   │   ├─┬ toString() method (experimental)
  │   │   │ └── returns: string
  │   │   └─┬ value property (experimental)
@@ -318,7 +318,7 @@ exports[`jsii-tree --all 1`] = `
  │   │   ├─┬ stringProperty property (experimental)
  │   │   │ └── type: string
  │   │   ├─┬ unionArrayProperty property (experimental)
- │   │   │ └── type: Array<number | @scope/jsii-calc-lib.Value>
+ │   │   │ └── type: Array<number | @scope/jsii-calc-lib.NumericValue>
  │   │   ├─┬ unionMapProperty property (experimental)
  │   │   │ └── type: Map<string => string | number | @scope/jsii-calc-lib.Number>
  │   │   ├─┬ unionProperty property (experimental)
@@ -427,17 +427,17 @@ exports[`jsii-tree --all 1`] = `
  │   │   ├─┬ <initializer>(lhs,rhs) initializer (experimental)
  │   │   │ └─┬ parameters
  │   │   │   ├─┬ lhs
- │   │   │   │ └── type: @scope/jsii-calc-lib.Value
+ │   │   │   │ └── type: @scope/jsii-calc-lib.NumericValue
  │   │   │   └─┬ rhs
- │   │   │     └── type: @scope/jsii-calc-lib.Value
+ │   │   │     └── type: @scope/jsii-calc-lib.NumericValue
  │   │   ├─┬ hello() method (experimental)
  │   │   │ └── returns: string
  │   │   ├─┬ lhs property (experimental)
  │   │   │ ├── immutable
- │   │   │ └── type: @scope/jsii-calc-lib.Value
+ │   │   │ └── type: @scope/jsii-calc-lib.NumericValue
  │   │   └─┬ rhs property (experimental)
  │   │     ├── immutable
- │   │     └── type: @scope/jsii-calc-lib.Value
+ │   │     └── type: @scope/jsii-calc-lib.NumericValue
  │   ├─┬ class BurriedAnonymousObject (experimental)
  │   │ └─┬ members
  │   │   ├── <initializer>() initializer (experimental)
@@ -477,15 +477,15 @@ exports[`jsii-tree --all 1`] = `
  │   │   │ └── returns: number
  │   │   ├─┬ expression property (experimental)
  │   │   │ ├── immutable
- │   │   │ └── type: @scope/jsii-calc-lib.Value
+ │   │   │ └── type: @scope/jsii-calc-lib.NumericValue
  │   │   ├─┬ operationsLog property (experimental)
  │   │   │ ├── immutable
- │   │   │ └── type: Array<@scope/jsii-calc-lib.Value>
+ │   │   │ └── type: Array<@scope/jsii-calc-lib.NumericValue>
  │   │   ├─┬ operationsMap property (experimental)
  │   │   │ ├── immutable
- │   │   │ └── type: Map<string => Array<@scope/jsii-calc-lib.Value>>
+ │   │   │ └── type: Map<string => Array<@scope/jsii-calc-lib.NumericValue>>
  │   │   ├─┬ curr property (experimental)
- │   │   │ └── type: @scope/jsii-calc-lib.Value
+ │   │   │ └── type: @scope/jsii-calc-lib.NumericValue
  │   │   ├─┬ maxValue property (experimental)
  │   │   │ └── type: Optional<number>
  │   │   └─┬ unionProperty property (experimental)
@@ -1154,7 +1154,7 @@ exports[`jsii-tree --all 1`] = `
  │   ├─┬ class JsiiAgent (experimental)
  │   │ └─┬ members
  │   │   ├── <initializer>() initializer (experimental)
- │   │   └─┬ static jsiiAgent property (experimental)
+ │   │   └─┬ static value property (experimental)
  │   │     ├── immutable
  │   │     ├── static
  │   │     └── type: Optional<string>
@@ -1220,9 +1220,9 @@ exports[`jsii-tree --all 1`] = `
  │   │   ├─┬ <initializer>(lhs,rhs) initializer (experimental)
  │   │   │ └─┬ parameters
  │   │   │   ├─┬ lhs
- │   │   │   │ └── type: @scope/jsii-calc-lib.Value
+ │   │   │   │ └── type: @scope/jsii-calc-lib.NumericValue
  │   │   │   └─┬ rhs
- │   │   │     └── type: @scope/jsii-calc-lib.Value
+ │   │   │     └── type: @scope/jsii-calc-lib.NumericValue
  │   │   ├─┬ farewell() method (experimental)
  │   │   │ └── returns: string
  │   │   ├─┬ goodbye() method (experimental)
@@ -1241,7 +1241,7 @@ exports[`jsii-tree --all 1`] = `
  │   │   ├─┬ <initializer>(operand) initializer (experimental)
  │   │   │ └─┬ parameters
  │   │   │   └─┬ operand
- │   │   │     └── type: @scope/jsii-calc-lib.Value
+ │   │   │     └── type: @scope/jsii-calc-lib.NumericValue
  │   │   ├─┬ farewell() method (experimental)
  │   │   │ └── returns: string
  │   │   ├─┬ goodbye() method (experimental)
@@ -1313,12 +1313,12 @@ exports[`jsii-tree --all 1`] = `
  │   │   ├─┬ sumFromArray(values) method (experimental)
  │   │   │ ├─┬ parameters
  │   │   │ │ └─┬ values
- │   │   │ │   └── type: Array<@scope/jsii-calc-lib.Value>
+ │   │   │ │   └── type: Array<@scope/jsii-calc-lib.NumericValue>
  │   │   │ └── returns: number
  │   │   └─┬ sumFromMap(values) method (experimental)
  │   │     ├─┬ parameters
  │   │     │ └─┬ values
- │   │     │   └── type: Map<string => @scope/jsii-calc-lib.Value>
+ │   │     │   └── type: Map<string => @scope/jsii-calc-lib.NumericValue>
  │   │     └── returns: number
  │   ├─┬ class ObjectWithPropertyProvider (experimental)
  │   │ └─┬ members
@@ -1423,18 +1423,18 @@ exports[`jsii-tree --all 1`] = `
  │   │   ├─┬ <initializer>(base,pow) initializer (experimental)
  │   │   │ └─┬ parameters
  │   │   │   ├─┬ base
- │   │   │   │ └── type: @scope/jsii-calc-lib.Value
+ │   │   │   │ └── type: @scope/jsii-calc-lib.NumericValue
  │   │   │   └─┬ pow
- │   │   │     └── type: @scope/jsii-calc-lib.Value
+ │   │   │     └── type: @scope/jsii-calc-lib.NumericValue
  │   │   ├─┬ base property (experimental)
  │   │   │ ├── immutable
- │   │   │ └── type: @scope/jsii-calc-lib.Value
+ │   │   │ └── type: @scope/jsii-calc-lib.NumericValue
  │   │   ├─┬ expression property (experimental)
  │   │   │ ├── immutable
- │   │   │ └── type: @scope/jsii-calc-lib.Value
+ │   │   │ └── type: @scope/jsii-calc-lib.NumericValue
  │   │   └─┬ pow property (experimental)
  │   │     ├── immutable
- │   │     └── type: @scope/jsii-calc-lib.Value
+ │   │     └── type: @scope/jsii-calc-lib.NumericValue
  │   ├─┬ class PropertyNamedProperty (experimental)
  │   │ └─┬ members
  │   │   ├── <initializer>() initializer (experimental)
@@ -1710,9 +1710,9 @@ exports[`jsii-tree --all 1`] = `
  │   │   ├── <initializer>() initializer (experimental)
  │   │   ├─┬ expression property (experimental)
  │   │   │ ├── immutable
- │   │   │ └── type: @scope/jsii-calc-lib.Value
+ │   │   │ └── type: @scope/jsii-calc-lib.NumericValue
  │   │   └─┬ parts property (experimental)
- │   │     └── type: Array<@scope/jsii-calc-lib.Value>
+ │   │     └── type: Array<@scope/jsii-calc-lib.NumericValue>
  │   ├─┬ class SupportsNiceJavaBuilder (experimental)
  │   │ ├── base: SupportsNiceJavaBuilderWithRequiredProps
  │   │ └─┬ members
@@ -1815,10 +1815,10 @@ exports[`jsii-tree --all 1`] = `
  │   │   ├─┬ <initializer>(operand) initializer (experimental)
  │   │   │ └─┬ parameters
  │   │   │   └─┬ operand
- │   │   │     └── type: @scope/jsii-calc-lib.Value
+ │   │   │     └── type: @scope/jsii-calc-lib.NumericValue
  │   │   └─┬ operand property (experimental)
  │   │     ├── immutable
- │   │     └── type: @scope/jsii-calc-lib.Value
+ │   │     └── type: @scope/jsii-calc-lib.NumericValue
  │   ├─┬ class UpcasingReflectable (experimental)
  │   │ ├── interfaces: IReflectable
  │   │ └─┬ members
@@ -1993,7 +1993,7 @@ exports[`jsii-tree --all 1`] = `
  │   │   ├─┬ anotherOptional property (experimental)
  │   │   │ ├── abstract
  │   │   │ ├── immutable
- │   │   │ └── type: Optional<Map<string => @scope/jsii-calc-lib.Value>>
+ │   │   │ └── type: Optional<Map<string => @scope/jsii-calc-lib.NumericValue>>
  │   │   ├─┬ optionalAny property (experimental)
  │   │   │ ├── abstract
  │   │   │ ├── immutable
@@ -2629,7 +2629,7 @@ exports[`jsii-tree --all 1`] = `
    │           └── type: any
    └─┬ types
      ├─┬ class Number (deprecated)
-     │ ├── base: Value
+     │ ├── base: NumericValue
      │ ├── interfaces: IDoublable
      │ └─┬ members
      │   ├─┬ <initializer>(value) initializer (deprecated)
@@ -2642,14 +2642,7 @@ exports[`jsii-tree --all 1`] = `
      │   └─┬ value property (deprecated)
      │     ├── immutable
      │     └── type: number
-     ├─┬ class Operation (deprecated)
-     │ ├── base: Value
-     │ └─┬ members
-     │   ├── <initializer>() initializer (deprecated)
-     │   └─┬ toString() method (deprecated)
-     │     ├── abstract
-     │     └── returns: string
-     ├─┬ class Value (deprecated)
+     ├─┬ class NumericValue (deprecated)
      │ ├── base: Base
      │ └─┬ members
      │   ├── <initializer>() initializer (deprecated)
@@ -2659,6 +2652,13 @@ exports[`jsii-tree --all 1`] = `
      │     ├── abstract
      │     ├── immutable
      │     └── type: number
+     ├─┬ class Operation (deprecated)
+     │ ├── base: NumericValue
+     │ └─┬ members
+     │   ├── <initializer>() initializer (deprecated)
+     │   └─┬ toString() method (deprecated)
+     │     ├── abstract
+     │     └── returns: string
      ├─┬ interface IDoublable (deprecated)
      │ └─┬ members
      │   └─┬ doubleValue property (deprecated)
@@ -3045,12 +3045,12 @@ exports[`jsii-tree --inheritance 1`] = `
    │     └── interface ReflectableEntry
    └─┬ types
      ├─┬ class Number
-     │ ├── base: Value
+     │ ├── base: NumericValue
      │ └── interfaces: IDoublable
-     ├─┬ class Operation
-     │ └── base: Value
-     ├─┬ class Value
+     ├─┬ class NumericValue
      │ └── base: Base
+     ├─┬ class Operation
+     │ └── base: NumericValue
      ├── interface IDoublable
      ├── interface IFriendly
      ├─┬ interface IThreeLevelsInterface
@@ -3600,7 +3600,7 @@ exports[`jsii-tree --members 1`] = `
  │   ├─┬ class JsiiAgent
  │   │ └─┬ members
  │   │   ├── <initializer>() initializer
- │   │   └── static jsiiAgent property
+ │   │   └── static value property
  │   ├─┬ class JsonFormatter
  │   │ └─┬ members
  │   │   ├── static anyArray() method
@@ -4243,15 +4243,15 @@ exports[`jsii-tree --members 1`] = `
      │   ├── <initializer>(value) initializer
      │   ├── doubleValue property
      │   └── value property
-     ├─┬ class Operation
-     │ └─┬ members
-     │   ├── <initializer>() initializer
-     │   └── toString() method
-     ├─┬ class Value
+     ├─┬ class NumericValue
      │ └─┬ members
      │   ├── <initializer>() initializer
      │   ├── toString() method
      │   └── value property
+     ├─┬ class Operation
+     │ └─┬ members
+     │   ├── <initializer>() initializer
+     │   └── toString() method
      ├─┬ interface IDoublable
      │ └─┬ members
      │   └── doubleValue property
@@ -4571,8 +4571,8 @@ exports[`jsii-tree --types 1`] = `
    │     └── interface ReflectableEntry
    └─┬ types
      ├── class Number
+     ├── class NumericValue
      ├── class Operation
-     ├── class Value
      ├── interface IDoublable
      ├── interface IFriendly
      ├── interface IThreeLevelsInterface
diff --git a/packages/jsii-reflect/test/__snapshots__/type-system.test.js.snap b/packages/jsii-reflect/test/__snapshots__/type-system.test.js.snap
index 0106eb7ce9..3827deaab8 100644
--- a/packages/jsii-reflect/test/__snapshots__/type-system.test.js.snap
+++ b/packages/jsii-reflect/test/__snapshots__/type-system.test.js.snap
@@ -15,8 +15,8 @@ Array [
   "@scope/jsii-calc-base-of-base.Very",
   "@scope/jsii-calc-base.Base",
   "@scope/jsii-calc-lib.Number",
+  "@scope/jsii-calc-lib.NumericValue",
   "@scope/jsii-calc-lib.Operation",
-  "@scope/jsii-calc-lib.Value",
   "@scope/jsii-calc-lib.submodule.NestingClass",
   "@scope/jsii-calc-lib.submodule.NestingClass.NestedClass",
   "@scope/jsii-calc-lib.submodule.Reflector",
diff --git a/packages/jsii-reflect/test/independent.test.ts b/packages/jsii-reflect/test/independent.test.ts
index d6e331872a..2a42042fe7 100644
--- a/packages/jsii-reflect/test/independent.test.ts
+++ b/packages/jsii-reflect/test/independent.test.ts
@@ -6,7 +6,7 @@ test('get full github source location for a class or method', async () => {
   const assembly = await loadSource(
     `
     export class Foo {
-      public foo() {
+      public bar() {
         // Nothing to do
       }
     }
diff --git a/packages/jsii-reflect/test/type-system.test.ts b/packages/jsii-reflect/test/type-system.test.ts
index 42047d980d..cf42f9800a 100644
--- a/packages/jsii-reflect/test/type-system.test.ts
+++ b/packages/jsii-reflect/test/type-system.test.ts
@@ -183,7 +183,7 @@ describe('@deprecated', () => {
 test('overridden member knows about both parent types', async () => {
   const ts = await typeSystemFromSource(`
     export class Foo {
-      public foo() {
+      public bar() {
         Array.isArray(3);
       }
 
@@ -201,7 +201,7 @@ test('overridden member knows about both parent types', async () => {
 
   const superType = ts.findClass('testpkg.Foo');
   const subType = ts.findClass('testpkg.SubFoo');
-  const fooMethod = subType.allMethods.find((m) => m.name === 'foo')!;
+  const fooMethod = subType.allMethods.find((m) => m.name === 'bar')!;
   const booMethod = subType.allMethods.find((m) => m.name === 'boo')!;
 
   expect(fooMethod.parentType).toBe(subType);
@@ -243,7 +243,7 @@ describe('Stability', () => {
             Array.isArray(3);
           }
 
-          public foo() {
+          public bar() {
             Array.isArray(3);
           }
         }
@@ -256,7 +256,7 @@ describe('Stability', () => {
       `);
       const classType = ts.findClass('testpkg.SubFoo');
       const initializer = classType.initializer!;
-      const method = classType.allMethods.find((m) => m.name === 'foo')!;
+      const method = classType.allMethods.find((m) => m.name === 'bar')!;
 
       expect(initializer.docs.stability).toEqual(Stability.Experimental);
       expect(method.docs.stability).toEqual(Stability.Experimental);
@@ -278,7 +278,7 @@ describe('Stability', () => {
           /**
            * @experimental
            */
-          public foo() {
+          public bar() {
             Array.isArray(3);
           }
         }
@@ -292,7 +292,7 @@ describe('Stability', () => {
 
       const classType = ts.findClass('testpkg.SubFoo');
       const initializer = classType.initializer!;
-      const method = classType.allMethods.find((m) => m.name === 'foo')!;
+      const method = classType.allMethods.find((m) => m.name === 'bar')!;
 
       expect(initializer.docs.stability).toEqual(Stability.Experimental);
       expect(method.docs.stability).toEqual(Stability.Experimental);
@@ -314,7 +314,7 @@ describe('Stability', () => {
           /**
            * @stable
            */
-          public foo() {
+          public bar() {
             Array.isArray(3);
           }
         }
@@ -328,7 +328,7 @@ describe('Stability', () => {
 
       const classType = ts.findClass('testpkg.SubFoo');
       const initializer = classType.initializer!;
-      const method = classType.allMethods.find((m) => m.name === 'foo')!;
+      const method = classType.allMethods.find((m) => m.name === 'bar')!;
 
       expect(initializer.docs.stability).toEqual(Stability.Experimental);
       expect(method.docs.stability).toEqual(Stability.Experimental);
@@ -340,7 +340,7 @@ describe('Stability', () => {
          * @stability external
          */
         export class Foo {
-          public foo() {
+          public bar() {
             Array.isArray(3);
           }
         }
@@ -353,7 +353,7 @@ describe('Stability', () => {
       `);
 
       const classType = ts.findClass('testpkg.SubFoo');
-      const method = classType.allMethods.find((m) => m.name === 'foo')!;
+      const method = classType.allMethods.find((m) => m.name === 'bar')!;
 
       expect(method.docs.stability).toEqual(Stability.External);
     });
diff --git a/packages/jsii/lib/assembler.ts b/packages/jsii/lib/assembler.ts
index 07611225b9..dee7047f2c 100644
--- a/packages/jsii/lib/assembler.ts
+++ b/packages/jsii/lib/assembler.ts
@@ -1331,6 +1331,7 @@ export class Assembler implements Emitter {
             member,
             jsiiType,
             ctx.replaceStability(jsiiType.docs?.stability),
+            classDecl,
           );
         } else if (
           ts.isPropertyDeclaration(memberDecl) ||
@@ -1342,6 +1343,7 @@ export class Assembler implements Emitter {
             member,
             jsiiType,
             ctx.replaceStability(jsiiType.docs?.stability),
+            classDecl,
           );
         } else {
           this._diagnostic(
@@ -1418,7 +1420,12 @@ export class Assembler implements Emitter {
             !this._isPrivateOrInternal(param)
           ) {
             // eslint-disable-next-line no-await-in-loop
-            await this._visitProperty(param, jsiiType, memberEmitContext);
+            await this._visitProperty(
+              param,
+              jsiiType,
+              memberEmitContext,
+              ctorDeclaration.parent,
+            );
           }
         }
       }
@@ -1763,6 +1770,8 @@ export class Assembler implements Emitter {
             member,
             jsiiType,
             ctx.replaceStability(jsiiType.docs?.stability),
+            (type.symbol.valueDeclaration ??
+              type.symbol.declarations[0]) as ts.InterfaceDeclaration,
           );
         } else if (
           ts.isPropertyDeclaration(member.valueDeclaration) ||
@@ -1774,6 +1783,8 @@ export class Assembler implements Emitter {
             member,
             jsiiType,
             ctx.replaceStability(jsiiType.docs?.stability),
+            (type.symbol.valueDeclaration ??
+              type.symbol.declarations[0]) as ts.InterfaceDeclaration,
           );
         } else {
           this._diagnostic(
@@ -1898,6 +1909,7 @@ export class Assembler implements Emitter {
     symbol: ts.Symbol,
     type: spec.ClassType | spec.InterfaceType,
     ctx: EmitContext,
+    declaringTypeDecl: ts.ClassLikeDeclaration | ts.InterfaceDeclaration,
   ) {
     if (LOG.isTraceEnabled()) {
       LOG.trace(
@@ -1921,9 +1933,35 @@ export class Assembler implements Emitter {
       );
       return;
     }
+
+    if (Case.pascal(type.name) === Case.pascal(symbol.name)) {
+      this._diagnostic(
+        declaration.name,
+        ts.DiagnosticCategory.Warning,
+        `Methods should not be named like the ${type.kind} declaring them (${type.kind} is ${type.name}, method is ${symbol.name}), as the ${type.kind} will have to be renamed to ${type.name}_ in C#`,
+        [
+          {
+            category: ts.DiagnosticCategory.Message,
+            code: JSII_DIAGNOSTICS_CODE,
+            file: declaringTypeDecl.getSourceFile(),
+            start: (declaringTypeDecl.name ?? declaringTypeDecl).getStart(
+              declaringTypeDecl.getSourceFile(),
+            ),
+            length:
+              (declaringTypeDecl.name ?? declaringTypeDecl).getEnd() -
+              (declaringTypeDecl.name ?? declaringTypeDecl).getStart(
+                declaringTypeDecl.getSourceFile(),
+              ),
+            messageText: `The declaring ${type.kind} is introduced here`,
+          },
+        ],
+      );
+      return;
+    }
+
     if (isProhibitedMemberName(symbol.name)) {
       this._diagnostic(
-        declaration,
+        declaration.name,
         ts.DiagnosticCategory.Error,
         `Prohibited member name: ${symbol.name}`,
       );
@@ -2034,6 +2072,7 @@ export class Assembler implements Emitter {
     symbol: ts.Symbol,
     type: spec.ClassType | spec.InterfaceType,
     ctx: EmitContext,
+    declaringTypeDecl: ts.ClassLikeDeclaration | ts.InterfaceDeclaration,
   ) {
     if (type.properties?.find((p) => p.name === symbol.name)) {
       /*
@@ -2051,6 +2090,38 @@ export class Assembler implements Emitter {
         )}`,
       );
     }
+
+    const declaration = symbol.valueDeclaration ?? symbol.declarations[0];
+    const signature = declaration as
+      | ts.PropertySignature
+      | ts.PropertyDeclaration
+      | ts.AccessorDeclaration
+      | ts.ParameterPropertyDeclaration;
+
+    if (Case.pascal(type.name) === Case.pascal(symbol.name)) {
+      this._diagnostic(
+        signature.name,
+        ts.DiagnosticCategory.Warning,
+        `Properties should not be named like the ${type.kind} declaring them (${type.kind} is ${type.name}, property is ${symbol.name}), as the ${type.kind} will have to be renamed to ${type.name}_ in C#`,
+        [
+          {
+            category: ts.DiagnosticCategory.Message,
+            code: JSII_DIAGNOSTICS_CODE,
+            file: declaringTypeDecl.getSourceFile(),
+            start: (declaringTypeDecl.name ?? declaringTypeDecl).getStart(
+              declaringTypeDecl.getSourceFile(),
+            ),
+            length:
+              (declaringTypeDecl.name ?? declaringTypeDecl).getEnd() -
+              (declaringTypeDecl.name ?? declaringTypeDecl).getStart(
+                declaringTypeDecl.getSourceFile(),
+              ),
+            messageText: `The declaring ${type.kind} is introduced here`,
+          },
+        ],
+      );
+    }
+
     if (isProhibitedMemberName(symbol.name)) {
       this._diagnostic(
         symbol.valueDeclaration,
@@ -2062,11 +2133,6 @@ export class Assembler implements Emitter {
 
     this._warnAboutReservedWords(symbol);
 
-    const signature = symbol.valueDeclaration as
-      | ts.PropertySignature
-      | ts.PropertyDeclaration
-      | ts.AccessorDeclaration
-      | ts.ParameterPropertyDeclaration;
     const property: spec.Property = {
       ...(await this._optionalValue(
         this._typeChecker.getTypeOfSymbolAtLocation(symbol, signature),
diff --git a/packages/jsii/test/__snapshots__/negatives.test.js.snap b/packages/jsii/test/__snapshots__/negatives.test.js.snap
index d9b1f709a2..b7599837fa 100644
--- a/packages/jsii/test/__snapshots__/negatives.test.js.snap
+++ b/packages/jsii/test/__snapshots__/negatives.test.js.snap
@@ -197,7 +197,7 @@ exports[`implementation-changes-types.3 1`] = `
 `;
 
 exports[`implementation-changes-types.4 1`] = `
-"error TS0: jsii.Something#something changes the type of property when implementing jsii.ISomething (expected jsii.Superclass, found jsii.Subclass)
+"error TS0: jsii.SomethingImpl#something changes the type of property when implementing jsii.ISomething (expected jsii.Superclass, found jsii.Subclass)
 "
 `;
 
@@ -267,12 +267,12 @@ exports[`inheritance-changes-types.3 1`] = `
 `;
 
 exports[`inheritance-changes-types.4 1`] = `
-"error TS0: jsii.SomethingSpecific#something changes the type of property when overriding jsii.Something (expected jsii.Superclass, found jsii.Subclass)
+"error TS0: jsii.SomethingSpecific#something changes the type of property when overriding jsii.SomethingUnspecific (expected jsii.Superclass, found jsii.Subclass)
 "
 `;
 
 exports[`inheritance-changes-types.5 1`] = `
-"error TS0: jsii.SomethingElse#something changes the type of property when overriding jsii.Something (expected jsii.Superclass, found jsii.Subclass)
+"error TS0: jsii.SomethingElse#something changes the type of property when overriding jsii.SomethingBase (expected jsii.Superclass, found jsii.Subclass)
 "
 `;
 
@@ -340,6 +340,37 @@ exports[`internal-underscore-interface.4 1`] = `
 "
 `;
 
+exports[`member-named-after-type 1`] = `
+"neg.member-named-after-type.ts:14:12 - warning TS9999: JSII: Properties should not be named like the interface declaring them (interface is MyStruct, property is myStruct), as the interface will have to be renamed to MyStruct_ in C#
+
+14   readonly myStruct: string;
+              ~~~~~~~~
+
+  neg.member-named-after-type.ts:13:18
+    13 export interface MyStruct {
+                        ~~~~~~~~
+    The declaring interface is introduced here
+neg.member-named-after-type.ts:4:19 - warning TS9999: JSII: Properties should not be named like the class declaring them (class is TypeName, property is typeName), as the class will have to be renamed to TypeName_ in C#
+
+4   public readonly typeName = 1337;
+                    ~~~~~~~~
+
+  neg.member-named-after-type.ts:3:14
+    3 export class TypeName {
+                   ~~~~~~~~
+    The declaring class is introduced here
+neg.member-named-after-type.ts:8:10 - warning TS9999: JSII: Methods should not be named like the class declaring them (class is OtherType, method is otherType), as the class will have to be renamed to OtherType_ in C#
+
+8   public otherType() {
+           ~~~~~~~~~
+
+  neg.member-named-after-type.ts:7:14
+    7 export class OtherType {
+                   ~~~~~~~~~
+    The declaring class is introduced here
+"
+`;
+
 exports[`method-name.1 1`] = `
 "error TS0: Method and non-static non-readonly property names must use camelCase: METHOD
 "
@@ -443,14 +474,10 @@ error TS0: jsii.ChildClass#property changes visibility when overriding jsii.Base
 `;
 
 exports[`prohibited-member-name 1`] = `
-"neg.prohibited-member-name.ts:4:3 - error TS9999: JSII: Prohibited member name: equals
+"neg.prohibited-member-name.ts:4:10 - error TS9999: JSII: Prohibited member name: equals
 
 4   public equals(): boolean {
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~
-5     return true;
-  ~~~~~~~~~~~~~~~~
-6   }
-  ~~~
+           ~~~~~~
 "
 `;
 
diff --git a/packages/jsii/test/docs.test.ts b/packages/jsii/test/docs.test.ts
index 6b51c2c16b..f2cd6da738 100644
--- a/packages/jsii/test/docs.test.ts
+++ b/packages/jsii/test/docs.test.ts
@@ -11,7 +11,7 @@ test('extract summary line from doc block, ends with a period', async () => {
      * Hello this is the documentation for this class
      */
     export class Foo {
-      public foo() { }
+      public bar() { }
     }
   `);
 
@@ -31,7 +31,7 @@ test('extract remarks from whitespace-separated doc block', async () => {
      * It looks pretty good, doesn't it?
      */
     export class Foo {
-      public foo() { }
+      public bar() { }
     }
   `);
 
@@ -49,7 +49,7 @@ test('separate long doc comment into summary and remarks', async () => {
      * doc block per API item and no structural separation.
      */
     export class Foo {
-      public foo() { }
+      public bar() { }
     }
   `);
 
@@ -71,7 +71,7 @@ test('separate non-space but newline terminated docs into summary&remarks', asyn
      * doc block per API item and no structural separation.
      */
     export class Foo {
-      public foo() { }
+      public bar() { }
     }
   `);
 
@@ -90,7 +90,7 @@ test('dont add period to summary that ends in exclamation mark', async () => {
      * I'm happy about this class!
      */
     export class Foo {
-      public foo() { }
+      public bar() { }
     }
   `);
 
@@ -106,7 +106,7 @@ test('parse method docs', async () => {
       /**
        * Do the foo
        */
-      public foo(arg: string) { Array.isArray(arg); }
+      public bar(arg: string) { Array.isArray(arg); }
     }
   `);
 
@@ -126,7 +126,7 @@ test('associate parameter comments with right parameter', async () => {
        *
        * @param arg First argument is best argument
        */
-      public foo(arg: string) { Array.isArray(arg); }
+      public bar(arg: string) { Array.isArray(arg); }
     }
   `);
 
@@ -147,16 +147,16 @@ test('read example', async () => {
        * @example
        *
        * // Example of fooing it up:
-       * new Foo().foo();
+       * new Foo().bar();
        */
-      public foo() {}
+      public bar() {}
     }
   `);
 
   const classType = assembly.types!['testpkg.Foo'] as spec.ClassType;
 
   expect(classType.methods![0].docs!.example).toBe(
-    '// Example of fooing it up:\n' + 'new Foo().foo();',
+    '// Example of fooing it up:\n' + 'new Foo().bar();',
   );
 });
 
@@ -200,7 +200,7 @@ test('read "returns" annotation', async () => {
        *
        * @returns Nothing, why would it?
        */
-      public foo(arg: string) { Array.isArray(arg); }
+      public bar(arg: string) { Array.isArray(arg); }
     }
   `);
 
@@ -218,7 +218,7 @@ test('can haz deprecated', async () => {
        *
        * @deprecated These days we do the bar
        */
-      public foo(arg: string) { Array.isArray(arg); }
+      public bar(arg: string) { Array.isArray(arg); }
     }
   `);
 
@@ -335,7 +335,7 @@ test('stability is inherited from parent type', async () => {
           Array.isArray(3);
         }
 
-        public foo() {
+        public bar() {
           Array.isArray(3);
         }
       }
@@ -344,7 +344,7 @@ test('stability is inherited from parent type', async () => {
 
     const classType = assembly.types!['testpkg.Foo'] as spec.ClassType;
     const initializer = classType.initializer!;
-    const method = classType.methods!.find((m) => m.name === 'foo')!;
+    const method = classType.methods!.find((m) => m.name === 'bar')!;
 
     expect(classType.docs!.stability).toBe(stability);
     expect(initializer.docs!.stability).toBe(stability);
diff --git a/packages/jsii/test/negatives/neg.implementation-changes-types.4.ts b/packages/jsii/test/negatives/neg.implementation-changes-types.4.ts
index 0d3c9ad79e..ee1973941c 100644
--- a/packages/jsii/test/negatives/neg.implementation-changes-types.4.ts
+++ b/packages/jsii/test/negatives/neg.implementation-changes-types.4.ts
@@ -5,6 +5,6 @@ export interface ISomething {
   something: Superclass;
 }
 
-export class Something implements ISomething {
+export class SomethingImpl implements ISomething {
   public something: Subclass = new Subclass();
 }
diff --git a/packages/jsii/test/negatives/neg.implementation-changes-types.5.ts b/packages/jsii/test/negatives/neg.implementation-changes-types.5.ts
index 395d364a9b..ea2a5bfd19 100644
--- a/packages/jsii/test/negatives/neg.implementation-changes-types.5.ts
+++ b/packages/jsii/test/negatives/neg.implementation-changes-types.5.ts
@@ -10,7 +10,7 @@ export interface ISomethingElse extends ISomething {
 }
 
 // Should still fail even though 2-level inheritance
-export class Something implements ISomethingElse {
+export class SomethingImpl implements ISomethingElse {
   public something: Subclass = new Subclass();
-  public addUnrelatedMember: number = 1;
+  public addUnrelatedMember = 1;
 }
diff --git a/packages/jsii/test/negatives/neg.inheritance-changes-types.4.ts b/packages/jsii/test/negatives/neg.inheritance-changes-types.4.ts
index ecad08428a..0092dc2062 100644
--- a/packages/jsii/test/negatives/neg.inheritance-changes-types.4.ts
+++ b/packages/jsii/test/negatives/neg.inheritance-changes-types.4.ts
@@ -1,10 +1,10 @@
 export class Superclass {}
 export class Subclass extends Superclass {}
 
-export class Something {
+export class SomethingUnspecific {
   public something = new Superclass();
 }
 
-export class SomethingSpecific extends Something {
+export class SomethingSpecific extends SomethingUnspecific {
   public something: Subclass = new Subclass();
 }
diff --git a/packages/jsii/test/negatives/neg.inheritance-changes-types.5.ts b/packages/jsii/test/negatives/neg.inheritance-changes-types.5.ts
index 2ace670740..5b46b8c6bf 100644
--- a/packages/jsii/test/negatives/neg.inheritance-changes-types.5.ts
+++ b/packages/jsii/test/negatives/neg.inheritance-changes-types.5.ts
@@ -1,16 +1,16 @@
 export class Superclass {}
 export class Subclass extends Superclass {}
 
-export class Something {
+export class SomethingBase {
   public something: Superclass = new Superclass();
 }
 
-export class SomethingElse extends Something {
-  public addUnrelatedMember: number = 3;
+export class SomethingElse extends SomethingBase {
+  public addUnrelatedMember = 3;
 }
 
 // Should still fail even though 2-level inheritance
 export class SomethingDifferent extends SomethingElse {
   public something: Subclass = new Subclass();
-  public addUnrelatedMember: number = 1;
+  public addUnrelatedMember = 1;
 }
diff --git a/packages/jsii/test/negatives/neg.member-named-after-type.ts b/packages/jsii/test/negatives/neg.member-named-after-type.ts
new file mode 100644
index 0000000000..f93e0b52af
--- /dev/null
+++ b/packages/jsii/test/negatives/neg.member-named-after-type.ts
@@ -0,0 +1,15 @@
+///!STRICT!
+
+export class TypeName {
+  public readonly typeName = 1337;
+}
+
+export class OtherType {
+  public otherType() {
+    return;
+  }
+}
+
+export interface MyStruct {
+  readonly myStruct: string;
+}