diff --git a/base/schema-flow/test/inputs/schema/any.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/any.schema/default/TopLevel.js
index dbe7769..9b41bf2 100644
--- a/base/schema-flow/test/inputs/schema/any.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/any.schema/default/TopLevel.js
@@ -12,7 +12,7 @@
 export type TopLevel = {
     foo:    mixed;
     values: { [key: string]: mixed };
-    [property: string]: mixed | mixed | { [key: string]: mixed };
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/bool-string.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/bool-string.schema/default/TopLevel.js
index 538997b..de3bb1e 100644
--- a/base/schema-flow/test/inputs/schema/bool-string.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/bool-string.schema/default/TopLevel.js
@@ -17,7 +17,7 @@ export type TopLevel = {
     optional?:            string;
     unionWithBool:        UnionWithBool;
     unionWithBoolAndEnum: UnionWithBool;
-    [property: string]: mixed | (null | string)[] | string[] | null | string | string | string | UnionWithBool | UnionWithBool;
+    [property: string]: mixed;
 };
 
 export type UnionWithBool = boolean | string;
diff --git a/base/schema-flow/test/inputs/schema/camelCase.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/camelCase.schema/default/TopLevel.js
index 759cf7f..e050014 100644
--- a/base/schema-flow/test/inputs/schema/camelCase.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/camelCase.schema/default/TopLevel.js
@@ -12,7 +12,7 @@
 export type TopLevel = {
     myProperty?:     string;
     secondProperty?: string;
-    [property: string]: mixed | string | string;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/class-map-union.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/class-map-union.schema/default/TopLevel.js
index c3c17ad..f8747ce 100644
--- a/base/schema-flow/test/inputs/schema/class-map-union.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/class-map-union.schema/default/TopLevel.js
@@ -16,14 +16,14 @@ export type TopLevel = {
 export type TopLevelUnion = {
     foo?: Foo;
     bar?: Bar;
-    [property: string]: UnionValue | Foo | Bar;
+    [property: string]: UnionValue | Foo | Bar | void;
 };
 
 export type Bar = boolean | BarObject | string;
 
 export type BarObject = {
     quux?: number;
-    [property: string]: mixed | number;
+    [property: string]: mixed;
 };
 
 export type Foo = boolean | number | BarObject;
diff --git a/base/schema-flow/test/inputs/schema/class-with-additional.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/class-with-additional.schema/default/TopLevel.js
index 25c9f2e..319b5d0 100644
--- a/base/schema-flow/test/inputs/schema/class-with-additional.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/class-with-additional.schema/default/TopLevel.js
@@ -15,7 +15,7 @@ export type TopLevel = {
 
 export type Map = {
     foo?: number;
-    [property: string]: boolean | number;
+    [property: string]: boolean | number | void;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/const-non-string.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/const-non-string.schema/default/TopLevel.js
index 98038cd..bfdefce 100644
--- a/base/schema-flow/test/inputs/schema/const-non-string.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/const-non-string.schema/default/TopLevel.js
@@ -15,7 +15,7 @@ export type TopLevel = {
     kind:    Kind;
     ratio:   number;
     version: number;
-    [property: string]: mixed | number | boolean | Kind | number | number;
+    [property: string]: mixed;
 };
 
 export type Kind =
diff --git a/base/schema-flow/test/inputs/schema/constructor.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/constructor.schema/default/TopLevel.js
index 3e47f3a..461857e 100644
--- a/base/schema-flow/test/inputs/schema/constructor.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/constructor.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     constructor?: UnionConstructor;
-    [property: string]: mixed | UnionConstructor;
+    [property: string]: mixed;
 };
 
 export type UnionConstructor = Constructor | number;
diff --git a/base/schema-flow/test/inputs/schema/cut-enum.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/cut-enum.schema/default/TopLevel.js
index f614921..fd3804b 100644
--- a/base/schema-flow/test/inputs/schema/cut-enum.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/cut-enum.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     foo: number;
-    [property: string]: mixed | number;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/date-time-or-string.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/date-time-or-string.schema/default/TopLevel.js
index aedb4eb..159b882 100644
--- a/base/schema-flow/test/inputs/schema/date-time-or-string.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/date-time-or-string.schema/default/TopLevel.js
@@ -12,7 +12,7 @@
 export type TopLevel = {
     bar: BarUnion;
     foo: string;
-    [property: string]: mixed | BarUnion | string;
+    [property: string]: mixed;
 };
 
 export type BarUnion = Date | BarEnum;
diff --git a/base/schema-flow/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.js
index 0f1973b..460c470 100644
--- a/base/schema-flow/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.js
@@ -14,7 +14,7 @@
  */
 export type TopLevel = {
     foo?: boolean;
-    [property: string]: mixed | boolean;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/description.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/description.schema/default/TopLevel.js
index 7bc136e..8a80a17 100644
--- a/base/schema-flow/test/inputs/schema/description.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/description.schema/default/TopLevel.js
@@ -44,7 +44,7 @@ export type ObjectOrStringObject = {
      * This must not get lost
      */
     prop: number;
-    [property: string]: mixed | number;
+    [property: string]: mixed;
 };
 
 /**
diff --git a/base/schema-flow/test/inputs/schema/enum-large.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/enum-large.schema/default/TopLevel.js
index 831aaed..da2bc16 100644
--- a/base/schema-flow/test/inputs/schema/enum-large.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/enum-large.schema/default/TopLevel.js
@@ -12,7 +12,7 @@
 export type TopLevel = {
     callsign: Callsign;
     priority: Priority;
-    [property: string]: mixed | Callsign | Priority;
+    [property: string]: mixed;
 };
 
 export type Callsign =
diff --git a/base/schema-flow/test/inputs/schema/enum-with-values.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/enum-with-values.schema/default/TopLevel.js
index da7585e..b984eb2 100644
--- a/base/schema-flow/test/inputs/schema/enum-with-values.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/enum-with-values.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     weekdays: Weekdays;
-    [property: string]: mixed | Weekdays;
+    [property: string]: mixed;
 };
 
 export type Weekdays =
diff --git a/base/schema-flow/test/inputs/schema/enum.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/enum.schema/default/TopLevel.js
index 1761980..6fe5b6c 100644
--- a/base/schema-flow/test/inputs/schema/enum.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/enum.schema/default/TopLevel.js
@@ -15,7 +15,7 @@ export type TopLevel = {
     gve:       Gve;
     lvc?:      Lvc;
     otherArr?: OtherArr[];
-    [property: string]: mixed | Arr[] | string | Gve | Lvc | OtherArr[];
+    [property: string]: mixed;
 };
 
 export type Arr = OtherArr | number;
diff --git a/base/schema-flow/test/inputs/schema/fractional-bounds.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/fractional-bounds.schema/default/TopLevel.js
index 706aa33..022ded2 100644
--- a/base/schema-flow/test/inputs/schema/fractional-bounds.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/fractional-bounds.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     value: number;
-    [property: string]: mixed | number;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.js
index 134dbde..35ad8a1 100644
--- a/base/schema-flow/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     map: { [key: string]: number };
-    [property: string]: mixed | { [key: string]: number };
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.js
index b245d3e..4142df5 100644
--- a/base/schema-flow/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     health: Health;
-    [property: string]: mixed | Health;
+    [property: string]: mixed;
 };
 
 export type Health =
diff --git a/base/schema-flow/test/inputs/schema/id-no-address.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/id-no-address.schema/default/TopLevel.js
index c94b330..94dd602 100644
--- a/base/schema-flow/test/inputs/schema/id-no-address.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/id-no-address.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     item: number;
-    [property: string]: mixed | number;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/id-root.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/id-root.schema/default/TopLevel.js
index ab8f050..0da7b3c 100644
--- a/base/schema-flow/test/inputs/schema/id-root.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/id-root.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     bar: number;
-    [property: string]: mixed | number;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.js
index 0ed6a5b..282e724 100644
--- a/base/schema-flow/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.js
@@ -11,13 +11,13 @@
 
 export type TopLevel = {
     cookies: Cookie[];
-    [property: string]: mixed | Cookie[];
+    [property: string]: mixed;
 };
 
 export type Cookie = {
     name:  string;
     value: string;
-    [property: string]: mixed | string | string;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/implicit-all-of.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/implicit-all-of.schema/default/TopLevel.js
index 44fe2af..3e5b1af 100644
--- a/base/schema-flow/test/inputs/schema/implicit-all-of.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/implicit-all-of.schema/default/TopLevel.js
@@ -13,7 +13,7 @@ export type TopLevel = {
     foo:  number;
     bar:  boolean;
     quux: string;
-    [property: string]: mixed | number | boolean | string;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.js
index 1f2949a..7c09067 100644
--- a/base/schema-flow/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.js
@@ -11,14 +11,14 @@
 
 export type TopLevel = {
     foo: FooUnion;
-    [property: string]: mixed | FooUnion;
+    [property: string]: mixed;
 };
 
 export type FooUnion = number[] | boolean | number | number | null | FooObject | string;
 
 export type FooObject = {
     bar: number;
-    [property: string]: mixed | number;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/implicit-one-of.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/implicit-one-of.schema/default/TopLevel.js
index 6c3103c..028af63 100644
--- a/base/schema-flow/test/inputs/schema/implicit-one-of.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/implicit-one-of.schema/default/TopLevel.js
@@ -13,7 +13,7 @@ export type TopLevel = {
     foo:   number;
     bar?:  boolean;
     quux?: string;
-    [property: string]: mixed | number | boolean | string;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/integer-float-union.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/integer-float-union.schema/default/TopLevel.js
index 523af06..c434c99 100644
--- a/base/schema-flow/test/inputs/schema/integer-float-union.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/integer-float-union.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     number: number;
-    [property: string]: mixed | number;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/integer-string.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/integer-string.schema/default/TopLevel.js
index b99a3c1..ef28a5e 100644
--- a/base/schema-flow/test/inputs/schema/integer-string.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/integer-string.schema/default/TopLevel.js
@@ -17,7 +17,7 @@ export type TopLevel = {
     optional?:           string;
     unionWithInt:        UnionWithInt;
     unionWithIntAndEnum: UnionWithInt;
-    [property: string]: mixed | (null | string)[] | string[] | null | string | string | string | UnionWithInt | UnionWithInt;
+    [property: string]: mixed;
 };
 
 export type UnionWithInt = number | string;
diff --git a/base/schema-flow/test/inputs/schema/integer-type.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/integer-type.schema/default/TopLevel.js
index 1d1eaad..51b83f3 100644
--- a/base/schema-flow/test/inputs/schema/integer-type.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/integer-type.schema/default/TopLevel.js
@@ -19,7 +19,7 @@ export type TopLevel = {
     small_negative: number;
     small_positive: number;
     unbounded:      number;
-    [property: string]: mixed | number | number | number | number | number | number | number | number | number;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/intersection.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/intersection.schema/default/TopLevel.js
index ba2297d..7ff9370 100644
--- a/base/schema-flow/test/inputs/schema/intersection.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/intersection.schema/default/TopLevel.js
@@ -16,7 +16,7 @@ export type TopLevel = {
 export type Intersection = {
     foo:  number;
     bar?: string;
-    [property: string]: mixed | number | string;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/keyword-enum.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/keyword-enum.schema/default/TopLevel.js
index 0bd422e..3fcb534 100644
--- a/base/schema-flow/test/inputs/schema/keyword-enum.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/keyword-enum.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     enum?: Enum;
-    [property: string]: mixed | Enum;
+    [property: string]: mixed;
 };
 
 export type Enum =
diff --git a/base/schema-flow/test/inputs/schema/keyword-unions.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/keyword-unions.schema/default/TopLevel.js
index dd0f872..381a90c 100644
--- a/base/schema-flow/test/inputs/schema/keyword-unions.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/keyword-unions.schema/default/TopLevel.js
@@ -287,7 +287,7 @@ export type TopLevel = {
     xor_eq?:                     UnionXorEq;
     YES?:                        UnionYES;
     yield?:                      UnionYield;
-    [property: string]: mixed | UnionUnion | UnionBool | UnionComplex | UnionImaginery | UnionAbstract | UnionAlignas | UnionAlignof | UnionAnd | UnionAndEq | UnionAnyUnion | UnionAny | UnionArray | UnionAs | UnionASM | UnionAssert | UnionAssociatedtype | UnionAssociativity | UnionAsync | UnionAtomic | UnionAtomicCancel | UnionAtomicCommit | UnionAtomicNoexcept | UnionAuto | UnionAwait | UnionBase | UnionBitand | UnionBitor | UnionBOOL | UnionBoolUnion | UnionBoolean | UnionBreak | UnionBycopy | UnionByref | UnionByte | UnionCase | UnionCatch | UnionChan | UnionChar | UnionChar16T | UnionChar32T | UnionChecked | UnionClassUnion | UnionClass | UnionCoAwait | UnionCoReturn | UnionCoYield | UnionCompl | UnionConcept | UnionConsole | UnionConst | UnionConstCast | UnionConstexpr | UnionConstructor | UnionContinue | UnionConvenience | UnionConvert | UnionConverter | UnionDate | UnionDateParseHandling | UnionDebugger | UnionDecimal | UnionDeclare | UnionDecltype | UnionDecodeString | UnionDef | UnionDefault | UnionDefer | UnionDeinit | UnionDel | UnionDelegate | UnionDelete | UnionDict | UnionDictionary | UnionDidSet | UnionDo | UnionDouble | number | UnionDynamic | UnionDynamicCast | UnionElif | UnionElse | UnionEncodeQuickType | UnionEnum | UnionEvent | UnionExcept | UnionException | UnionExplicit | UnionExport | UnionExposing | UnionExtends | UnionExtension | UnionExtern | UnionFallthrough | UnionFalseUnion | UnionFalse | UnionFileprivate | UnionFinal | UnionFinally | UnionFixed | UnionFloat | UnionFor | UnionForeach | UnionFriend | UnionFrom | UnionFromJSON | UnionFunc | UnionFunction | UnionGet | UnionGlobal | UnionGo | UnionGoto | UnionGuard | UnionHasOwnProperty | UnionID | UnionIf | UnionIMP | UnionImplements | UnionImplicit | UnionImport | UnionIn | UnionIndirect | UnionInfix | UnionInit | UnionInline | UnionInout | UnionInstanceof | UnionInt | UnionInterface | UnionInternal | UnionIs | UnionIterable | UnionJdec | UnionJenc | UnionJpipe | UnionJSON | UnionJSONConverter | UnionJSONSerializer | UnionJSONToken | UnionJSONWriter | UnionLambda | UnionLazy | UnionLeft | UnionLet | UnionList | UnionLock | UnionLong | UnionMap | UnionMetadataPropertyHandling | UnionModule | UnionMutable | UnionMutating | UnionNamespace | UnionNative | UnionNew | UnionNewtonsoft | UnionNil | UnionNO | UnionNoexcept | UnionNonatomic | UnionNoneUnion | UnionNone | UnionNonlocal | UnionNonmutating | UnionNot | UnionNotEq | UnionNSString | UnionNULL | UnionNull | UnionNullptr | UnionNumber | UnionObject | UnionOf | UnionOneway | UnionOpen | UnionOperator | UnionOptional | UnionOr | UnionOrEq | UnionOut | UnionOverride | UnionPackage | UnionParams | UnionPass | UnionPort | UnionPostfix | UnionPrecedence | UnionPrefix | UnionPrint | UnionPrintf | UnionPrivate | UnionProtected | UnionProtocol | UnionProtocolUnion | UnionPublic | UnionQuicktype | UnionRaise | UnionRange | UnionReadonly | UnionRef | UnionRegister | UnionReinterpretCast | UnionRepeat | UnionRequire | UnionRequired | UnionRequires | UnionRestrict | UnionRetain | UnionRethrows | UnionReturn | UnionRight | UnionSbyte | UnionSealed | UnionSEL | UnionSelect | UnionSelf | UnionSelfUnion | UnionSerialize | UnionSet | UnionShort | UnionSigned | UnionSizeof | UnionStackalloc | UnionStatic | UnionStaticAssert | UnionStaticCast | UnionStrictfp | UnionString | UnionStruct | UnionSubscript | UnionSuper | UnionSwitch | UnionSymbol | UnionSynchronized | UnionSystem | UnionTemplate | UnionThen | UnionThis | UnionThreadLocal | UnionThrow | UnionThrows | UnionToJSON | UnionTopLevel | UnionTransient | UnionTrue | UnionTrueUnion | UnionTry | UnionType | UnionTypeUnion | UnionTypealias | UnionTypedef | UnionTypeid | UnionTypename | UnionTypeof | UnionUint | UnionUlong | UnionUnchecked | UnionUndefined | UnionUnionUnion | UnionUnowned | UnionUnsafe | UnionUnsigned | UnionUshort | UnionUsing | UnionVar | UnionVirtual | UnionVoid | UnionVolatile | UnionWcharT | UnionWeak | UnionWhere | UnionWhile | UnionWillSet | UnionWith | UnionXor | UnionXorEq | UnionYES | UnionYield;
+    [property: string]: mixed;
 };
 
 export type UnionAny = Any | number;
diff --git a/base/schema-flow/test/inputs/schema/list.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/list.schema/default/TopLevel.js
index 76e467f..17c0e10 100644
--- a/base/schema-flow/test/inputs/schema/list.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/list.schema/default/TopLevel.js
@@ -14,7 +14,7 @@
  */
 export type TopLevel = {
     next?: TopLevel;
-    [property: string]: mixed | TopLevel;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/min-max-items.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/min-max-items.schema/default/TopLevel.js
index f96b897..669266c 100644
--- a/base/schema-flow/test/inputs/schema/min-max-items.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/min-max-items.schema/default/TopLevel.js
@@ -15,7 +15,7 @@ export type TopLevel = {
     minOnly:    string[];
     plain:      string[];
     unionItems: UnionItem[];
-    [property: string]: mixed | number[] | number[] | string[] | string[] | UnionItem[];
+    [property: string]: mixed;
 };
 
 export type UnionItem = number | string;
diff --git a/base/schema-flow/test/inputs/schema/minmax-integer.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/minmax-integer.schema/default/TopLevel.js
index c8e4323..60be51d 100644
--- a/base/schema-flow/test/inputs/schema/minmax-integer.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/minmax-integer.schema/default/TopLevel.js
@@ -18,7 +18,7 @@ export type TopLevel = {
     minMaxIntersection: number;
     minMaxUnion:        number;
     union:              number;
-    [property: string]: mixed | number | number | number | number | number | number | number | number;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/minmax.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/minmax.schema/default/TopLevel.js
index 5a1e1b8..d58225c 100644
--- a/base/schema-flow/test/inputs/schema/minmax.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/minmax.schema/default/TopLevel.js
@@ -18,7 +18,7 @@ export type TopLevel = {
     minMaxIntersection: number;
     minMaxUnion:        number;
     union:              number;
-    [property: string]: mixed | number | number | number | number | number | number | number | number;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/minmaxlength.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/minmaxlength.schema/default/TopLevel.js
index 6f68f75..bd4537b 100644
--- a/base/schema-flow/test/inputs/schema/minmaxlength.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/minmaxlength.schema/default/TopLevel.js
@@ -18,7 +18,7 @@ export type TopLevel = {
     minmaxlength:       string;
     minMaxUnion:        string;
     union:              string;
-    [property: string]: mixed | string | InUnion | string | string | string | string | string | string;
+    [property: string]: mixed;
 };
 
 export type InUnion = number | string;
diff --git a/base/schema-flow/test/inputs/schema/multi-type-enum.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/multi-type-enum.schema/default/TopLevel.js
index e55c6cb..61a8238 100644
--- a/base/schema-flow/test/inputs/schema/multi-type-enum.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/multi-type-enum.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     foo: FooUnion;
-    [property: string]: mixed | FooUnion;
+    [property: string]: mixed;
 };
 
 export type FooUnion = boolean | number | FooEnum;
diff --git a/base/schema-flow/test/inputs/schema/mutually-recursive.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/mutually-recursive.schema/default/TopLevel.js
index 19fa98b..cbf3645 100644
--- a/base/schema-flow/test/inputs/schema/mutually-recursive.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/mutually-recursive.schema/default/TopLevel.js
@@ -13,12 +13,12 @@ export type Foo = TopLevel[] | TopLevel;
 
 export type Bar = {
     foo: Foo;
-    [property: string]: mixed | Foo;
+    [property: string]: mixed;
 };
 
 export type TopLevel = {
     bar?: Bar;
-    [property: string]: mixed | Bar;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.js
index 7f7fdbe..11caa97 100644
--- a/base/schema-flow/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.js
@@ -18,7 +18,7 @@ export type Item = {
     id?:      string;
     output?:  string;
     summary?: string;
-    [property: string]: mixed | string | string | string | string;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/non-standard-ref.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/non-standard-ref.schema/default/TopLevel.js
index a19290b..63ee252 100644
--- a/base/schema-flow/test/inputs/schema/non-standard-ref.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/non-standard-ref.schema/default/TopLevel.js
@@ -13,7 +13,7 @@ export type TopLevel = {
     bar:  number;
     foo:  number;
     quux: boolean;
-    [property: string]: mixed | number | number | boolean;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.js
index 73d3e10..b682aea 100644
--- a/base/schema-flow/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.js
@@ -12,7 +12,7 @@
 export type TopLevel = {
     b?:   null | string;
     kind: Kind;
-    [property: string]: mixed | null | string | Kind;
+    [property: string]: mixed;
 };
 
 export type Kind =
diff --git a/base/schema-flow/test/inputs/schema/object-type-required.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/object-type-required.schema/default/TopLevel.js
index 0452054..695aabc 100644
--- a/base/schema-flow/test/inputs/schema/object-type-required.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/object-type-required.schema/default/TopLevel.js
@@ -13,7 +13,7 @@ export type TopLevel = {
     empty: Empty;
     foo:   string;
     bar?:  string;
-    [property: string]: mixed | Empty | string | string;
+    [property: string]: mixed;
 };
 
 export type Empty = {
diff --git a/base/schema-flow/test/inputs/schema/optional-constraints.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/optional-constraints.schema/default/TopLevel.js
index 0383e05..3afc5fb 100644
--- a/base/schema-flow/test/inputs/schema/optional-constraints.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/optional-constraints.schema/default/TopLevel.js
@@ -15,7 +15,7 @@ export type TopLevel = {
     optPattern?: string;
     optString?:  string;
     reqZeroMin:  number;
-    [property: string]: mixed | number | number | string | string | number;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/pattern.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/pattern.schema/default/TopLevel.js
index 8a37f20..90e6c9d 100644
--- a/base/schema-flow/test/inputs/schema/pattern.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/pattern.schema/default/TopLevel.js
@@ -13,7 +13,7 @@ export type TopLevel = {
     pattern1: string;
     pattern2: string;
     union:    string;
-    [property: string]: mixed | string | string | string;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/postman-collection.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/postman-collection.schema/default/TopLevel.js
index d607dda..8139ed9 100644
--- a/base/schema-flow/test/inputs/schema/postman-collection.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/postman-collection.schema/default/TopLevel.js
@@ -16,12 +16,12 @@ export type TopLevel = {
     item?:     TopLevel[];
     name?:     string;
     response?: Response[];
-    [property: string]: mixed | TopLevel[] | string | Response[];
+    [property: string]: mixed;
 };
 
 export type Response = {
     body?: string;
-    [property: string]: mixed | string;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/prefix-items.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/prefix-items.schema/default/TopLevel.js
index 072220d..de153a7 100644
--- a/base/schema-flow/test/inputs/schema/prefix-items.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/prefix-items.schema/default/TopLevel.js
@@ -12,7 +12,7 @@
 export type TopLevel = {
     open:  Open[];
     tuple: Open[];
-    [property: string]: mixed | Open[] | Open[];
+    [property: string]: mixed;
 };
 
 export type Open = boolean | number;
diff --git a/base/schema-flow/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.js
index 78a190d..b1766ee 100644
--- a/base/schema-flow/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.js
@@ -15,12 +15,12 @@ export type TopLevelElement = mixed[] | boolean | number | null | TopLevelObject
 
 export type TopLevelObject = {
     x?: X;
-    [property: string]: mixed | X;
+    [property: string]: mixed;
 };
 
 export type XObject = {
     x?: X;
-    [property: string]: mixed | X;
+    [property: string]: mixed;
 };
 
 export type XElement = mixed[] | boolean | number | null | XObject | string;
diff --git a/base/schema-flow/test/inputs/schema/ref-id-files.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/ref-id-files.schema/default/TopLevel.js
index f614921..fd3804b 100644
--- a/base/schema-flow/test/inputs/schema/ref-id-files.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/ref-id-files.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     foo: number;
-    [property: string]: mixed | number;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/ref-remote.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/ref-remote.schema/default/TopLevel.js
index 76e467f..17c0e10 100644
--- a/base/schema-flow/test/inputs/schema/ref-remote.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/ref-remote.schema/default/TopLevel.js
@@ -14,7 +14,7 @@
  */
 export type TopLevel = {
     next?: TopLevel;
-    [property: string]: mixed | TopLevel;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/renaming-bug.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/renaming-bug.schema/default/TopLevel.js
index 480f43f..bfa4e9f 100644
--- a/base/schema-flow/test/inputs/schema/renaming-bug.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/renaming-bug.schema/default/TopLevel.js
@@ -13,60 +13,60 @@ export type TopLevel = {
     version?:  string;
     fruits?:   Fruit[];
     vehicles?: Vehicle[];
-    [property: string]: mixed | string | Fruit[] | Vehicle[];
+    [property: string]: mixed;
 };
 
 export type Fruit = {
     apple?:   boolean;
     berries?: Berry[];
     orange?:  boolean;
-    [property: string]: mixed | boolean | Berry[] | boolean;
+    [property: string]: mixed;
 };
 
 export type Berry = {
     color?:  Color;
     name?:   string;
     shapes?: Shape[];
-    [property: string]: mixed | Color | string | Shape[];
+    [property: string]: mixed;
 };
 
 export type Color = {
     rgb?: number;
-    [property: string]: mixed | number;
+    [property: string]: mixed;
 };
 
 export type Shape = {
     geometry?: Geometry;
     history?:  History;
-    [property: string]: mixed | Geometry | History;
+    [property: string]: mixed;
 };
 
 export type Geometry = {
     rectShape?:     RectShape;
     circularShape?: CircularShape[];
-    [property: string]: mixed | RectShape | CircularShape[];
+    [property: string]: mixed;
 };
 
 export type CircularShape = {
     shapeName?: string;
-    [property: string]: mixed | string;
+    [property: string]: mixed;
 };
 
 export type RectShape = {
     parts?: Part[];
-    [property: string]: mixed | Part[];
+    [property: string]: mixed;
 };
 
 export type Part = {
     depth?:  string;
     length?: string;
     width?:  string;
-    [property: string]: mixed | string | string | string;
+    [property: string]: mixed;
 };
 
 export type History = {
     class?: string;
-    [property: string]: mixed | string;
+    [property: string]: mixed;
 };
 
 export type Vehicle = {
@@ -76,25 +76,25 @@ export type Vehicle = {
     subModule?: boolean;
     type?:      VehicleType;
     year?:      string;
-    [property: string]: mixed | string | string | Speed | boolean | VehicleType | string;
+    [property: string]: mixed;
 };
 
 export type Speed = {
     velocity?: Limit;
-    [property: string]: mixed | Limit;
+    [property: string]: mixed;
 };
 
 export type Limit = {
     maximum?: number;
     minimum?: number;
-    [property: string]: mixed | number | number;
+    [property: string]: mixed;
 };
 
 export type VehicleType = {
     name?:   Name;
     width?:  Axis;
     length?: Axis;
-    [property: string]: mixed | Name | Axis | Axis;
+    [property: string]: mixed;
 };
 
 export type Axis =
diff --git a/base/schema-flow/test/inputs/schema/required-draft3.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/required-draft3.schema/default/TopLevel.js
index 3f5061b..d35b9e7 100644
--- a/base/schema-flow/test/inputs/schema/required-draft3.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/required-draft3.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     longitude: number;
-    [property: string]: mixed | number;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/required-non-properties.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/required-non-properties.schema/default/TopLevel.js
index 58975ad..99c86ad 100644
--- a/base/schema-flow/test/inputs/schema/required-non-properties.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/required-non-properties.schema/default/TopLevel.js
@@ -12,7 +12,7 @@
 export type TopLevel = {
     foo: number;
     bar: mixed;
-    [property: string]: mixed | number | mixed;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/required.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/required.schema/default/TopLevel.js
index 3f5061b..d35b9e7 100644
--- a/base/schema-flow/test/inputs/schema/required.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/required.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     longitude: number;
-    [property: string]: mixed | number;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.js
index 09415d2..9868a9b 100644
--- a/base/schema-flow/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.js
@@ -12,13 +12,13 @@
 export type TopLevel = {
     next?: Next;
     value: string;
-    [property: string]: mixed | Next | string;
+    [property: string]: mixed;
 };
 
 export type Node = {
     next?: Next;
     value: string;
-    [property: string]: mixed | Next | string;
+    [property: string]: mixed;
 };
 
 export type Next = null | Node | string;
diff --git a/base/schema-flow/test/inputs/schema/schema-constraints.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/schema-constraints.schema/default/TopLevel.js
index 1a7d30e..2f38303 100644
--- a/base/schema-flow/test/inputs/schema/schema-constraints.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/schema-constraints.schema/default/TopLevel.js
@@ -12,7 +12,7 @@
 export type TopLevel = {
     minMaxLength: string;
     percent:      number;
-    [property: string]: mixed | string | number;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/simple-ref.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/simple-ref.schema/default/TopLevel.js
index 76e467f..17c0e10 100644
--- a/base/schema-flow/test/inputs/schema/simple-ref.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/simple-ref.schema/default/TopLevel.js
@@ -14,7 +14,7 @@
  */
 export type TopLevel = {
     next?: TopLevel;
-    [property: string]: mixed | TopLevel;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/strict-optional.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/strict-optional.schema/default/TopLevel.js
index 87124b1..f385a6f 100644
--- a/base/schema-flow/test/inputs/schema/strict-optional.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/strict-optional.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     foo: number | null;
-    [property: string]: mixed | number | null;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/top-level-array.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/top-level-array.schema/default/TopLevel.js
index 841d7aa..6db6cca 100644
--- a/base/schema-flow/test/inputs/schema/top-level-array.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/top-level-array.schema/default/TopLevel.js
@@ -14,7 +14,7 @@ export type TopLevel = TextClassificationOutputElement[];
 export type TextClassificationOutputElement = {
     label: string;
     score: number;
-    [property: string]: mixed | string | number;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/tuple.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/tuple.schema/default/TopLevel.js
index 3a44696..0a3be23 100644
--- a/base/schema-flow/test/inputs/schema/tuple.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/tuple.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     tuple: Tuple[];
-    [property: string]: mixed | Tuple[];
+    [property: string]: mixed;
 };
 
 export type Tuple = boolean | number;
diff --git a/base/schema-flow/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.js
index 98c3a85..8c9f7fb 100644
--- a/base/schema-flow/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.js
@@ -11,14 +11,14 @@
 
 export type TopLevel = {
     config?: Config;
-    [property: string]: mixed | Config;
+    [property: string]: mixed;
 };
 
 export type Config = {
     closed?:   Closed;
     name?:     string;
     settings?: { [key: string]: Item[] };
-    [property: string]: mixed | Closed | string | { [key: string]: Item[] };
+    [property: string]: mixed;
 };
 
 export type Closed = mixed[] | boolean | ClosedClass | number | number | null | string;
@@ -29,7 +29,7 @@ export type ClosedClass = {
 export type Item = {
     key:   string;
     value: string;
-    [property: string]: mixed | string | string;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/union-int-double.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/union-int-double.schema/default/TopLevel.js
index e5f6ec3..0e237ee 100644
--- a/base/schema-flow/test/inputs/schema/union-int-double.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/union-int-double.schema/default/TopLevel.js
@@ -11,7 +11,7 @@
 
 export type TopLevel = {
     value: Value;
-    [property: string]: mixed | Value;
+    [property: string]: mixed;
 };
 
 export type Value = number | string;
diff --git a/base/schema-flow/test/inputs/schema/union.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/union.schema/default/TopLevel.js
index ef8f1b5..af3f6dc 100644
--- a/base/schema-flow/test/inputs/schema/union.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/union.schema/default/TopLevel.js
@@ -15,7 +15,7 @@ export type TopLevelElement = {
     one?:   number;
     two:    boolean;
     three?: number;
-    [property: string]: mixed | number | boolean | number;
+    [property: string]: mixed;
 };
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-flow/test/inputs/schema/uuid.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/uuid.schema/default/TopLevel.js
index e7082f4..b30ae68 100644
--- a/base/schema-flow/test/inputs/schema/uuid.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/uuid.schema/default/TopLevel.js
@@ -16,7 +16,7 @@ export type TopLevel = {
     one:           string;
     optional?:     string;
     unionWithEnum: UnionWithEnumUnion;
-    [property: string]: mixed | (null | string)[] | string[] | null | string | string | string | UnionWithEnumUnion;
+    [property: string]: mixed;
 };
 
 export type UnionWithEnumUnion = UnionWithEnumEnum | string;
diff --git a/base/schema-flow/test/inputs/schema/vega-lite.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/vega-lite.schema/default/TopLevel.js
index fa4f24a..e870aef 100644
--- a/base/schema-flow/test/inputs/schema/vega-lite.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/vega-lite.schema/default/TopLevel.js
@@ -1800,7 +1800,7 @@ export type RangeConfig = {
      * Default range palette for the `shape` channel.
      */
     symbol?: string[];
-    [property: string]: RangeConfigValue | Category | Category | Category | Category | Category | string[];
+    [property: string]: RangeConfigValue | Category | string[] | void;
 };
 
 /**
diff --git a/base/schema-typescript/test/inputs/regressions/unicode-codepoint-length.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/regressions/unicode-codepoint-length.schema/default/TopLevel.ts
index b7e83e6..3da4931 100644
--- a/base/schema-typescript/test/inputs/regressions/unicode-codepoint-length.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/regressions/unicode-codepoint-length.schema/default/TopLevel.ts
@@ -11,7 +11,7 @@ export interface TopLevel {
     exact:   string;
     maximum: string;
     minimum: string;
-    [property: string]: unknown | string | string | string;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/any.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/any.schema/default/TopLevel.ts
index c87f146..293a64c 100644
--- a/base/schema-typescript/test/inputs/schema/any.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/any.schema/default/TopLevel.ts
@@ -10,7 +10,7 @@
 export interface TopLevel {
     foo:    unknown;
     values: { [key: string]: unknown };
-    [property: string]: unknown | unknown | { [key: string]: unknown };
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/bool-string.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/bool-string.schema/default/TopLevel.ts
index 68a9462..8604379 100644
--- a/base/schema-typescript/test/inputs/schema/bool-string.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/bool-string.schema/default/TopLevel.ts
@@ -15,7 +15,7 @@ export interface TopLevel {
     optional?:            string;
     unionWithBool:        UnionWithBool;
     unionWithBoolAndEnum: UnionWithBool;
-    [property: string]: unknown | (null | string)[] | string[] | null | string | string | string | UnionWithBool | UnionWithBool;
+    [property: string]: unknown;
 }
 
 export type UnionWithBool = boolean | string;
diff --git a/base/schema-typescript/test/inputs/schema/camelCase.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/camelCase.schema/default/TopLevel.ts
index fb0fae0..1c2f56a 100644
--- a/base/schema-typescript/test/inputs/schema/camelCase.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/camelCase.schema/default/TopLevel.ts
@@ -10,7 +10,7 @@
 export interface TopLevel {
     myProperty?:     string;
     secondProperty?: string;
-    [property: string]: unknown | string | string;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/class-map-union.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/class-map-union.schema/default/TopLevel.ts
index c35a2aa..dedacb8 100644
--- a/base/schema-typescript/test/inputs/schema/class-map-union.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/class-map-union.schema/default/TopLevel.ts
@@ -14,14 +14,14 @@ export interface TopLevel {
 export interface TopLevelUnion {
     foo?: Foo;
     bar?: Bar;
-    [property: string]: UnionValue | Foo | Bar;
+    [property: string]: UnionValue | Foo | Bar | undefined;
 }
 
 export type Bar = boolean | BarObject | string;
 
 export interface BarObject {
     quux?: number;
-    [property: string]: unknown | number;
+    [property: string]: unknown;
 }
 
 export type Foo = boolean | number | BarObject;
diff --git a/base/schema-typescript/test/inputs/schema/class-with-additional.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/class-with-additional.schema/default/TopLevel.ts
index 7042dba..15df75c 100644
--- a/base/schema-typescript/test/inputs/schema/class-with-additional.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/class-with-additional.schema/default/TopLevel.ts
@@ -13,7 +13,7 @@ export interface TopLevel {
 
 export interface Map {
     foo?: number;
-    [property: string]: boolean | number;
+    [property: string]: boolean | number | undefined;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/const-non-string.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/const-non-string.schema/default/TopLevel.ts
index cdf8c26..471597a 100644
--- a/base/schema-typescript/test/inputs/schema/const-non-string.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/const-non-string.schema/default/TopLevel.ts
@@ -13,7 +13,7 @@ export interface TopLevel {
     kind:    Kind;
     ratio:   number;
     version: number;
-    [property: string]: unknown | number | boolean | Kind | number | number;
+    [property: string]: unknown;
 }
 
 export type Kind = "widget";
diff --git a/base/schema-typescript/test/inputs/schema/constructor.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/constructor.schema/default/TopLevel.ts
index ee3ba81..213c0ae 100644
--- a/base/schema-typescript/test/inputs/schema/constructor.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/constructor.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     constructor?: UnionConstructor;
-    [property: string]: unknown | UnionConstructor;
+    [property: string]: unknown;
 }
 
 export type UnionConstructor = object | number;
diff --git a/base/schema-typescript/test/inputs/schema/cut-enum.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/cut-enum.schema/default/TopLevel.ts
index 7a1dd40..4b340a1 100644
--- a/base/schema-typescript/test/inputs/schema/cut-enum.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/cut-enum.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     foo: number;
-    [property: string]: unknown | number;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/date-time-or-string.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/date-time-or-string.schema/default/TopLevel.ts
index 3cac887..f2f2b10 100644
--- a/base/schema-typescript/test/inputs/schema/date-time-or-string.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/date-time-or-string.schema/default/TopLevel.ts
@@ -10,7 +10,7 @@
 export interface TopLevel {
     bar: BarUnion;
     foo: string;
-    [property: string]: unknown | BarUnion | string;
+    [property: string]: unknown;
 }
 
 export type BarUnion = Date | BarEnum;
diff --git a/base/schema-typescript/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.ts
index 5aafef8..5fa5b81 100644
--- a/base/schema-typescript/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.ts
@@ -12,7 +12,7 @@
  */
 export interface TopLevel {
     foo?: boolean;
-    [property: string]: unknown | boolean;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/description.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/description.schema/default/TopLevel.ts
index b9d91c2..239362c 100644
--- a/base/schema-typescript/test/inputs/schema/description.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/description.schema/default/TopLevel.ts
@@ -40,7 +40,7 @@ export interface ObjectOrStringObject {
      * This must not get lost
      */
     prop: number;
-    [property: string]: unknown | number;
+    [property: string]: unknown;
 }
 
 /**
diff --git a/base/schema-typescript/test/inputs/schema/enum-large.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/enum-large.schema/default/TopLevel.ts
index f33915c..12c52ac 100644
--- a/base/schema-typescript/test/inputs/schema/enum-large.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/enum-large.schema/default/TopLevel.ts
@@ -10,7 +10,7 @@
 export interface TopLevel {
     callsign: Callsign;
     priority: Priority;
-    [property: string]: unknown | Callsign | Priority;
+    [property: string]: unknown;
 }
 
 export type Callsign = "alpha" | "bravo" | "charlie" | "delta" | "echo" | "foxtrot" | "golf" | "hotel" | "india" | "juliett" | "kilo" | "lima" | "mike" | "november" | "oscar" | "papa" | "quebec" | "romeo" | "sierra" | "tango";
diff --git a/base/schema-typescript/test/inputs/schema/enum-with-values.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/enum-with-values.schema/default/TopLevel.ts
index df0714e..0d0c447 100644
--- a/base/schema-typescript/test/inputs/schema/enum-with-values.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/enum-with-values.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     weekdays: Weekdays;
-    [property: string]: unknown | Weekdays;
+    [property: string]: unknown;
 }
 
 export type Weekdays = "Monday" | "Tuesday" | "Wednesday" | "Thursday" | "Friday" | "Saturday" | "Sunday";
diff --git a/base/schema-typescript/test/inputs/schema/enum.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/enum.schema/default/TopLevel.ts
index a863c1f..368ac2b 100644
--- a/base/schema-typescript/test/inputs/schema/enum.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/enum.schema/default/TopLevel.ts
@@ -13,7 +13,7 @@ export interface TopLevel {
     gve:       Gve;
     lvc?:      Lvc;
     otherArr?: OtherArr[];
-    [property: string]: unknown | Arr[] | string | Gve | Lvc | OtherArr[];
+    [property: string]: unknown;
 }
 
 export type Arr = OtherArr | number;
diff --git a/base/schema-typescript/test/inputs/schema/fractional-bounds.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/fractional-bounds.schema/default/TopLevel.ts
index 80cbe36..8ea70f3 100644
--- a/base/schema-typescript/test/inputs/schema/fractional-bounds.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/fractional-bounds.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     value: number;
-    [property: string]: unknown | number;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.ts
index 1a22d87..fc206e1 100644
--- a/base/schema-typescript/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     map: { [key: string]: number };
-    [property: string]: unknown | { [key: string]: number };
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.ts
index d421069..e07edf0 100644
--- a/base/schema-typescript/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     health: Health;
-    [property: string]: unknown | Health;
+    [property: string]: unknown;
 }
 
 export type Health = "ok" | "error";
diff --git a/base/schema-typescript/test/inputs/schema/id-no-address.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/id-no-address.schema/default/TopLevel.ts
index 00c6590..29bc994 100644
--- a/base/schema-typescript/test/inputs/schema/id-no-address.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/id-no-address.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     item: number;
-    [property: string]: unknown | number;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/id-root.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/id-root.schema/default/TopLevel.ts
index 4703039..444933f 100644
--- a/base/schema-typescript/test/inputs/schema/id-root.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/id-root.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     bar: number;
-    [property: string]: unknown | number;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.ts
index a14bd43..9d2df90 100644
--- a/base/schema-typescript/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.ts
@@ -9,13 +9,13 @@
 
 export interface TopLevel {
     cookies: Cookie[];
-    [property: string]: unknown | Cookie[];
+    [property: string]: unknown;
 }
 
 export interface Cookie {
     name:  string;
     value: string;
-    [property: string]: unknown | string | string;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/implicit-all-of.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/implicit-all-of.schema/default/TopLevel.ts
index d151566..9f7b670 100644
--- a/base/schema-typescript/test/inputs/schema/implicit-all-of.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/implicit-all-of.schema/default/TopLevel.ts
@@ -11,7 +11,7 @@ export interface TopLevel {
     foo:  number;
     bar:  boolean;
     quux: string;
-    [property: string]: unknown | number | boolean | string;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.ts
index b864dcb..887b34d 100644
--- a/base/schema-typescript/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.ts
@@ -9,14 +9,14 @@
 
 export interface TopLevel {
     foo: FooUnion;
-    [property: string]: unknown | FooUnion;
+    [property: string]: unknown;
 }
 
 export type FooUnion = number[] | boolean | number | number | null | FooObject | string;
 
 export interface FooObject {
     bar: number;
-    [property: string]: unknown | number;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/implicit-one-of.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/implicit-one-of.schema/default/TopLevel.ts
index 51da732..8345516 100644
--- a/base/schema-typescript/test/inputs/schema/implicit-one-of.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/implicit-one-of.schema/default/TopLevel.ts
@@ -11,7 +11,7 @@ export interface TopLevel {
     foo:   number;
     bar?:  boolean;
     quux?: string;
-    [property: string]: unknown | number | boolean | string;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/integer-float-union.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/integer-float-union.schema/default/TopLevel.ts
index 525c1a4..30bbefd 100644
--- a/base/schema-typescript/test/inputs/schema/integer-float-union.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/integer-float-union.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     number: number;
-    [property: string]: unknown | number;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/integer-string.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/integer-string.schema/default/TopLevel.ts
index 7f1ff74..f9a36b5 100644
--- a/base/schema-typescript/test/inputs/schema/integer-string.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/integer-string.schema/default/TopLevel.ts
@@ -15,7 +15,7 @@ export interface TopLevel {
     optional?:           string;
     unionWithInt:        UnionWithInt;
     unionWithIntAndEnum: UnionWithInt;
-    [property: string]: unknown | (null | string)[] | string[] | null | string | string | string | UnionWithInt | UnionWithInt;
+    [property: string]: unknown;
 }
 
 export type UnionWithInt = number | string;
diff --git a/base/schema-typescript/test/inputs/schema/integer-type.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/integer-type.schema/default/TopLevel.ts
index f59a698..54caffa 100644
--- a/base/schema-typescript/test/inputs/schema/integer-type.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/integer-type.schema/default/TopLevel.ts
@@ -17,7 +17,7 @@ export interface TopLevel {
     small_negative: number;
     small_positive: number;
     unbounded:      number;
-    [property: string]: unknown | number | number | number | number | number | number | number | number | number;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/intersection.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/intersection.schema/default/TopLevel.ts
index e141117..29a519e 100644
--- a/base/schema-typescript/test/inputs/schema/intersection.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/intersection.schema/default/TopLevel.ts
@@ -14,7 +14,7 @@ export interface TopLevel {
 export interface Intersection {
     foo:  number;
     bar?: string;
-    [property: string]: unknown | number | string;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/keyword-enum.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/keyword-enum.schema/default/TopLevel.ts
index 2dd0706..78ea06e 100644
--- a/base/schema-typescript/test/inputs/schema/keyword-enum.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/keyword-enum.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     enum?: Enum;
-    [property: string]: unknown | Enum;
+    [property: string]: unknown;
 }
 
 export type Enum = "_" | "_Bool" | "_Complex" | "_Imaginery" | "abstract" | "alignas" | "alignof" | "and" | "and_eq" | "any" | "Any" | "array" | "as" | "asm" | "assert" | "associatedtype" | "associativity" | "async" | "atomic" | "atomic_cancel" | "atomic_commit" | "atomic_noexcept" | "auto" | "await" | "base" | "bitand" | "bitor" | "BOOL" | "bool" | "boolean" | "break" | "bycopy" | "byref" | "byte" | "case" | "catch" | "chan" | "char" | "char16_t" | "char32_t" | "checked" | "class" | "Class" | "co_await" | "co_return" | "co_yield" | "compl" | "concept" | "console" | "const" | "const_cast" | "constexpr" | "constructor" | "continue" | "convenience" | "convert" | "converter" | "date" | "date_parse_handling" | "debugger" | "decimal" | "declare" | "decltype" | "decode_string" | "def" | "default" | "defer" | "deinit" | "del" | "delegate" | "delete" | "dict" | "dictionary" | "didSet" | "do" | "double" | "dynamic" | "dynamic_cast" | "elif" | "else" | "encode_quick_type" | "enum" | "event" | "except" | "exception" | "explicit" | "export" | "exposing" | "extends" | "extension" | "extern" | "fallthrough" | "false" | "False" | "fileprivate" | "final" | "finally" | "fixed" | "float" | "for" | "foreach" | "friend" | "from" | "from_json" | "func" | "function" | "get" | "global" | "go" | "goto" | "guard" | "hasOwnProperty" | "id" | "if" | "IMP" | "implements" | "implicit" | "import" | "in" | "indirect" | "infix" | "init" | "inline" | "inout" | "instanceof" | "int" | "interface" | "internal" | "iterable" | "is" | "jdec" | "jenc" | "jpipe" | "json" | "json_converter" | "json_serializer" | "json_token" | "json_writer" | "lambda" | "lazy" | "left" | "let" | "list" | "lock" | "long" | "map" | "metadata_property_handling" | "module" | "mutable" | "mutating" | "namespace" | "native" | "new" | "newtonsoft" | "nil" | "NO" | "noexcept" | "nonatomic" | "none" | "None" | "nonlocal" | "nonmutating" | "not" | "not_eq" | "NSString" | "NULL" | "null" | "nullptr" | "number" | "object" | "of" | "oneway" | "open" | "operator" | "optional" | "or" | "or_eq" | "out" | "override" | "package" | "params" | "pass" | "port" | "postfix" | "precedence" | "prefix" | "print" | "printf" | "private" | "protected" | "Protocol" | "protocol" | "public" | "quicktype" | "raise" | "range" | "readonly" | "ref" | "register" | "reinterpret_cast" | "repeat" | "require" | "required" | "requires" | "restrict" | "retain" | "rethrows" | "return" | "right" | "sbyte" | "sealed" | "SEL" | "select" | "Self" | "self" | "serialize" | "set" | "short" | "signed" | "sizeof" | "stackalloc" | "static" | "static_assert" | "static_cast" | "strictfp" | "string" | "struct" | "subscript" | "super" | "switch" | "symbol" | "synchronized" | "system" | "template" | "then" | "this" | "thread_local" | "throw" | "throws" | "to_json" | "top_level" | "transient" | "True" | "true" | "try" | "Type" | "type" | "typealias" | "typedef" | "typeid" | "typename" | "typeof" | "uint" | "ulong" | "unchecked" | "undefined" | "union" | "unowned" | "unsafe" | "unsigned" | "ushort" | "using" | "var" | "virtual" | "void" | "volatile" | "wchar_t" | "weak" | "where" | "while" | "willSet" | "with" | "xor" | "xor_eq" | "YES" | "yield" | "dummy";
diff --git a/base/schema-typescript/test/inputs/schema/keyword-unions.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/keyword-unions.schema/default/TopLevel.ts
index eb29aa2..94337c1 100644
--- a/base/schema-typescript/test/inputs/schema/keyword-unions.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/keyword-unions.schema/default/TopLevel.ts
@@ -285,7 +285,7 @@ export interface TopLevel {
     xor_eq?:                     UnionXorEq;
     YES?:                        UnionYES;
     yield?:                      UnionYield;
-    [property: string]: unknown | UnionUnion | UnionBool | UnionComplex | UnionImaginery | UnionAbstract | UnionAlignas | UnionAlignof | UnionAnd | UnionAndEq | UnionAnyUnion | UnionAny | UnionArray | UnionAs | UnionASM | UnionAssert | UnionAssociatedtype | UnionAssociativity | UnionAsync | UnionAtomic | UnionAtomicCancel | UnionAtomicCommit | UnionAtomicNoexcept | UnionAuto | UnionAwait | UnionBase | UnionBitand | UnionBitor | UnionBOOL | UnionBoolUnion | UnionBoolean | UnionBreak | UnionBycopy | UnionByref | UnionByte | UnionCase | UnionCatch | UnionChan | UnionChar | UnionChar16T | UnionChar32T | UnionChecked | UnionClassUnion | UnionClass | UnionCoAwait | UnionCoReturn | UnionCoYield | UnionCompl | UnionConcept | UnionConsole | UnionConst | UnionConstCast | UnionConstexpr | UnionConstructor | UnionContinue | UnionConvenience | UnionConvert | UnionConverter | UnionDate | UnionDateParseHandling | UnionDebugger | UnionDecimal | UnionDeclare | UnionDecltype | UnionDecodeString | UnionDef | UnionDefault | UnionDefer | UnionDeinit | UnionDel | UnionDelegate | UnionDelete | UnionDict | UnionDictionary | UnionDidSet | UnionDo | UnionDouble | number | UnionDynamic | UnionDynamicCast | UnionElif | UnionElse | UnionEncodeQuickType | UnionEnum | UnionEvent | UnionExcept | UnionException | UnionExplicit | UnionExport | UnionExposing | UnionExtends | UnionExtension | UnionExtern | UnionFallthrough | UnionFalseUnion | UnionFalse | UnionFileprivate | UnionFinal | UnionFinally | UnionFixed | UnionFloat | UnionFor | UnionForeach | UnionFriend | UnionFrom | UnionFromJSON | UnionFunc | UnionFunction | UnionGet | UnionGlobal | UnionGo | UnionGoto | UnionGuard | UnionHasOwnProperty | UnionID | UnionIf | UnionIMP | UnionImplements | UnionImplicit | UnionImport | UnionIn | UnionIndirect | UnionInfix | UnionInit | UnionInline | UnionInout | UnionInstanceof | UnionInt | UnionInterface | UnionInternal | UnionIs | UnionIterable | UnionJdec | UnionJenc | UnionJpipe | UnionJSON | UnionJSONConverter | UnionJSONSerializer | UnionJSONToken | UnionJSONWriter | UnionLambda | UnionLazy | UnionLeft | UnionLet | UnionList | UnionLock | UnionLong | UnionMap | UnionMetadataPropertyHandling | UnionModule | UnionMutable | UnionMutating | UnionNamespace | UnionNative | UnionNew | UnionNewtonsoft | UnionNil | UnionNO | UnionNoexcept | UnionNonatomic | UnionNoneUnion | UnionNone | UnionNonlocal | UnionNonmutating | UnionNot | UnionNotEq | UnionNSString | UnionNULL | UnionNull | UnionNullptr | UnionNumber | UnionObject | UnionOf | UnionOneway | UnionOpen | UnionOperator | UnionOptional | UnionOr | UnionOrEq | UnionOut | UnionOverride | UnionPackage | UnionParams | UnionPass | UnionPort | UnionPostfix | UnionPrecedence | UnionPrefix | UnionPrint | UnionPrintf | UnionPrivate | UnionProtected | UnionProtocol | UnionProtocolUnion | UnionPublic | UnionQuicktype | UnionRaise | UnionRange | UnionReadonly | UnionRef | UnionRegister | UnionReinterpretCast | UnionRepeat | UnionRequire | UnionRequired | UnionRequires | UnionRestrict | UnionRetain | UnionRethrows | UnionReturn | UnionRight | UnionSbyte | UnionSealed | UnionSEL | UnionSelect | UnionSelf | UnionSelfUnion | UnionSerialize | UnionSet | UnionShort | UnionSigned | UnionSizeof | UnionStackalloc | UnionStatic | UnionStaticAssert | UnionStaticCast | UnionStrictfp | UnionString | UnionStruct | UnionSubscript | UnionSuper | UnionSwitch | UnionSymbol | UnionSynchronized | UnionSystem | UnionTemplate | UnionThen | UnionThis | UnionThreadLocal | UnionThrow | UnionThrows | UnionToJSON | UnionTopLevel | UnionTransient | UnionTrue | UnionTrueUnion | UnionTry | UnionType | UnionTypeUnion | UnionTypealias | UnionTypedef | UnionTypeid | UnionTypename | UnionTypeof | UnionUint | UnionUlong | UnionUnchecked | UnionUndefined | UnionUnionUnion | UnionUnowned | UnionUnsafe | UnionUnsigned | UnionUshort | UnionUsing | UnionVar | UnionVirtual | UnionVoid | UnionVolatile | UnionWcharT | UnionWeak | UnionWhere | UnionWhile | UnionWillSet | UnionWith | UnionXor | UnionXorEq | UnionYES | UnionYield;
+    [property: string]: unknown;
 }
 
 export type UnionAny = object | number;
diff --git a/base/schema-typescript/test/inputs/schema/list.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/list.schema/default/TopLevel.ts
index 9ca2844..a3e9b2b 100644
--- a/base/schema-typescript/test/inputs/schema/list.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/list.schema/default/TopLevel.ts
@@ -12,7 +12,7 @@
  */
 export interface TopLevel {
     next?: TopLevel;
-    [property: string]: unknown | TopLevel;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/min-max-items.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/min-max-items.schema/default/TopLevel.ts
index 70e7706..a88d16b 100644
--- a/base/schema-typescript/test/inputs/schema/min-max-items.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/min-max-items.schema/default/TopLevel.ts
@@ -13,7 +13,7 @@ export interface TopLevel {
     minOnly:    [string, string, ...string[]];
     plain:      string[];
     unionItems: [UnionItem, UnionItem, ...UnionItem[]];
-    [property: string]: unknown | number[] | [number, ...number[]] | [string, string, ...string[]] | string[] | [UnionItem, UnionItem, ...UnionItem[]];
+    [property: string]: unknown;
 }
 
 export type UnionItem = number | string;
diff --git a/base/schema-typescript/test/inputs/schema/minmax-integer.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/minmax-integer.schema/default/TopLevel.ts
index d87b58a..4d15bf4 100644
--- a/base/schema-typescript/test/inputs/schema/minmax-integer.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/minmax-integer.schema/default/TopLevel.ts
@@ -16,7 +16,7 @@ export interface TopLevel {
     minMaxIntersection: number;
     minMaxUnion:        number;
     union:              number;
-    [property: string]: unknown | number | number | number | number | number | number | number | number;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/minmax.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/minmax.schema/default/TopLevel.ts
index e322abd..74eb204 100644
--- a/base/schema-typescript/test/inputs/schema/minmax.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/minmax.schema/default/TopLevel.ts
@@ -16,7 +16,7 @@ export interface TopLevel {
     minMaxIntersection: number;
     minMaxUnion:        number;
     union:              number;
-    [property: string]: unknown | number | number | number | number | number | number | number | number;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/minmaxlength.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/minmaxlength.schema/default/TopLevel.ts
index 099bb1d..ce21e9c 100644
--- a/base/schema-typescript/test/inputs/schema/minmaxlength.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/minmaxlength.schema/default/TopLevel.ts
@@ -16,7 +16,7 @@ export interface TopLevel {
     minmaxlength:       string;
     minMaxUnion:        string;
     union:              string;
-    [property: string]: unknown | string | InUnion | string | string | string | string | string | string;
+    [property: string]: unknown;
 }
 
 export type InUnion = number | string;
diff --git a/base/schema-typescript/test/inputs/schema/multi-type-enum.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/multi-type-enum.schema/default/TopLevel.ts
index f35c058..2ac8eea 100644
--- a/base/schema-typescript/test/inputs/schema/multi-type-enum.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/multi-type-enum.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     foo: FooUnion;
-    [property: string]: unknown | FooUnion;
+    [property: string]: unknown;
 }
 
 export type FooUnion = boolean | number | FooEnum;
diff --git a/base/schema-typescript/test/inputs/schema/mutually-recursive.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/mutually-recursive.schema/default/TopLevel.ts
index 0023b09..332f39c 100644
--- a/base/schema-typescript/test/inputs/schema/mutually-recursive.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/mutually-recursive.schema/default/TopLevel.ts
@@ -11,12 +11,12 @@ export type Foo = TopLevel[] | TopLevel;
 
 export interface Bar {
     foo: Foo;
-    [property: string]: unknown | Foo;
+    [property: string]: unknown;
 }
 
 export interface TopLevel {
     bar?: Bar;
-    [property: string]: unknown | Bar;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.ts
index 9d5b3a1..8501247 100644
--- a/base/schema-typescript/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.ts
@@ -16,7 +16,7 @@ export interface Item {
     id?:      string;
     output?:  string;
     summary?: string;
-    [property: string]: unknown | string | string | string | string;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/non-standard-ref.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/non-standard-ref.schema/default/TopLevel.ts
index 162d815..9dd48da 100644
--- a/base/schema-typescript/test/inputs/schema/non-standard-ref.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/non-standard-ref.schema/default/TopLevel.ts
@@ -11,7 +11,7 @@ export interface TopLevel {
     bar:  number;
     foo:  number;
     quux: boolean;
-    [property: string]: unknown | number | number | boolean;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.ts
index 7eaf17d..d59ca93 100644
--- a/base/schema-typescript/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.ts
@@ -10,7 +10,7 @@
 export interface TopLevel {
     b?:   null | string;
     kind: Kind;
-    [property: string]: unknown | null | string | Kind;
+    [property: string]: unknown;
 }
 
 export type Kind = "one" | "two";
diff --git a/base/schema-typescript/test/inputs/schema/object-type-required.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/object-type-required.schema/default/TopLevel.ts
index bc6571a..8a93edc 100644
--- a/base/schema-typescript/test/inputs/schema/object-type-required.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/object-type-required.schema/default/TopLevel.ts
@@ -11,7 +11,7 @@ export interface TopLevel {
     empty: object;
     foo:   string;
     bar?:  string;
-    [property: string]: unknown | object | string | string;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/optional-constraints.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/optional-constraints.schema/default/TopLevel.ts
index 1d5b5b5..8cf1679 100644
--- a/base/schema-typescript/test/inputs/schema/optional-constraints.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/optional-constraints.schema/default/TopLevel.ts
@@ -13,7 +13,7 @@ export interface TopLevel {
     optPattern?: string;
     optString?:  string;
     reqZeroMin:  number;
-    [property: string]: unknown | number | number | string | string | number;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/pattern.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/pattern.schema/default/TopLevel.ts
index 4e30028..665a7fc 100644
--- a/base/schema-typescript/test/inputs/schema/pattern.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/pattern.schema/default/TopLevel.ts
@@ -11,7 +11,7 @@ export interface TopLevel {
     pattern1: string;
     pattern2: string;
     union:    string;
-    [property: string]: unknown | string | string | string;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/postman-collection.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/postman-collection.schema/default/TopLevel.ts
index 2deba04..34dfb4e 100644
--- a/base/schema-typescript/test/inputs/schema/postman-collection.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/postman-collection.schema/default/TopLevel.ts
@@ -14,12 +14,12 @@ export interface TopLevel {
     item?:     TopLevel[];
     name?:     string;
     response?: Response[];
-    [property: string]: unknown | TopLevel[] | string | Response[];
+    [property: string]: unknown;
 }
 
 export interface Response {
     body?: string;
-    [property: string]: unknown | string;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/prefix-items.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/prefix-items.schema/default/TopLevel.ts
index a39d9af..ee2e5bf 100644
--- a/base/schema-typescript/test/inputs/schema/prefix-items.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/prefix-items.schema/default/TopLevel.ts
@@ -10,7 +10,7 @@
 export interface TopLevel {
     open:  Open[];
     tuple: Open[];
-    [property: string]: unknown | Open[] | Open[];
+    [property: string]: unknown;
 }
 
 export type Open = boolean | number;
diff --git a/base/schema-typescript/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.ts
index 1d4abd2..3fc7608 100644
--- a/base/schema-typescript/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.ts
@@ -13,12 +13,12 @@ export type TopLevelElement = unknown[] | boolean | number | null | TopLevelObje
 
 export interface TopLevelObject {
     x?: X;
-    [property: string]: unknown | X;
+    [property: string]: unknown;
 }
 
 export interface XObject {
     x?: X;
-    [property: string]: unknown | X;
+    [property: string]: unknown;
 }
 
 export type XElement = unknown[] | boolean | number | null | XObject | string;
diff --git a/base/schema-typescript/test/inputs/schema/ref-id-files.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/ref-id-files.schema/default/TopLevel.ts
index 7a1dd40..4b340a1 100644
--- a/base/schema-typescript/test/inputs/schema/ref-id-files.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/ref-id-files.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     foo: number;
-    [property: string]: unknown | number;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/ref-remote.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/ref-remote.schema/default/TopLevel.ts
index 9ca2844..a3e9b2b 100644
--- a/base/schema-typescript/test/inputs/schema/ref-remote.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/ref-remote.schema/default/TopLevel.ts
@@ -12,7 +12,7 @@
  */
 export interface TopLevel {
     next?: TopLevel;
-    [property: string]: unknown | TopLevel;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/renaming-bug.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/renaming-bug.schema/default/TopLevel.ts
index a588b63..f2841a1 100644
--- a/base/schema-typescript/test/inputs/schema/renaming-bug.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/renaming-bug.schema/default/TopLevel.ts
@@ -11,60 +11,60 @@ export interface TopLevel {
     version?:  string;
     fruits?:   Fruit[];
     vehicles?: Vehicle[];
-    [property: string]: unknown | string | Fruit[] | Vehicle[];
+    [property: string]: unknown;
 }
 
 export interface Fruit {
     apple?:   boolean;
     berries?: Berry[];
     orange?:  boolean;
-    [property: string]: unknown | boolean | Berry[] | boolean;
+    [property: string]: unknown;
 }
 
 export interface Berry {
     color?:  Color;
     name?:   string;
     shapes?: Shape[];
-    [property: string]: unknown | Color | string | Shape[];
+    [property: string]: unknown;
 }
 
 export interface Color {
     rgb?: number;
-    [property: string]: unknown | number;
+    [property: string]: unknown;
 }
 
 export interface Shape {
     geometry?: Geometry;
     history?:  History;
-    [property: string]: unknown | Geometry | History;
+    [property: string]: unknown;
 }
 
 export interface Geometry {
     rectShape?:     RectShape;
     circularShape?: CircularShape[];
-    [property: string]: unknown | RectShape | CircularShape[];
+    [property: string]: unknown;
 }
 
 export interface CircularShape {
     shapeName?: string;
-    [property: string]: unknown | string;
+    [property: string]: unknown;
 }
 
 export interface RectShape {
     parts?: Part[];
-    [property: string]: unknown | Part[];
+    [property: string]: unknown;
 }
 
 export interface Part {
     depth?:  string;
     length?: string;
     width?:  string;
-    [property: string]: unknown | string | string | string;
+    [property: string]: unknown;
 }
 
 export interface History {
     class?: string;
-    [property: string]: unknown | string;
+    [property: string]: unknown;
 }
 
 export interface Vehicle {
@@ -74,25 +74,25 @@ export interface Vehicle {
     subModule?: boolean;
     type?:      VehicleType;
     year?:      string;
-    [property: string]: unknown | string | string | Speed | boolean | VehicleType | string;
+    [property: string]: unknown;
 }
 
 export interface Speed {
     velocity?: Limit;
-    [property: string]: unknown | Limit;
+    [property: string]: unknown;
 }
 
 export interface Limit {
     maximum?: number;
     minimum?: number;
-    [property: string]: unknown | number | number;
+    [property: string]: unknown;
 }
 
 export interface VehicleType {
     name?:   Name;
     width?:  Axis;
     length?: Axis;
-    [property: string]: unknown | Name | Axis | Axis;
+    [property: string]: unknown;
 }
 
 export type Axis = "X" | "Y" | "Z" | "YZ" | "ZX" | "XY";
diff --git a/base/schema-typescript/test/inputs/schema/required-draft3.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/required-draft3.schema/default/TopLevel.ts
index 808c46a..5d752aa 100644
--- a/base/schema-typescript/test/inputs/schema/required-draft3.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/required-draft3.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     longitude: number;
-    [property: string]: unknown | number;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/required-non-properties.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/required-non-properties.schema/default/TopLevel.ts
index f291bbe..b5a3f4a 100644
--- a/base/schema-typescript/test/inputs/schema/required-non-properties.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/required-non-properties.schema/default/TopLevel.ts
@@ -10,7 +10,7 @@
 export interface TopLevel {
     foo: number;
     bar: unknown;
-    [property: string]: unknown | number | unknown;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/required.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/required.schema/default/TopLevel.ts
index 808c46a..5d752aa 100644
--- a/base/schema-typescript/test/inputs/schema/required.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/required.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     longitude: number;
-    [property: string]: unknown | number;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.ts
index fd13718..b76a76b 100644
--- a/base/schema-typescript/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.ts
@@ -10,13 +10,13 @@
 export interface TopLevel {
     next?: Next;
     value: string;
-    [property: string]: unknown | Next | string;
+    [property: string]: unknown;
 }
 
 export interface Node {
     next?: Next;
     value: string;
-    [property: string]: unknown | Next | string;
+    [property: string]: unknown;
 }
 
 export type Next = null | Node | string;
diff --git a/base/schema-typescript/test/inputs/schema/schema-constraints.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/schema-constraints.schema/default/TopLevel.ts
index 88efcfe..80dbe26 100644
--- a/base/schema-typescript/test/inputs/schema/schema-constraints.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/schema-constraints.schema/default/TopLevel.ts
@@ -10,7 +10,7 @@
 export interface TopLevel {
     minMaxLength: string;
     percent:      number;
-    [property: string]: unknown | string | number;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/simple-ref.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/simple-ref.schema/default/TopLevel.ts
index 9ca2844..a3e9b2b 100644
--- a/base/schema-typescript/test/inputs/schema/simple-ref.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/simple-ref.schema/default/TopLevel.ts
@@ -12,7 +12,7 @@
  */
 export interface TopLevel {
     next?: TopLevel;
-    [property: string]: unknown | TopLevel;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/strict-optional.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/strict-optional.schema/default/TopLevel.ts
index 9e409d2..208356c 100644
--- a/base/schema-typescript/test/inputs/schema/strict-optional.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/strict-optional.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     foo: number | null;
-    [property: string]: unknown | number | null;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/top-level-array.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/top-level-array.schema/default/TopLevel.ts
index 3a48dba..bfa6424 100644
--- a/base/schema-typescript/test/inputs/schema/top-level-array.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/top-level-array.schema/default/TopLevel.ts
@@ -12,7 +12,7 @@ export type TopLevel = TextClassificationOutputElement[];
 export interface TextClassificationOutputElement {
     label: string;
     score: number;
-    [property: string]: unknown | string | number;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/tuple.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/tuple.schema/default/TopLevel.ts
index 7d12391..d90f7f5 100644
--- a/base/schema-typescript/test/inputs/schema/tuple.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/tuple.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     tuple: Tuple[];
-    [property: string]: unknown | Tuple[];
+    [property: string]: unknown;
 }
 
 export type Tuple = boolean | number;
diff --git a/base/schema-typescript/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.ts
index 38465bc..90b3f3e 100644
--- a/base/schema-typescript/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.ts
@@ -9,14 +9,14 @@
 
 export interface TopLevel {
     config?: Config;
-    [property: string]: unknown | Config;
+    [property: string]: unknown;
 }
 
 export interface Config {
     closed?:   Closed;
     name?:     string;
     settings?: { [key: string]: Item[] };
-    [property: string]: unknown | Closed | string | { [key: string]: Item[] };
+    [property: string]: unknown;
 }
 
 export type Closed = unknown[] | boolean | object | number | number | null | string;
@@ -24,7 +24,7 @@ export type Closed = unknown[] | boolean | object | number | number | null | str
 export interface Item {
     key:   string;
     value: string;
-    [property: string]: unknown | string | string;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/union-int-double.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/union-int-double.schema/default/TopLevel.ts
index 14c5bc6..bcd40b1 100644
--- a/base/schema-typescript/test/inputs/schema/union-int-double.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/union-int-double.schema/default/TopLevel.ts
@@ -9,7 +9,7 @@
 
 export interface TopLevel {
     value: Value;
-    [property: string]: unknown | Value;
+    [property: string]: unknown;
 }
 
 export type Value = number | string;
diff --git a/base/schema-typescript/test/inputs/schema/union.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/union.schema/default/TopLevel.ts
index a44e0f6..1ba82fe 100644
--- a/base/schema-typescript/test/inputs/schema/union.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/union.schema/default/TopLevel.ts
@@ -13,7 +13,7 @@ export interface TopLevelElement {
     one?:   number;
     two:    boolean;
     three?: number;
-    [property: string]: unknown | number | boolean | number;
+    [property: string]: unknown;
 }
 
 // Converts JSON strings to/from your types
diff --git a/base/schema-typescript/test/inputs/schema/uuid.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/uuid.schema/default/TopLevel.ts
index 7bb8abb..052065c 100644
--- a/base/schema-typescript/test/inputs/schema/uuid.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/uuid.schema/default/TopLevel.ts
@@ -14,7 +14,7 @@ export interface TopLevel {
     one:           string;
     optional?:     string;
     unionWithEnum: UnionWithEnumUnion;
-    [property: string]: unknown | (null | string)[] | string[] | null | string | string | string | UnionWithEnumUnion;
+    [property: string]: unknown;
 }
 
 export type UnionWithEnumUnion = UnionWithEnumEnum | string;
diff --git a/base/schema-typescript/test/inputs/schema/vega-lite.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/vega-lite.schema/default/TopLevel.ts
index 37e19d3..0ada8e0 100644
--- a/base/schema-typescript/test/inputs/schema/vega-lite.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/vega-lite.schema/default/TopLevel.ts
@@ -1706,7 +1706,7 @@ export interface RangeConfig {
      * Default range palette for the `shape` channel.
      */
     symbol?: string[];
-    [property: string]: RangeConfigValue | Category | Category | Category | Category | Category | string[];
+    [property: string]: RangeConfigValue | Category | string[] | undefined;
 }
 
 /**
