diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-schema-gen.xspec b/test-suite/metaschema-xspec/json-schema-gen/json-schema-gen.xspec
new file mode 100644
index 000000000..390056de9
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-schema-gen.xspec
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- autogenerated 2021-12-14T16:02:57.305-05:00 following model in example-set.xspec-->
+<x:description xmlns:x="http://www.jenitennison.com/xslt/xspec"
+   xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+   xmlns:j="http://www.w3.org/2005/xpath-functions"
+   stylesheet="../../../toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl"
+   run-as="external" xmlns:ov="http://csrc.nist.gov/ns/oscal/test/variable">
+
+   <x:scenario label="When generating a JSON schema from composed Metaschema definitions">
+      <x:scenario label="if it has a defined field with no constraint and no allowed-values">
+         <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
+            select="/*/m:define-field[@name='unconstrained']"/>
+         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
+            <map key="oscal-value-testing-mini-oscal-value-testing-mini:unconstrained">
+               <string key="title">Unconstrained</string>
+               <string key="description">A field whose value is constrained only by its nominal datatype, 'token'.</string>
+               <string key="$id">#field_oscal-value-testing-mini_unconstrained</string>
+               <string key="type">object</string>
+               <map key="properties">
+                  <map key="some">
+                     <string key="title">Some Flag</string>
+                     <string key="description">Some flag some flag some flag.</string>
+                     <string key="$ref">#/definitions/StringDatatype</string>
+                  </map>
+                  <map key="token-value">
+                     <string key="$ref">#/definitions/TokenDatatype</string>
+                  </map>
+               </map>
+               <array key="required">
+                  <string>token-value</string>
+               </array>
+               <boolean key="additionalProperties">false</boolean>
+            </map>
+         </x:expect>
+      </x:scenario>
+      
+      <x:scenario label="if it has a defined field with a constraint, allowed-values, strict enforcement of allow-other='no' and explicit target of '.'">
+         <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
+            select="/*/m:define-field[@name='constrained-closed']"/>
+         <x:expect label="the resulting JSON Schema should have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
+            <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-closed">
+               <string key="title">Constrained closed</string>
+               <string key="description">Because allow-other is 'no' an enumeration can be given in the JSON Schema.</string>
+               <string key="$id">#field_oscal-value-testing-mini_constrained-closed</string>
+               <string key="type">object</string>
+               <map key="properties">
+                  <map key="some">
+                     <string key="title">Some Flag</string>
+                     <string key="description">Some flag some flag some flag.</string>
+                     <string key="$ref">#/definitions/StringDatatype</string>
+                  </map>
+                  <map key="token-value">
+                     <array key="allOf">
+                        <map>
+                           <string key="$ref">#/definitions/TokenDatatype</string>
+                        </map>
+                        <map>
+                           <array key="enum">
+                              <string>one</string>
+                              <string>two</string>
+                              <string>three</string>
+                              <string>four</string>
+                           </array>
+                        </map>
+                     </array>
+                  </map>
+               </map>
+               <array key="required">
+                  <string>token-value</string>
+               </array>
+               <boolean key="additionalProperties">false</boolean>
+            </map>
+         </x:expect>
+      </x:scenario>
+   
+      <x:scenario label="if it has a defined field with a constraint, allowed-values, no explicit target, and permissive enforcement of allow-other='yes'">
+         <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
+            select="/*/m:define-field[@name='constrained-open']"/>
+         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
+            <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-open">
+               <string key="title">Constrained open</string>
+               <string key="description">Because allow-other is 'yes' no enumeration can be given in the JSON Schema.</string>
+               <string key="$id">#field_oscal-value-testing-mini_constrained-open</string>
+               <string key="type">object</string>
+               <map key="properties">
+                  <map key="some">
+                     <string key="title">Some Flag</string>
+                     <string key="description">Some flag some flag some flag.</string>
+                     <string key="$ref">#/definitions/StringDatatype</string>
+                  </map>
+                  <map key="token-value">
+                     <array key="anyOf">
+                        <map>
+                           <string key="$ref">#/definitions/TokenDatatype</string>
+                        </map>
+                        <map>
+                           <array key="enum">
+                              <string>one</string>
+                              <string>two</string>
+                              <string>three</string>
+                              <string>four</string>
+                           </array>
+                        </map>
+                     </array>
+                  </map>
+               </map>
+               <array key="required">
+                  <string>token-value</string>
+               </array>
+               <boolean key="additionalProperties">false</boolean>
+            </map>
+         </x:expect>
+      </x:scenario>
+
+      <x:scenario label="if it has a defined field with a constraint, allowed-values, strict enforcement of allow-other='no' and explicit target other than '.'">
+         <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
+            select="/*/m:define-field[@name='constrained-narrow']"/>
+         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
+            <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-narrow">
+               <string key="title">Constrained narrow</string>
+               <string key="description">Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</string>
+               <string key="$id">#field_oscal-value-testing-mini_constrained-narrow</string>
+               <string key="type">object</string>
+               <map key="properties">
+                  <map key="some">
+                     <string key="title">Some Flag</string>
+                     <string key="description">Some flag some flag some flag.</string>
+                     <string key="$ref">#/definitions/StringDatatype</string>
+                  </map>
+                  <map key="token-value">
+                     <string key="$ref">#/definitions/TokenDatatype</string>
+                  </map>
+               </map>
+               <array key="required">
+                  <string>token-value</string>
+               </array>
+               <boolean key="additionalProperties">false</boolean>
+            </map>
+         </x:expect>
+      </x:scenario>
+   
+      <x:scenario label="if it has a defined field with a constraint, allowed-values, permissive enforcement of allow-other='yes' and explicit target other than '.'">
+         <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
+            select="/*/m:define-field[@name='constrained-sortof']"/>
+         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
+            <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-sortof">
+               <string key="title">Constrained, sort of</string>
+               <string key="description">Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</string>
+               <string key="$id">#field_oscal-value-testing-mini_constrained-sortof</string>
+               <string key="type">object</string>
+               <map key="properties">
+                  <map key="some">
+                     <string key="title">Some Flag</string>
+                     <string key="description">Some flag some flag some flag.</string>
+                     <string key="$ref">#/definitions/StringDatatype</string>
+                  </map>
+                  <map key="token-value">
+                     <string key="$ref">#/definitions/TokenDatatype</string>
+                  </map>
+               </map>
+               <array key="required">
+                  <string>token-value</string>
+               </array>
+               <boolean key="additionalProperties">false</boolean>
+            </map>
+         </x:expect>
+      </x:scenario>
+   </x:scenario>
+</x:description>
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema-COMPOSED.xml b/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema-COMPOSED.xml
new file mode 100644
index 000000000..6f0e831fe
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema-COMPOSED.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<METASCHEMA xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            abstract="no"
+            module="oscal-value-testing-mini"
+            _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml">
+   <INFO info-type="objects-used">Seeing assembly#oscal-value-testing-mini:root, field#oscal-value-testing-mini:unconstrained, field#oscal-value-testing-mini:constrained-open, field#oscal-value-testing-mini:constrained-closed, field#oscal-value-testing-mini:constrained-narrow, field#oscal-value-testing-mini:constrained-sortof</INFO>
+   <schema-name>JSON value testing mini metaschema</schema-name>
+   <schema-version>0.1</schema-version>
+   <short-name>oscal-value-testing-mini</short-name>
+   <namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>
+   <json-base-uri>http://csrc.nist.gov/ns/oscal</json-base-uri>
+   <define-assembly _metaschema-xml-id="/assembly/oscal-value-testing-mini/root"
+                    _metaschema-json-id="/assembly/oscal-value-testing-mini/root"
+                    scope="global"
+                    name="root"
+                    module="oscal-value-testing-mini"
+                    _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
+                    _key-name="oscal-value-testing-mini:root"
+                    _using-root-name="root">
+      <formal-name>Root</formal-name>
+      <description>Root root root.</description>
+      <root-name>root</root-name>
+      <model>
+         <field _step="unconstrained"
+                _key="unconstrained"
+                _metaschema-xml-id="/assembly/oscal-value-testing-mini/root/unconstrained"
+                _metaschema-json-id="/assembly/oscal-value-testing-mini/root/unconstrained"
+                max-occurs="1"
+                min-occurs="0"
+                ref="unconstrained"
+                _key-ref="oscal-value-testing-mini:unconstrained"
+                _using-name="unconstrained"
+                _in-xml-name="unconstrained"
+                _in-json-name="unconstrained"/>
+         <field _step="constrained-open"
+                _key="constrained-open"
+                _metaschema-xml-id="/assembly/oscal-value-testing-mini/root/constrained-open"
+                _metaschema-json-id="/assembly/oscal-value-testing-mini/root/constrained-open"
+                max-occurs="1"
+                min-occurs="0"
+                ref="constrained-open"
+                _key-ref="oscal-value-testing-mini:constrained-open"
+                _using-name="constrained-open"
+                _in-xml-name="constrained-open"
+                _in-json-name="constrained-open"/>
+         <field _step="constrained-closed"
+                _key="constrained-closed"
+                _metaschema-xml-id="/assembly/oscal-value-testing-mini/root/constrained-closed"
+                _metaschema-json-id="/assembly/oscal-value-testing-mini/root/constrained-closed"
+                max-occurs="1"
+                min-occurs="0"
+                ref="constrained-closed"
+                _key-ref="oscal-value-testing-mini:constrained-closed"
+                _using-name="constrained-closed"
+                _in-xml-name="constrained-closed"
+                _in-json-name="constrained-closed"/>
+         <field _step="constrained-narrow"
+                _key="constrained-narrow"
+                _metaschema-xml-id="/assembly/oscal-value-testing-mini/root/constrained-narrow"
+                _metaschema-json-id="/assembly/oscal-value-testing-mini/root/constrained-narrow"
+                max-occurs="1"
+                min-occurs="0"
+                ref="constrained-narrow"
+                _key-ref="oscal-value-testing-mini:constrained-narrow"
+                _using-name="constrained-narrow"
+                _in-xml-name="constrained-narrow"
+                _in-json-name="constrained-narrow"/>
+         <field _step="constrained-sortof"
+                _key="constrained-sortof"
+                _metaschema-xml-id="/assembly/oscal-value-testing-mini/root/constrained-sortof"
+                _metaschema-json-id="/assembly/oscal-value-testing-mini/root/constrained-sortof"
+                max-occurs="1"
+                min-occurs="0"
+                ref="constrained-sortof"
+                _key-ref="oscal-value-testing-mini:constrained-sortof"
+                _using-name="constrained-sortof"
+                _in-xml-name="constrained-sortof"
+                _in-json-name="constrained-sortof"/>
+      </model>
+   </define-assembly>
+   <define-field _metaschema-xml-id="/field/oscal-value-testing-mini/unconstrained"
+                 _metaschema-json-id="/field/oscal-value-testing-mini/unconstrained"
+                 collapsible="no"
+                 as-type="token"
+                 scope="global"
+                 name="unconstrained"
+                 module="oscal-value-testing-mini"
+                 _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
+                 _key-name="oscal-value-testing-mini:unconstrained">
+      <formal-name>Unconstrained</formal-name>
+      <description>A field whose value is constrained only by its nominal datatype, 'token'.</description>
+      <json-value-key>token-value</json-value-key>
+      <define-flag _step="some"
+                   _key="some"
+                   _metaschema-xml-id="/field/oscal-value-testing-mini/unconstrained/some"
+                   _metaschema-json-id="/field/oscal-value-testing-mini/unconstrained/some"
+                   required="no"
+                   as-type="string"
+                   name="some"
+                   _using-name="some"
+                   _in-xml-name="some"
+                   _in-json-name="some">
+         <formal-name>Some Flag</formal-name>
+         <description>Some flag some flag some flag.</description>
+      </define-flag>
+   </define-field>
+   <define-field _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-open"
+                 _metaschema-json-id="/field/oscal-value-testing-mini/constrained-open"
+                 collapsible="no"
+                 as-type="token"
+                 scope="global"
+                 name="constrained-open"
+                 module="oscal-value-testing-mini"
+                 _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
+                 _key-name="oscal-value-testing-mini:constrained-open">
+      <formal-name>Constrained open</formal-name>
+      <description>Because allow-other is 'yes' no enumeration can be given in the JSON Schema.</description>
+      <json-value-key>token-value</json-value-key>
+      <define-flag _step="some"
+                   _key="some"
+                   _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-open/some"
+                   _metaschema-json-id="/field/oscal-value-testing-mini/constrained-open/some"
+                   required="no"
+                   as-type="string"
+                   name="some"
+                   _using-name="some"
+                   _in-xml-name="some"
+                   _in-json-name="some">
+         <formal-name>Some Flag</formal-name>
+         <description>Some flag some flag some flag.</description>
+      </define-flag>
+      <constraint>
+         <allowed-values target="." allow-other="yes">
+            <enum value="one"/>
+            <enum value="two"/>
+            <enum value="three"/>
+            <enum value="four"/>
+         </allowed-values>
+      </constraint>
+   </define-field>
+   <define-field _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-closed"
+                 _metaschema-json-id="/field/oscal-value-testing-mini/constrained-closed"
+                 collapsible="no"
+                 as-type="token"
+                 scope="global"
+                 name="constrained-closed"
+                 module="oscal-value-testing-mini"
+                 _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
+                 _key-name="oscal-value-testing-mini:constrained-closed">
+      <formal-name>Constrained closed</formal-name>
+      <description>Because allow-other is 'no' an enumeration can be given in the JSON Schema.</description>
+      <json-value-key>token-value</json-value-key>
+      <define-flag _step="some"
+                   _key="some"
+                   _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-closed/some"
+                   _metaschema-json-id="/field/oscal-value-testing-mini/constrained-closed/some"
+                   required="no"
+                   as-type="string"
+                   name="some"
+                   _using-name="some"
+                   _in-xml-name="some"
+                   _in-json-name="some">
+         <formal-name>Some Flag</formal-name>
+         <description>Some flag some flag some flag.</description>
+      </define-flag>
+      <constraint>
+         <allowed-values target="." allow-other="no">
+            <enum value="one"/>
+            <enum value="two"/>
+            <enum value="three"/>
+            <enum value="four"/>
+         </allowed-values>
+      </constraint>
+   </define-field>
+   <define-field _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-narrow"
+                 _metaschema-json-id="/field/oscal-value-testing-mini/constrained-narrow"
+                 collapsible="no"
+                 as-type="token"
+                 scope="global"
+                 name="constrained-narrow"
+                 module="oscal-value-testing-mini"
+                 _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
+                 _key-name="oscal-value-testing-mini:constrained-narrow">
+      <formal-name>Constrained narrow</formal-name>
+      <description>Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</description>
+      <json-value-key>token-value</json-value-key>
+      <define-flag _step="some"
+                   _key="some"
+                   _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-narrow/some"
+                   _metaschema-json-id="/field/oscal-value-testing-mini/constrained-narrow/some"
+                   required="no"
+                   as-type="string"
+                   name="some"
+                   _using-name="some"
+                   _in-xml-name="some"
+                   _in-json-name="some">
+         <formal-name>Some Flag</formal-name>
+         <description>Some flag some flag some flag.</description>
+      </define-flag>
+      <constraint>
+         <allowed-values target=".[not(false())]" allow-other="no">
+            <enum value="one"/>
+            <enum value="two"/>
+            <enum value="three"/>
+            <enum value="four"/>
+         </allowed-values>
+      </constraint>
+   </define-field>
+   <define-field _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-sortof"
+                 _metaschema-json-id="/field/oscal-value-testing-mini/constrained-sortof"
+                 collapsible="no"
+                 as-type="token"
+                 scope="global"
+                 name="constrained-sortof"
+                 module="oscal-value-testing-mini"
+                 _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
+                 _key-name="oscal-value-testing-mini:constrained-sortof">
+      <formal-name>Constrained, sort of</formal-name>
+      <description>Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</description>
+      <json-value-key>token-value</json-value-key>
+      <define-flag _step="some"
+                   _key="some"
+                   _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-sortof/some"
+                   _metaschema-json-id="/field/oscal-value-testing-mini/constrained-sortof/some"
+                   required="no"
+                   as-type="string"
+                   name="some"
+                   _using-name="some"
+                   _in-xml-name="some"
+                   _in-json-name="some">
+         <formal-name>Some Flag</formal-name>
+         <description>Some flag some flag some flag.</description>
+      </define-flag>
+      <constraint>
+         <allowed-values target=".[not(false())]" allow-other="yes">
+            <enum value="one"/>
+            <enum value="two"/>
+            <enum value="three"/>
+            <enum value="four"/>
+         </allowed-values>
+      </constraint>
+   </define-field>
+</METASCHEMA>
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml b/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml
new file mode 100644
index 000000000..b76d841e9
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/css" href="metaschema-author.css"?>
+<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../schema/xml/metaschema.xsd"
+ xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" abstract="no">
+    <schema-name>JSON value testing mini metaschema</schema-name>
+    <schema-version>0.1</schema-version>
+    <short-name>oscal-value-testing-mini</short-name>
+    <namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>
+    <json-base-uri>http://csrc.nist.gov/ns/oscal</json-base-uri>
+    <define-assembly name="root">
+        <formal-name>Root</formal-name>
+        <description>Root root root.</description>
+        <root-name>root</root-name>
+        <model>
+            <field ref="unconstrained"/>
+            <field ref="constrained-open"/>
+            <field ref="constrained-closed"/>
+            <field ref="constrained-narrow"/>
+            <field ref="constrained-sortof"/>
+        </model>
+    </define-assembly>
+    <define-field 
+        as-type="token"
+        name="unconstrained">
+        <formal-name>Unconstrained</formal-name>
+        <description>A field whose value is constrained only by its nominal datatype, 'token'.</description>
+        <json-value-key>token-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+    </define-field>
+    <define-field 
+        as-type="token"
+        name="constrained-open">
+        <formal-name>Constrained open</formal-name>
+        <description>Because allow-other is 'yes' no enumeration can be given in the JSON Schema.</description>
+        <json-value-key>token-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+        <constraint>
+            <allowed-values target="." allow-other="yes">
+                <enum value="one"/>
+                <enum value="two"/>
+                <enum value="three"/>
+                <enum value="four"/>
+            </allowed-values>
+        </constraint>
+    </define-field>
+    <define-field 
+        as-type="token"
+        name="constrained-closed">
+        <formal-name>Constrained closed</formal-name>
+        <description>Because allow-other is 'no' an enumeration can be given in the JSON Schema.</description>
+        <json-value-key>token-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+        <constraint>
+            <allowed-values target="." allow-other="no">
+                <enum value="one"/>
+                <enum value="two"/>
+                <enum value="three"/>
+                <enum value="four"/>
+            </allowed-values>
+        </constraint>
+    </define-field>
+    <define-field 
+        as-type="token"
+        name="constrained-narrow">
+        <formal-name>Constrained narrow</formal-name>
+        <description>Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</description>
+        <json-value-key>token-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+        <constraint>
+            <allowed-values target=".[not(false())]" allow-other="no">
+                <enum value="one"/>
+                <enum value="two"/>
+                <enum value="three"/>
+                <enum value="four"/>
+            </allowed-values>
+        </constraint>
+    </define-field>
+    <define-field 
+        as-type="token"
+        name="constrained-sortof">
+        <formal-name>Constrained, sort of</formal-name>
+        <description>Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</description>
+        <json-value-key>token-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+        <constraint>
+            <allowed-values target=".[not(false())]" allow-other="yes">
+                <enum value="one"/>
+                <enum value="two"/>
+                <enum value="three"/>
+                <enum value="four"/>
+            </allowed-values>
+        </constraint>
+    </define-field>
+</METASCHEMA>
diff --git a/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl b/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
index adf166264..ff22c30fe 100644
--- a/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
+++ b/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
@@ -30,20 +30,9 @@
     <xsl:key name="field-definition-by-name"    match="METASCHEMA/define-field"    use="@_key-name"/>
     <xsl:key name="flag-definition-by-name"     match="METASCHEMA/define-flag"     use="@_key-name"/>
     
-    <!--Keys for retrieving datatypes:
+    <xsl:import href="../nist-metaschema-COMPOSE.xsl"/>
+    <xsl:variable name="composed-metaschema" select="/"/> 
     
-    <xsl:key name="typename-for-syntax"
-    
-    -->
-    <!-- Produces composed metaschema (imports resolved) -->
-    <!--<xsl:import href="../nist-metaschema-COMPOSE.xsl"/>
-    <xsl:variable name="composed-metaschema" select="/"/>
-    
-    <!-- bypasses composition to operate on the 'raw' metaschema for debugging -->
-    <!--<xsl:template mode="debug"  match="/METASCHEMA">
-        <xsl:apply-templates select="*"/>
-    </xsl:template>-->
-
    
     <xsl:template match="/METASCHEMA" expand-text="true">
         
@@ -169,8 +158,7 @@
             </xsl:where-populated>
             <xsl:call-template name="require-or-allow"/>
             
-            <!-- allowed-values only present on fields -->
-            <xsl:apply-templates select="constraint/allowed-values"/>
+
     </xsl:template>
     
     <xsl:template match="define-field[exists(json-value-key-flag/@flag-ref)]">
@@ -200,8 +188,6 @@
                 <xsl:value-of
                     select="count($all-properties | self::define-field)"/>
             </number>
-            <!-- allowed-values only present on fields -->
-            <xsl:apply-templates select="constraint/allowed-values"/>
     </xsl:template>
     
     
@@ -250,13 +236,10 @@
     
     <xsl:template match="remarks | example"/>
     
-    <!-- No restriction is introduced when allow others is 'yes' -->
-    <xsl:template match="allowed-values[@allow-other='yes']"/>
-    
     <!--<xsl:template match="allowed-values"/>-->
     <xsl:template match="allowed-values">
         <array key="enum">
-            <xsl:apply-templates/>
+            <xsl:apply-templates select="child::*"/>
         </array>
     </xsl:template>
     
@@ -310,24 +293,6 @@
         </boolean>
     </xsl:template>
     
-    <!--<xsl:template name="string-or-array-of-strings">
-        <array key="oneOf">
-            <map>
-                <string key="type">string</string>
-            </map>
-            <map>
-                <string key="type">array</string>
-                <array key="items">
-                    <map>
-                        <string key="type">string</string>
-                    </map>
-                </array>
-                <string key="minItems">2</string>
-            </map>
-        </array>
-    </xsl:template>-->
-    
-    
     <xsl:template match="*" mode="text-property"/>
     
     <xsl:template match="define-field" mode="text-property">
@@ -376,49 +341,38 @@
         </xsl:variable>
         <xsl:if test="matches($this-key, '\S')">
             <map key="{$this-key}">
-                <string key="type">string</string>
-            </map>
-        </xsl:if>
-    </xsl:template>
-
-    <!-- A collapsible field is represented as an object containing
-         a string or an array of strings
-    turned off for now until we reinstate collapsing into conversion scripts (2020-09-21) -->
-    <!--<xsl:template match="define-field[@collapsible='yes']" mode="properties">
-        <!-\-<xsl:variable name="json-key-flag" select="json-key/@flag-ref"/>
-        <xsl:apply-templates mode="declaration" select="flag[not(@ref = $json-key-flag)], define-flag[not(@name = $json-key-flag)]"/>-\->
-        <xsl:apply-templates mode="define" select="flag | define-flag"/>
-        <xsl:variable name="this-key" as="xs:string?">
-            <xsl:apply-templates select="." mode="value-key"/>
-        </xsl:variable>
-        <xsl:if test="matches($this-key, '\S')">
-            <map key="{$this-key}">
-                <array key="anyOf">
-                    <map><string key="type">string</string></map>
-                    <map>
-                        <string key="type">array</string>
-                        <map key="items">
-                            <string key="type">string</string>
-                        </map>
-                        <number key="minItems">1</number><!-\- See Issue #536 -\->
-                    </map>
-                </array>
+                <xsl:variable name="nominal-object-type" as="element()">
+                    <xsl:apply-templates select="." mode="object-type"/>
+                </xsl:variable>
+                <xsl:choose>
+                    <xsl:when test="constraint/allowed-values/@allow-other = 'yes' and (constraint/allowed-values/@target = '.' or empty(constraint/allowed-values/@target))">
+                        <array key="anyOf">
+                            <map>
+                                <xsl:sequence select="$nominal-object-type"/>
+                            </map>
+                            <map>
+                                <xsl:apply-templates select="constraint/allowed-values"/>
+                            </map>
+                        </array>                        
+                    </xsl:when>
+                    <xsl:when test="constraint/allowed-values/@allow-other = 'no' and (constraint/allowed-values/@target = '.' or empty(constraint/allowed-values/@target))">
+                        <array key="allOf">
+                            <map>
+                                <xsl:sequence select="$nominal-object-type"/>
+                            </map>
+                            <map>
+                                <xsl:apply-templates select="constraint/allowed-values"/>
+                            </map>
+                        </array>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:sequence select="$nominal-object-type"/>
+                    </xsl:otherwise>
+                </xsl:choose>
             </map>
         </xsl:if>
-    </xsl:template>-->
-    
-    <!--<xsl:template priority="2" mode="property-name" match="assembly">
-        <xsl:apply-templates mode="#current" select="key('assembly-definition-by-name',@_key-ref)"/>
-    </xsl:template>
-    
-    <xsl:template priority="2" mode="property-name" match="field">
-        <xsl:apply-templates mode="#current" select="key('field-definition-by-name',@_key-ref)"/>
     </xsl:template>
     
-    <xsl:template priority="2" mode="property-name" match="flag">
-        <xsl:apply-templates mode="#current" select="key('flag-definition-by-name',@_key-ref)"/>
-    </xsl:template>-->
-    
     <xsl:template priority="2" mode="property-name" match="define-field | define-assembly | define-flag | assembly | field | flag" expand-text="true">
         <string>{ @_in-json-name }</string>
     </xsl:template>
@@ -432,7 +386,6 @@
     
     <!--A flag declared as a key or value key gets no declaration since it
     will not show up in the JSON as a separate property -->
-    
     <xsl:template mode="define" priority="5" match="define-flag[@name=../(json-value-key-flag|json-key)/@flag-ref] |
         flag[@ref=../(json-value-key-flag|json-key)/@flag-ref]"/>
     
@@ -675,73 +628,19 @@
 
     <xsl:variable name="datatypes" expand-text="false">
         <xsl:copy-of xpath-default-namespace="http://www.w3.org/2005/xpath-functions" select="( unparsed-text($json-datatypes-path) => json-to-xml() )/map/map[@key='definitions']/map"/>
-        
-        <!-- Some old datatype names are preserved for backward compatibility -->
-        <!-- see ../../../schema/xml/metaschema.xsd line 1052 inside  /*/xs:simpleType[@name='SimpleDatatypesType']> -->
-        
-        <!--<map key="decimal"><!-\- DecimalDatatype -\->
-            <string key="type">number</string>
-            <!-\-<string key="pattern">^(\+|-)?([0-9]+(\.[0-9]*)?|\.[0-9]+)$</string>-\->
-        </map>
-        <map key="date"><!-\- DateDatatype -\->
-            <string key="type">string</string>
-            <string key="pattern">^((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))(Z|[+-][0-9]{2}:[0-9]{2})?$</string>
-        </map>-->
         <map key="dateTime"><!-- DateTimeDatatype -->
             <string key="type">string</string>
             <string key="pattern">^((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-][0-9]{2}:[0-9]{2})?$</string>
         </map>
-        <!--<map key="date-with-timezone"><!-\- DateWithTimezoneDatatype -\->
-            <string key="type">string</string>
-            <string key="pattern">^((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))(Z|[+-][0-9]{2}:[0-9]{2})$</string>
-        </map>-->
-        <map key="dateTime-with-timezone"><!-- DateTimeWithTimezoneDatatype -->
+        <map key="dateTime-with-timezone">
             <string key="type">string</string>
             <string key="format">date-time</string>
             <string key="pattern">^((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-][0-9]{2}:[0-9]{2})$</string>
         </map>
-        <map key="email"><!-- EmailAddressDatatype -->
+        <map key="email">
             <string key="type">string</string>
             <string key="format">email</string>
             <string key="pattern">^.+@.+$</string>
         </map>
-        <!--<map key="ip-v4-address"><!-\- IPV4AddressDatatype -\->
-            <string key="type">string</string>
-            <string key="format">ipv4</string>
-            <string key="pattern">^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]).){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$</string>
-        </map>
-        <map key="ip-v6-address"><!-\- IPV6AddressDatatype -\->
-            <string key="type">string</string>
-            <string key="format">ipv6</string>
-            <string key="pattern">^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|[fF][eE]80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::([fF]{4}(:0{1,4}){0,1}:){0,1}((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]).){3,3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]).){3,3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]))$</string>
-        </map>
-        <map key="hostname"><!-\- HostnameDatatype -\->
-            <string key="$ref">#/definitions/StringDatatype</string>
-            <string key="format">idn-hostname</string>
-        </map>
-        <map key="uri"><!-\- URIDatatype -\->
-            <string key="type">string</string>
-            <string key="format">uri</string>
-            <string key="pattern">^[a-zA-Z][a-zA-Z0-9+\-.]+:.+$</string>
-        </map>
-        <map key="uri-reference"><!-\- URIReferenceDatatype -\->
-            <string key="type">string</string>
-            <string key="format">uri-reference</string>
-        </map>
-        <map key="uuid"><!-\- UUIDDatatype -\->
-            <string key="type">string</string>
-            <string key="description">A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.</string>
-            <string key="pattern">^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$</string>
-        </map>
-        <map xmlns="http://www.w3.org/2005/xpath-functions" key="token"><!-\- TokenDatatype -\->
-            <string key="type">string</string>
-            <string key="pattern">^(\p{L}|_)(\p{L}|\p{N}|[.\-_])*$</string>
-        </map>
-        
-        <map key="string">
-            <string key="type">string</string>
-            <string key="pattern">^\S(.*\S)?$</string>
-        </map>-->
     </xsl:variable>
-
 </xsl:stylesheet>