diff --git a/test-suite/broken/allowed-values-confusion-metaschema.xml b/test-suite/broken/allowed-values-confusion-metaschema.xml
deleted file mode 100644
index 131cad420..000000000
--- a/test-suite/broken/allowed-values-confusion-metaschema.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/css" href="../../../support/lib/metaschema-author.css"?>
-<?xml-model href="../../toolchains/xslt-M4/validate/metaschema-check.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
-<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../support/lib/metaschema.xsd"
- xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
-    <schema-name>Test Metaschema</schema-name>
-    <schema-version>1.0</schema-version>
-    <short-name>anthology</short-name>
-    <namespace>http://csrc.nist.gov/metaschema/ns/test</namespace>
-   
-   <remarks>
-       <p>Bug: test produced for constraint 'chronology-check' at the end, erroneously applies to elements defined with local definitions with the same name.</p>
-       <p>Local definitions must provide implicit overrides of rules defined in global definitions.</p>
-   </remarks>
- 
- 
-    <define-field name="item">
-        <formal-name>Item</formal-name>
-        <description>A member of a sequence</description>
-        <flag ref="type"/>
-        <define-flag name="id"/>
-        
-        <constraint>
-            <allowed-values target="." allow-other="no" id="G1">
-                <enum value="A">a</enum>
-                <enum value="B">b</enum>
-                <enum value="C">c</enum>
-            </allowed-values>
-            <is-unique name="item-uniqueness" target=".">
-                <key-field target="@id"/>
-            </is-unique>
-            <require when="@type='hex'">
-                <matches target="." regex="[\dabcdef]+"></matches>
-            </require>
-        </constraint>
-    </define-field>
-    
-    <define-assembly name="number-sequences">
-        <formal-name>Number sequences</formal-name>
-        <description>Several number sequences, in sequence</description>
-        <root-name>SEQUENCES</root-name>
-        <model>
-            <assembly ref="sequence" max-occurs="unbounded">
-                <group-as name="sequences"/>
-            </assembly>
-        </model>
-    </define-assembly>
-    
-    <define-assembly name="sequence">
-        <formal-name>Sequence</formal-name>
-        <description>A series of items</description>
-        <model>
-            <field ref="item" max-occurs="unbounded">
-                <group-as name="items" in-json="SINGLETON_OR_ARRAY"/>
-            </field>
-            <assembly ref="subsequence" max-occurs="unbounded">
-                <group-as name="subsequences"/>
-            </assembly>
-        </model>
-        <constraint>
-            <allowed-values target=".//item[@type='number']" allow-other="yes" id="T1">
-                <enum value="1">one</enum>
-                <enum value="2">two</enum>
-                <enum value="3">three</enum>
-            </allowed-values>
-            
-            <!-- Extends is not implemented: which definition(s) does this extend?
-                 possibilities include global and local definitions for 'item' -->
-            <allowed-values target=".//item[@type='german']" id="T2">
-                <!-- should this produce a rule applicable to .//subsequence/item[@type='german'] ?  (yes) -->
-                <enum value="Ä">a umlaut</enum>
-                <enum value="Ö">o umlaut</enum>
-                <enum value="Ü">u umlaut</enum>
-            </allowed-values>
-            
-            <allowed-values target=".//subsequence//item" id="T3">
-                <!-- which 'allowed-values' will this extend? Any? note that subsequence/item is defined locally.
-                     If this rule applies, what are the respective sets for subsequence/item[@type='color']-->
-                <enum value="pink">pink</enum>
-                <enum value="orange">orange</enum>
-                <enum value="purple">purple</enum>
-            </allowed-values>
-        </constraint>
-    </define-assembly>
-    
-    <define-assembly name="subsequence">
-        <formal-name>Subsequence</formal-name>
-        <description>More sequences</description>
-        <model>
-            <!--<assembly ref="sequence"/>-->
-            <define-field name="item" max-occurs="unbounded">
-<!-- Q: does this local field declaration overlap in any way with other declarations of 'item'?
-     if not, must not other rules for other allowed-values make an exception for subsequence/item? -->
-                <formal-name>Subsequence item</formal-name>
-                <description>An item in a sequence in a sequence</description>
-                <group-as name="items"/>
-                <constraint>
-                        <allowed-values target="." id="L1">
-                            <enum value="red">red</enum>
-                            <enum value="blue">blue</enum>
-                            <enum value="green">green</enum>
-                        </allowed-values>
-                </constraint>
-            </define-field>
-            <assembly ref="subsequence" max-occurs="unbounded">
-                <group-as name="subsequences"/>
-            </assembly>
-        </model>
-    </define-assembly>
-    
-    <define-flag name="type">
-        <formal-name>Item type</formal-name>
-        <description>Characterizes the type of item</description>
-    </define-flag>
-</METASCHEMA>
\ No newline at end of file
diff --git a/test-suite/broken/allowed-values-confusion-metaschema_JSON-SCHEMA.json b/test-suite/broken/allowed-values-confusion-metaschema_JSON-SCHEMA.json
deleted file mode 100644
index 972357c20..000000000
--- a/test-suite/broken/allowed-values-confusion-metaschema_JSON-SCHEMA.json
+++ /dev/null
@@ -1,108 +0,0 @@
-
-  { "$schema" : "http://json-schema.org/draft-07/schema#",
-    "$id" : "http://csrc.nist.gov/metaschema/ns/test-schema.json",
-    "$comment" : "Test Metaschema: JSON Schema",
-    "type" : "object",
-    "definitions" : 
-    { "item" : 
-      { "title" : "Item",
-        "description" : "A member of a sequence",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Item type",
-            "description" : "Characterizes the type of item",
-            "type" : "string" },
-          "id" : 
-          { "type" : "string" },
-          "STRVALUE" : 
-          { "type" : "string" } },
-        "required" : 
-        [ "STRVALUE" ],
-        "additionalProperties" : false,
-        "enum" : 
-        [ "A",
-          "B",
-          "C" ] },
-      "SEQUENCES" : 
-      { "title" : "Number sequences",
-        "description" : "Several number sequences, in sequence",
-        "type" : "object",
-        "properties" : 
-        { "sequences" : 
-          { "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/sequence" },
-              
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#/definitions/sequence" } } ] } },
-        "additionalProperties" : false },
-      "sequence" : 
-      { "title" : "Sequence",
-        "description" : "A series of items",
-        "type" : "object",
-        "properties" : 
-        { "items" : 
-          { "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/item" },
-              
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#/definitions/item" } } ] },
-          "subsequences" : 
-          { "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/subsequence" },
-              
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#/definitions/subsequence" } } ] } },
-        "additionalProperties" : false },
-      "subsequence" : 
-      { "title" : "Subsequence",
-        "description" : "More sequences",
-        "type" : "object",
-        "properties" : 
-        { "items" : 
-          { "anyOf" : 
-            [ 
-              { "item" : 
-                { "title" : "Subsequence item",
-                  "description" : "An item in a sequence in a sequence",
-                  "type" : "string",
-                  "enum" : 
-                  [ "red",
-                    "blue",
-                    "green" ] } },
-              
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "item" : 
-                  { "title" : "Subsequence item",
-                    "description" : "An item in a sequence in a sequence",
-                    "type" : "string",
-                    "enum" : 
-                    [ "red",
-                      "blue",
-                      "green" ] } } } ] },
-          "subsequences" : 
-          { "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/subsequence" },
-              
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#/definitions/subsequence" } } ] } },
-        "additionalProperties" : false } },
-    "properties" : 
-    { "SEQUENCES" : 
-      { "$ref" : "#/definitions/SEQUENCES" } },
-    "required" : 
-    [ "SEQUENCES" ] }
\ No newline at end of file
diff --git a/test-suite/broken/allowed-values-confusion-metaschema_METATRON.sch b/test-suite/broken/allowed-values-confusion-metaschema_METATRON.sch
deleted file mode 100644
index 67d73d521..000000000
--- a/test-suite/broken/allowed-values-confusion-metaschema_METATRON.sch
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-        xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-        xmlns="http://purl.oclc.org/dsdl/schematron"
-        queryBinding="xslt2">
-   <ns prefix="m" uri="http://csrc.nist.gov/ns/oscal/metaschema/1.0"/>
-   <ns prefix="anthology" uri="http://csrc.nist.gov/metaschema/ns/test"/>
-   <let name="silence-warnings" value="true()"/>
-   <!-- INDEX DEFINITIONS AS KEY DECLARATIONS -->
-   <xsl:key name="item-uniqueness" match="anthology:item" use="@id"/>
-   <!-- RULES -->
-   <pattern>
-      <rule context="@id"/>
-      <rule context="anthology:item">
-               <!-- when true(),  should match regex '[\dabcdef]+'-->
-         <assert test="not(true()) or matches(., '^[\dabcdef]+$')">Where true(), <name/> is expected to match regular expression '^[\dabcdef]+$'
-            </assert>
-      </rule>
-      <rule context="anthology:item">
-         <!-- when true(), allowed-values on .//anthology:item[@type='number']: 1, 2, 3-->
-         <assert test="not(true()) or ($silence-warnings or . = ( '1', '2', '3' ))"
-                 role="warning"
-                 id="T1">Where true(), <name/> is expected to be (one of) '1', '2', '3', not '<value-of select="."/>'
-            [[See id#T1]]</assert>
-      </rule>
-      <rule context="anthology:item">
-         <!-- when true(), allowed-values on .//anthology:item[@type='german']: Ä, Ö, Ü-->
-         <assert test="not(true()) or (. = ( 'Ä', 'Ö', 'Ü' ))" id="T2">Where true(), <name/> is expected to be (one of) 'Ä', 'Ö', 'Ü', not '<value-of select="."/>'
-            [[See id#T2]]</assert>
-      </rule>
-      <rule context="anthology:item">
-         <!-- when true(), allowed-values on .//anthology:subsequence//anthology:item: pink, orange, purple-->
-         <assert test="not(true()) or (. = ( 'pink', 'orange', 'purple' ))" id="T3">Where true(), <name/> is expected to be (one of) 'pink', 'orange', 'purple', not '<value-of select="."/>'
-            [[See id#T3]]</assert>
-      </rule>
-      <rule context="anthology:subsequence/anthology:item">
-         <!-- when true(), allowed-values on : red, blue, green-->
-         <assert test="not(true()) or (. = ( 'red', 'blue', 'green' ))" id="L1">Where true(), <name/> is expected to be (one of) 'red', 'blue', 'green', not '<value-of select="."/>'
-            [[See id#L1]]</assert>
-      </rule>
-      <rule context="anthology:item">
-         <!-- when true(), allowed-values on : A, B, C-->
-         <assert test="not(true()) or (. = ( 'A', 'B', 'C' ))" id="G1">Where true(), <name/> is expected to be (one of) 'A', 'B', 'C', not '<value-of select="."/>'
-            [[See id#G1]]</assert>
-      </rule>
-      <rule context="anthology:item">
-        <!-- when true(),  is unique-->
-         <assert test="not(true()) or count(key('item-uniqueness',@id))=1">Where true(), <name/> is expected to be unique.
-            </assert>
-      </rule>
-   </pattern>
-</schema>
diff --git a/test-suite/broken/allowed-values-confusion-metaschema_XML-SCHEMA.xsd b/test-suite/broken/allowed-values-confusion-metaschema_XML-SCHEMA.xsd
deleted file mode 100644
index 3305d0ca3..000000000
--- a/test-suite/broken/allowed-values-confusion-metaschema_XML-SCHEMA.xsd
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-           xmlns:anthology="http://csrc.nist.gov/metaschema/ns/test"
-           xmlns:oscal-prose="http://csrc.nist.gov/metaschema/ns/test"
-           elementFormDefault="qualified"
-           targetNamespace="http://csrc.nist.gov/metaschema/ns/test"
-           version="1.0">
-   <xs:annotation>
-      <xs:appinfo>
-         <m:schema-name>Test Metaschema</m:schema-name>
-         <m:schema-version>1.0</m:schema-version>
-         <m:short-name>anthology</m:short-name>
-         <m:remarks>
-            <p>Bug: test produced for constraint 'chronology-check' at the end, erroneously applies to elements defined with local definitions with the same name.</p>
-            <p>Local definitions must provide implicit overrides of rules defined in global definitions.</p>
-         </m:remarks>
-         <m:root>SEQUENCES</m:root>
-      </xs:appinfo>
-   </xs:annotation>
-   <xs:complexType name="item-FIELD">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Item</m:formal-name>
-            <m:description>A member of a sequence</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Item</b>: A member of a sequence</xs:documentation>
-      </xs:annotation>
-      <xs:simpleContent>
-         <xs:extension base="anthology:item-FIELD-VALUE-ENUMERATION">
-            <xs:attribute name="type" type="xs:string">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Item type</m:formal-name>
-                     <m:description>Characterizes the type of item</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Item type</b>: Characterizes the type of item</xs:documentation>
-               </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="id" type="xs:string"/>
-         </xs:extension>
-      </xs:simpleContent>
-   </xs:complexType>
-   <xs:simpleType name="item-FIELD-VALUE-ENUMERATION">
-      <xs:restriction base="xs:string">
-         <xs:enumeration value="A">
-            <xs:annotation>
-               <xs:documentation>
-                  <p>a</p>
-               </xs:documentation>
-            </xs:annotation>
-         </xs:enumeration>
-         <xs:enumeration value="B">
-            <xs:annotation>
-               <xs:documentation>
-                  <p>b</p>
-               </xs:documentation>
-            </xs:annotation>
-         </xs:enumeration>
-         <xs:enumeration value="C">
-            <xs:annotation>
-               <xs:documentation>
-                  <p>c</p>
-               </xs:documentation>
-            </xs:annotation>
-         </xs:enumeration>
-      </xs:restriction>
-   </xs:simpleType>
-   <xs:element name="SEQUENCES" type="anthology:number-sequences-ASSEMBLY"/>
-   <xs:complexType name="number-sequences-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Number sequences</m:formal-name>
-            <m:description>Several number sequences, in sequence</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Number sequences</b>: Several number sequences, in sequence</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="sequence"
-                     type="anthology:sequence-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="sequence-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Sequence</m:formal-name>
-            <m:description>A series of items</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Sequence</b>: A series of items</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="item"
-                     type="anthology:item-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="subsequence"
-                     type="anthology:subsequence-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="subsequence-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Subsequence</m:formal-name>
-            <m:description>More sequences</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Subsequence</b>: More sequences</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="item" minOccurs="0" maxOccurs="unbounded">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Subsequence item</m:formal-name>
-                     <m:description>An item in a sequence in a sequence</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Subsequence item</b>: An item in a sequence in a sequence</xs:documentation>
-               </xs:annotation>
-               <xs:simpleContent>
-                  <xs:extension base="anthology:item-FIELD-VALUE-ENUMERATION"/>
-               </xs:simpleContent>
-            </xs:complexType>
-            <xs:simpleType name="item-FIELD-VALUE-ENUMERATION">
-               <xs:restriction base="xs:string">
-                  <xs:enumeration value="red">
-                     <xs:annotation>
-                        <xs:documentation>
-                           <p>red</p>
-                        </xs:documentation>
-                     </xs:annotation>
-                  </xs:enumeration>
-                  <xs:enumeration value="blue">
-                     <xs:annotation>
-                        <xs:documentation>
-                           <p>blue</p>
-                        </xs:documentation>
-                     </xs:annotation>
-                  </xs:enumeration>
-                  <xs:enumeration value="green">
-                     <xs:annotation>
-                        <xs:documentation>
-                           <p>green</p>
-                        </xs:documentation>
-                     </xs:annotation>
-                  </xs:enumeration>
-               </xs:restriction>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="subsequence"
-                     type="anthology:subsequence-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-      </xs:sequence>
-   </xs:complexType>
-</xs:schema>
diff --git a/test-suite/broken/allowed-values-confusion-metaschema_declaration-map.xml b/test-suite/broken/allowed-values-confusion-metaschema_declaration-map.xml
deleted file mode 100644
index 85ca429ab..000000000
--- a/test-suite/broken/allowed-values-confusion-metaschema_declaration-map.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<map xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
-   <assembly key="SEQUENCES" gi="SEQUENCES">
-      <group key="sequences">
-         <assembly gi="sequence">
-            <group key="items">
-               <field as-type="string" gi="item">
-                  <flag as-type="string" key="type" gi="type"/>
-                  <flag as-type="string" key="id" gi="id"/>
-                  <constraint>
-                     <allowed-values target="." allow-other="no" id="global-item-allowed-values">
-                        <enum value="A">a</enum>
-                        <enum value="B">b</enum>
-                        <enum value="C">c</enum>
-                     </allowed-values>
-                     <is-unique key="item-uniqueness" gi="item-uniqueness" target=".">
-                        <key-field target="@id"/>
-                     </is-unique>
-                     <require when="@type='hex'">
-                        <matches target="." regex="[\dabcdef]+"/>
-                     </require>
-                  </constraint>
-               </field>
-            </group>
-            <group key="subsequences">
-               <assembly gi="subsequence">
-                  <group key="items">
-                     <field as-type="string" gi="item">
-                        <constraint>
-                           <allowed-values target="." id="local-color-item-allowed-values">
-                              <enum value="red">red</enum>
-                              <enum value="blue">blue</enum>
-                              <enum value="green">green</enum>
-                           </allowed-values>
-                        </constraint>
-                     </field>
-                  </group>
-                  <group key="subsequences">
-                     <assembly gi="subsequence"/>
-                  </group>
-               </assembly>
-            </group>
-            <constraint>
-               <allowed-values target=".//item[@type='number']" allow-other="yes">
-                  <enum value="1">one</enum>
-                  <enum value="2">two</enum>
-                  <enum value="3">three</enum>
-               </allowed-values>
-               <allowed-values target=".//item[@type='german']" extends="yes">
-                  <enum value="Ä">a umlaut</enum>
-                  <enum value="Ö">o umlaut</enum>
-                  <enum value="Ü">u umlaut</enum>
-               </allowed-values>
-            </constraint>
-         </assembly>
-      </group>
-   </assembly>
-</map>
diff --git a/test-suite/broken/allowed-values-test-metaschema.xml b/test-suite/broken/allowed-values-test-metaschema.xml
deleted file mode 100644
index b9c98cfa6..000000000
--- a/test-suite/broken/allowed-values-test-metaschema.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/css" href="../../../support/lib/metaschema-author.css"?>
-<?xml-model href="../../toolchains/xslt-M4/validate/metaschema-check.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
-<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../support/lib/metaschema.xsd"
- xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
-    <schema-name>Test Metaschema</schema-name>
-    <schema-version>1.0</schema-version>
-    <short-name>anthology</short-name>
-    <namespace>http://csrc.nist.gov/metaschema/ns/test</namespace>
-   
-    <define-field name="item">
-        <formal-name>Item</formal-name>
-        <description>A member of a sequence</description>
-        <flag ref="type"/>
-        <define-flag name="id"/>
-        <define-flag name="class"/>
-        <constraint>
-            <allowed-values target="." allow-other="no" id="G1">
-                <enum value="A">a</enum>
-                <enum value="B">b</enum>
-                <enum value="C">c</enum>
-            </allowed-values>
-            <require when="@class='aorb'">
-                <allowed-values target="." allow-other="no" id="G2">
-                    <enum value="A">a</enum>
-                    <enum value="B">b</enum>
-                </allowed-values>
-            </require>
-        </constraint>
-    </define-field>
-    
-    <define-assembly name="sequences">
-        <formal-name>Sequences</formal-name>
-        <description>Several sequences, in sequence</description>
-        <root-name>SEQUENCES</root-name>
-        <model>
-            <assembly ref="sequence" max-occurs="unbounded">
-                <group-as name="sequences"/>
-            </assembly>
-        </model>
-    </define-assembly>
-    
-    <define-assembly name="sequence">
-        <formal-name>Sequence</formal-name>
-        <description>A series of items</description>
-        <model>
-            <field ref="item" max-occurs="unbounded">
-                <group-as name="items" in-json="SINGLETON_OR_ARRAY"/>
-            </field>
-            <assembly ref="subsequence" max-occurs="unbounded">
-                <group-as name="subsequences"/>
-            </assembly>
-        </model>
-        <constraint>
-            <allowed-values target=".//item[@type='number']" allow-other="yes" id="T1">
-                <enum value="1">one</enum>
-                <enum value="2">two</enum>
-                <enum value="3">three</enum>
-            </allowed-values>
-            
-            <!-- Extends is not implemented: which definition(s) does this extend?
-                 possibilities include global and local definitions for 'item' -->
-            <allowed-values target=".//item[@type='german']" id="T2">
-                <!-- should this produce a rule applicable to .//subsequence/item[@type='german'] ?  (yes) -->
-                <enum value="Ä">a umlaut</enum>
-                <enum value="Ö">o umlaut</enum>
-                <enum value="Ü">u umlaut</enum>
-            </allowed-values>
-            
-            <allowed-values target=".//subsequence//item" id="T3">
-                <!-- which 'allowed-values' will this extend? Any? note that subsequence/item is defined locally.
-                     If this rule applies, what are the respective sets for subsequence/item[@type='color']-->
-                <enum value="pink">pink</enum>
-                <enum value="orange">orange</enum>
-                <enum value="purple">purple</enum>
-            </allowed-values>
-        </constraint>
-    </define-assembly>
-    
-    <define-assembly name="subsequence">
-        <formal-name>Subsequence</formal-name>
-        <description>More sequences</description>
-        <model>
-            <!--<assembly ref="sequence"/>-->
-            <define-field name="item" max-occurs="unbounded">
-<!-- Q: does this local field declaration overlap in any way with other declarations of 'item'?
-     if not, must not other rules for other allowed-values make an exception for subsequence/item? -->
-                <formal-name>Subsequence item</formal-name>
-                <description>An item in a sequence in a sequence</description>
-                <group-as name="items"/>
-                <constraint>
-                        <allowed-values target="." id="L1">
-                            <enum value="red">red</enum>
-                            <enum value="blue">blue</enum>
-                            <enum value="green">green</enum>
-                        </allowed-values>
-                </constraint>
-            </define-field>
-            <assembly ref="subsequence" max-occurs="unbounded">
-                <group-as name="subsequences"/>
-            </assembly>
-        </model>
-    </define-assembly>
-    
-    <define-flag name="type">
-        <formal-name>Item type</formal-name>
-        <description>Characterizes the type of item</description>
-    </define-flag>
-</METASCHEMA>
\ No newline at end of file
diff --git a/test-suite/broken/allowed-values-test-metaschema_METATRON.sch b/test-suite/broken/allowed-values-test-metaschema_METATRON.sch
deleted file mode 100644
index c3395efe8..000000000
--- a/test-suite/broken/allowed-values-test-metaschema_METATRON.sch
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-        xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-        xmlns="http://purl.oclc.org/dsdl/schematron"
-        queryBinding="xslt2">
-   <ns prefix="m" uri="http://csrc.nist.gov/ns/oscal/metaschema/1.0"/>
-   <ns prefix="anthology" uri="http://csrc.nist.gov/metaschema/ns/test"/>
-   <let name="silence-warnings" value="true()"/>
-   <!-- RULES -->
-   <pattern>
-      <rule context="anthology:item"><!--<allowed-values xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" target="." allow-other="no" id="G1"><enum value="A">a</enum><enum value="B">b</enum><enum value="C">c</enum></allowed-values>-->
-         <assert test="not(exists(self::anthology:item)) or (. = ( 'A', 'B', 'C' ))"
-                 id="G1">This <name/> is expected to be (one of) 'A', 'B', 'C', not '<value-of select="."/>'
-            [[See id#G1]]</assert>
-         <!--<allowed-values xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" target="." allow-other="no" id="G1"><enum value="A">a</enum><enum value="B">b</enum></allowed-values>-->
-         <assert test="not(@class='aorb' and exists(self::anthology:item)) or (. = ( 'A', 'B' ))"
-                 id="G1">This <name/> is expected to be (one of) 'A', 'B', not '<value-of select="."/>'
-            [[See id#G1]]</assert>
-         <!--<allowed-values xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" target=".//item[@type='number']" allow-other="yes" id="T1"><enum value="1">one</enum><enum value="2">two</enum><enum value="3">three</enum></allowed-values>-->
-         <assert test="not(exists(self::anthology:item[@type='number']/ancestor-or-self::*/parent::anthology:sequence)) or ($silence-warnings or . = ( '1', '2', '3' ))"
-                 role="warning"
-                 id="T1">This <name/> is expected to be (one of) '1', '2', '3', not '<value-of select="."/>'
-            [[See id#T1]]</assert>
-         <!--<allowed-values xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" target=".//item[@type='german']" id="T2"><enum value="Ä">a umlaut</enum><enum value="Ö">o umlaut</enum><enum value="Ü">u umlaut</enum></allowed-values>-->
-         <assert test="not(exists(self::anthology:item[@type='german']/ancestor-or-self::*/parent::anthology:sequence)) or (. = ( 'Ä', 'Ö', 'Ü' ))"
-                 id="T2">This <name/> is expected to be (one of) 'Ä', 'Ö', 'Ü', not '<value-of select="."/>'
-            [[See id#T2]]</assert>
-         <!--<allowed-values xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" target=".//subsequence//item" id="T3"><enum value="pink">pink</enum><enum value="orange">orange</enum><enum value="purple">purple</enum></allowed-values>-->
-         <assert test="not(exists(self::anthology:item/ancestor-or-self::*/parent::anthology:subsequence/ancestor-or-self::*/parent::anthology:sequence)) or (. = ( 'pink', 'orange', 'purple' ))"
-                 id="T3">This <name/> is expected to be (one of) 'pink', 'orange', 'purple', not '<value-of select="."/>'
-            [[See id#T3]]</assert>
-         <!--<allowed-values xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" target="." id="L1"><enum value="red">red</enum><enum value="blue">blue</enum><enum value="green">green</enum></allowed-values>-->
-         <assert test="not(exists(self::anthology:item/parent::anthology:subsequence)) or (. = ( 'red', 'blue', 'green' ))"
-                 id="L1">This <name/> is expected to be (one of) 'red', 'blue', 'green', not '<value-of select="."/>'
-            [[See id#L1]]</assert>
-      </rule>
-   </pattern>
-</schema>
diff --git a/test-suite/broken/implicit-local-constrain-override-metaschema.xml b/test-suite/broken/implicit-local-constrain-override-metaschema.xml
deleted file mode 100644
index 2f593cc0f..000000000
--- a/test-suite/broken/implicit-local-constrain-override-metaschema.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/css" href="../../../support/lib/metaschema-author.css"?>
-<?xml-model href="../../toolchains/xslt-M4/validate/metaschema-check.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
-<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../support/lib/metaschema.xsd"
- xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
-    <schema-name>Test Metaschema</schema-name>
-    <schema-version>1.0</schema-version>
-    <short-name>anthology</short-name>
-    <namespace>http://csrc.nist.gov/metaschema/ns/test</namespace>
-   
-   <remarks>
-       <p>Bug: test produced for constraint 'chronology-check' at the end, erroneously applies to elements defined with local definitions with the same name.</p>
-       <p>Local definitions must provide implicit overrides of rules defined in global definitions.</p>
-   </remarks>
- 
-    <define-assembly name="bio">
-        <formal-name>Biographical info</formal-name>
-        <description>Gives basic facts or colorful detail.</description>
-        <root-name>BIO</root-name>
-        <model>
-            <define-assembly name="facts">
-                <formal-name>Facts</formal-name>
-                <description>Structured data</description>
-                <model>
-                    <field ref="dates"/>
-                    <define-assembly name="residence" max-occurs="unbounded">
-                        <formal-name>Residency</formal-name>
-                        <description>A range of values in time-space</description>
-                        <group-as name="residences"/>
-                        <model>
-                            <define-field name="place">
-                                <formal-name>Place of residence</formal-name>
-                                <description>Name of locale, site or habitation</description>
-                            </define-field>
-                            <define-field name="dates" as-type="empty">
-                                <formal-name>Dates</formal-name>
-                                <description>Start to end</description>
-                                <define-flag name="start" as-type="date">
-                                    <formal-name>Start</formal-name>
-                                    <description>When initiated</description></define-flag>
-                                <define-flag name="end" as-type="date">
-                                    <formal-name>End</formal-name>
-                                    <description>When concluded or abandoned</description>
-                                </define-flag>
-                            </define-field>
-                            <!--<assembly ref="address"/>-->
-                        </model>
-                    </define-assembly>
-                </model>
-            </define-assembly>
-            <define-assembly name="colorful-details">
-                <formal-name>Colorful details</formal-name>
-                <description>Unstructured data</description>
-                <model>
-                    <define-field name="dates" as-type="string">
-                        <formal-name>Dates</formal-name>
-                        <description>This time, a string, so "Lincoln's Birthday" is a date.</description>
-                    </define-field>
-                </model>
-            </define-assembly>
-        </model>
-    </define-assembly>
-    
-    <define-field name="dates" as-type="empty">
-        <formal-name>Dates</formal-name>
-        <description>As a range (birth-death) or floruit</description>
-        <json-value-key>range</json-value-key>
-        <!--nb: the Schematron does not presently validate datatypes on definitions only on constraint/matches-->
-        <!--    the XSD and JSON Schema *do* validate datatypes on definitions (but not on constraint/matches) -->
-        <define-flag name="birth" as-type="date">
-            <formal-name>Birth date</formal-name>
-            <description>If only the year is known use June 30.</description>
-        </define-flag>
-        <!-- validate: after birth date, if given? -->
-        <define-flag name="death" as-type="date">
-            <formal-name>Death date</formal-name>
-            <description>If only the year is known use July 1.</description>
-        </define-flag>
-        <define-flag name="floruit" as-type="date">
-            <formal-name>Floruit date</formal-name>
-            <description>Do not use along with both birth and death</description>
-        </define-flag>
-        <constraint>
-            <!--if floruit is given, birth and death should not be?-->
-            <matches id="birth-matches-date-datatype" target="@birth" datatype="date"/>
-            <expect id="chronology-check" test="xs:date(@birth) &lt; xs:date(@death)"/>
-        </constraint>
-    </define-field>
-    
-</METASCHEMA>
\ No newline at end of file
diff --git a/test-suite/broken/implicit-local-constrain-override-metaschema_METATRON.sch b/test-suite/broken/implicit-local-constrain-override-metaschema_METATRON.sch
deleted file mode 100644
index 56a1de129..000000000
--- a/test-suite/broken/implicit-local-constrain-override-metaschema_METATRON.sch
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-        xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-        xmlns="http://purl.oclc.org/dsdl/schematron"
-        queryBinding="xslt2">
-   <ns prefix="m" uri="http://csrc.nist.gov/ns/oscal/metaschema/1.0"/>
-   <ns prefix="anthology" uri="http://csrc.nist.gov/metaschema/ns/test"/>
-   <!-- RULES : CONTEXT DEPTH : 1-->
-   <pattern id="match-depth-1">
-      <rule context="anthology:dates"><!--expect on : xs:date(@birth) < xs:date(@death)-->
-         <assert test="exists(self::node()[xs:date(@birth) &lt; xs:date(@death)])"
-                 id="chronology-check">
-            <name/> fails to pass evaluation of 'xs:date(@birth) &lt; xs:date(@death)'
-            [[See id#chronology-check]]</assert>
-      </rule>
-   </pattern>
-   <!-- RULES : CONTEXT DEPTH : 2-->
-   <pattern id="match-depth-2">
-      <rule context="anthology:dates/@birth"><!-- when exists(.), @birth should take the form of datatype 'date'-->
-         <assert test="not(exists(.)) or m:datatype-validate(., 'date')">Where exists(.), <name/> is expected to take the form of datatype date'
-            </assert>
-      </rule>
-   </pattern>
-   <!-- LEXICAL / DATATYPE VALIDATION FUNCTIONS -->
-   <xsl:function name="m:datatype-validate" as="xs:boolean">
-      <xsl:param name="value" as="item()"/>
-      <xsl:param name="nominal-type" as="item()?"/>
-      <xsl:variable name="test-type" as="xs:string">
-         <xsl:choose>
-            <xsl:when test="empty($nominal-type)">string</xsl:when>
-            <xsl:when test="$nominal-type = ('IDREFS', 'NMTOKENS')">string</xsl:when>
-            <xsl:when test="$nominal-type = ('ID', 'IDREF')">NCName</xsl:when>
-            <xsl:otherwise expand-text="yes">{ $nominal-type }</xsl:otherwise>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:variable name="proxy" as="element()">
-         <xsl:element namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                      name="{$test-type}"
-                      expand-text="true">{$value}</xsl:element>
-      </xsl:variable>
-      <xsl:apply-templates select="$proxy" mode="m:validate-type"/>
-   </xsl:function>
-   <xsl:template match="m:date" mode="m:validate-type" as="xs:boolean">
-      <xsl:sequence select=". castable as xs:date"/>
-   </xsl:template>
-</schema>
diff --git a/test-suite/broken/implicit-local-constrain-override-metaschema_XML-SCHEMA.xsd b/test-suite/broken/implicit-local-constrain-override-metaschema_XML-SCHEMA.xsd
deleted file mode 100644
index 2866df6a4..000000000
--- a/test-suite/broken/implicit-local-constrain-override-metaschema_XML-SCHEMA.xsd
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-           xmlns:anthology="http://csrc.nist.gov/metaschema/ns/test"
-           xmlns:oscal-prose="http://csrc.nist.gov/metaschema/ns/test"
-           elementFormDefault="qualified"
-           targetNamespace="http://csrc.nist.gov/metaschema/ns/test"
-           version="1.0">
-   <xs:annotation>
-      <xs:appinfo>
-         <m:schema-name>Test Metaschema</m:schema-name>
-         <m:schema-version>1.0</m:schema-version>
-         <m:short-name>anthology</m:short-name>
-         <m:remarks>
-            <p>Local definitions must provide implicit overrides of rules defined in global definitions.</p>
-         </m:remarks>
-         <m:root>BIO</m:root>
-      </xs:appinfo>
-   </xs:annotation>
-   <xs:element name="BIO" type="anthology:bio-ASSEMBLY"/>
-   <xs:complexType name="bio-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Biographical info</m:formal-name>
-            <m:description>Gives basic facts or colorful detail.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Biographical info</b>: Gives basic facts or colorful detail.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="facts" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Facts</m:formal-name>
-                     <m:description>Structured data</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Facts</b>: Structured data</xs:documentation>
-               </xs:annotation>
-               <xs:sequence>
-                  <xs:element name="dates"
-                              type="anthology:dates-FIELD"
-                              minOccurs="0"
-                              maxOccurs="1"/>
-                  <xs:element name="residence" minOccurs="0" maxOccurs="unbounded">
-                     <xs:complexType>
-                        <xs:annotation>
-                           <xs:appinfo>
-                              <m:formal-name>Residency</m:formal-name>
-                              <m:description>A range of values in time-space</m:description>
-                           </xs:appinfo>
-                           <xs:documentation>
-                              <b>Residency</b>: A range of values in time-space</xs:documentation>
-                        </xs:annotation>
-                        <xs:sequence>
-                           <xs:element name="place" minOccurs="0" maxOccurs="1">
-                              <xs:complexType>
-                                 <xs:annotation>
-                                    <xs:appinfo>
-                                       <m:formal-name>Place of residence</m:formal-name>
-                                       <m:description>Name of locale, site or habitation</m:description>
-                                    </xs:appinfo>
-                                    <xs:documentation>
-                                       <b>Place of residence</b>: Name of locale, site or habitation</xs:documentation>
-                                 </xs:annotation>
-                                 <xs:simpleContent>
-                                    <xs:extension base="xs:string"/>
-                                 </xs:simpleContent>
-                              </xs:complexType>
-                           </xs:element>
-                           <xs:element name="dates" minOccurs="0" maxOccurs="1">
-                              <xs:complexType>
-                                 <xs:attribute name="start" type="xs:date">
-                                    <xs:annotation>
-                                       <xs:appinfo>
-                                          <m:formal-name>Start</m:formal-name>
-                                          <m:description>When initiated</m:description>
-                                       </xs:appinfo>
-                                       <xs:documentation>
-                                          <b>Start</b>: When initiated</xs:documentation>
-                                    </xs:annotation>
-                                 </xs:attribute>
-                                 <xs:attribute name="end" type="xs:date">
-                                    <xs:annotation>
-                                       <xs:appinfo>
-                                          <m:formal-name>End</m:formal-name>
-                                          <m:description>When concluded or abandoned</m:description>
-                                       </xs:appinfo>
-                                       <xs:documentation>
-                                          <b>End</b>: When concluded or abandoned</xs:documentation>
-                                    </xs:annotation>
-                                 </xs:attribute>
-                              </xs:complexType>
-                           </xs:element>
-                        </xs:sequence>
-                     </xs:complexType>
-                  </xs:element>
-               </xs:sequence>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="colorful-details" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Colorful details</m:formal-name>
-                     <m:description>Unstructured data</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Colorful details</b>: Unstructured data</xs:documentation>
-               </xs:annotation>
-               <xs:sequence>
-                  <xs:element name="dates" minOccurs="0" maxOccurs="1">
-                     <xs:complexType>
-                        <xs:annotation>
-                           <xs:appinfo>
-                              <m:formal-name>Dates</m:formal-name>
-                              <m:description>This time, a string, so "Lincoln's Birthday" is a date.</m:description>
-                           </xs:appinfo>
-                           <xs:documentation>
-                              <b>Dates</b>: This time, a string, so "Lincoln's Birthday" is a date.</xs:documentation>
-                        </xs:annotation>
-                        <xs:simpleContent>
-                           <xs:extension base="xs:string"/>
-                        </xs:simpleContent>
-                     </xs:complexType>
-                  </xs:element>
-               </xs:sequence>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="dates-FIELD">
-      <xs:attribute name="birth" type="xs:date">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Birth date</m:formal-name>
-               <m:description>If only the year is known use June 30.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Birth date</b>: If only the year is known use June 30.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="death" type="xs:date">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Death date</m:formal-name>
-               <m:description>If only the year is known use July 1.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Death date</b>: If only the year is known use July 1.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="floruit" type="xs:date">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Floruit date</m:formal-name>
-               <m:description>Do not use along with both birth and death</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Floruit date</b>: Do not use along with both birth and death</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
-</xs:schema>
diff --git a/test-suite/broken/use-name-questions-metaschema.xml b/test-suite/broken/use-name-questions-metaschema.xml
deleted file mode 100644
index 0105a1650..000000000
--- a/test-suite/broken/use-name-questions-metaschema.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/css" href="../../../support/lib/metaschema-author.css"?>
-<?xml-model href="../../toolchains/xslt-M4/validate/metaschema-check.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
-<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../support/lib/metaschema.xsd"
-    xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
-    <schema-name>Test Metaschema</schema-name>
-    <schema-version>1.0</schema-version>
-    <short-name>anthology</short-name>
-    <namespace>http://csrc.nist.gov/metaschema/ns/test</namespace>
-
-    <define-assembly name="root">
-        <root-name>ROOT</root-name>
-        <model>
-            <define-assembly name="a">
-                <model>
-                    <field ref="item" max-occurs="unbounded">
-                        <group-as name="a-items"/>
-                    </field>
-                </model>
-            </define-assembly>
-            <define-assembly name="z">
-                <model>
-                    <define-field name="ITEM" max-occurs="unbounded">
-                        <group-as name="b-items"/>
-                        <constraint>
-                            <allowed-values target=".">
-                                <enum value="1"/>
-                                <enum value="2"/>
-                                <enum value="3"/>
-                            </allowed-values>
-                        </constraint>
-                    </define-field>
-                </model>
-            </define-assembly>
-
-        </model>
-        <constraint>
-            <!-- Q: what are the applicable targets for this extension? -->
-            <allowed-values target=".//ITEM" extends="yes">
-                <enum value="a"/>
-                <enum value="b"/>
-                <enum value="c"/>
-            </allowed-values>
-        </constraint>
-    </define-assembly>
-
-    <define-field name="item">
-        <use-name>ITEM</use-name>
-        <constraint>
-            <allowed-values target=".">
-                <enum value="x"/>
-                <enum value="y"/>
-                <enum value="z"/>
-            </allowed-values>
-            <!--how does this combine, or does it? I think it should pre-empt? -->
-            <require when="@type='color'">
-                <allowed-values target=".">
-                    <enum value="red"/>
-                    <enum value="blue"/>
-                    <enum value="green"/>
-                </allowed-values>
-                
-            </require>
-        </constraint>
-    </define-field>
-
-</METASCHEMA>
\ No newline at end of file
diff --git a/test-suite/docs-models/models_metaschema.xml b/test-suite/docs-models/models_metaschema.xml
new file mode 100644
index 000000000..58169d158
--- /dev/null
+++ b/test-suite/docs-models/models_metaschema.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/css" href="../../../toolchains/xslt-M4/lib/metaschema-author.css"?>
+<?xml-model href="../../toolchains/xslt-M4/validate/metaschema-check.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../toolchains/xslt-M4/validate/metaschema.xsd"
+ xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
+    <schema-name>NIST Metaschema Everything</schema-name>
+    <schema-version>1.0</schema-version>
+    <short-name>test-model</short-name>
+    <namespace>http://csrc.nist.gov/metaschema/ns/everything</namespace>
+
+    <remarks>
+        <p>A mini metaschema produced for <em>documentation</em> testing purposes.</p>
+        <p>This metaschema exercises modeling with a mix of global, modular (local) and inline
+            definitions. In particular, <code>root-name</code> and <code>use-name</code> should be deployed.</p>
+    </remarks>
+
+    <define-flag name="id">
+        <formal-name>ID</formal-name>
+        <description>flag id</description>
+    </define-flag>
+    
+    <define-flag name="simple-flag">
+        <formal-name>Simple Flag</formal-name>
+        <description>some string</description>
+    </define-flag>
+    
+    <define-flag name="integer-flag" as-type="integer" >
+        <formal-name>Integer Flag</formal-name>
+        <description>an integer</description>
+    </define-flag>
+    
+    <!-- -->
+    <define-assembly name="everything">
+        <formal-name>Everything (container)</formal-name>
+        <description>assembly everything is the root (containing element or top-level object) of this schema.</description>
+        <root-name>EVERYTHING</root-name>
+        <flag ref="id"/>
+        <model>
+            <field ref="field-1only"/>
+            <field ref="overloaded">
+                <use-name>overloaded1</use-name>
+            </field>
+            <field ref="overloaded">
+                <use-name>overloaded2</use-name>
+            </field>
+            <field ref="field-base64"/>
+            <field ref="field-boolean"/>
+            <field ref="field-named-value"/>
+            <field ref="markup-line"/>
+            <field ref="field-simple-groupable" max-occurs="unbounded">
+                <group-as name="groupable-simple-fields"/>
+            </field>
+            <field ref="field-flagged-groupable" max-occurs="unbounded">
+                <group-as name="groupable-flagged-fields"/>
+            </field>
+            <field ref="field-wrappable" max-occurs="unbounded">
+                <group-as name="wrapped-fields" in-xml="GROUPED" in-json="ARRAY"/>
+            </field>
+            <field ref="field-by-key" max-occurs="unbounded">
+                <group-as name="keyed-fields" in-json="BY_KEY"/>
+            </field>
+            <field ref="field-dynamic-value-key" max-occurs="unbounded">
+                <group-as name="dynamic-value-key-fields"/>
+            </field>
+            
+            <field ref="wrapped-prose" in-xml="WITH_WRAPPER"/>
+            <field ref="loose-prose" in-xml="UNWRAPPED"/>
+            
+            <assembly ref="assembly-with-inlines"/>
+            
+            <assembly ref="assembly-empty"/>
+            <assembly ref="assembly-empty-grouped" max-occurs="unbounded">
+                <group-as name="empty-assembly-group"/>
+            </assembly>
+            
+            <assembly ref="assembly-alias1">
+                <use-name>alias</use-name>
+            </assembly>
+            
+            <assembly ref="assembly-1only"/>
+            <assembly ref="assembly-groupable" max-occurs="unbounded">
+                <group-as name="groupable-assemblies"/>
+            </assembly>
+            <assembly ref="assembly-wrappable" max-occurs="unbounded">
+                <group-as name="wrapped-assemblies" in-xml="GROUPED" in-json="ARRAY"/>
+            </assembly>
+            <assembly ref="assembly-by-key" max-occurs="unbounded">
+                <group-as name="keyed-assemblies" in-json="BY_KEY"/>
+            </assembly>
+            <assembly ref="everything" max-occurs="unbounded">
+                <group-as name="everything-recursive" in-json="ARRAY"/>
+            </assembly>
+        </model>
+    </define-assembly>
+
+    <define-field name="overloaded">
+        <formal-name>Overloaded field</formal-name>
+        <description>A field called several times by different names.</description>
+        <flag ref="simple-flag"/>
+        <flag ref="integer-flag"/>
+    </define-field>
+    
+    <define-field name="field-1only">
+        <formal-name>Solitary field</formal-name>
+        <description>field field-1only</description>
+        <flag ref="simple-flag"/>
+        <flag ref="integer-flag"/>
+    </define-field>
+    
+    <define-field name="field-base64" as-type="base64Binary">
+        <formal-name>Lexically constrainted field</formal-name>
+        <description>field field-base64</description>
+    </define-field>
+    
+    <define-field name="field-boolean" as-type="boolean">
+        <formal-name>Boolean typed field</formal-name>
+        <description>field field-boolean</description>
+    </define-field>
+    
+    <define-field name="field-simple-groupable">
+        <formal-name>Groupable field</formal-name>
+        <description>simple field, groupable</description>
+        <flag ref="simple-flag"/>
+        <flag ref="integer-flag"/>
+    </define-field>
+    
+    <define-field name="field-flagged-groupable">
+        <formal-name>Flagged groupable field</formal-name>
+        <description>field field-groupable</description>
+        <define-flag name="flagged-date" as-type="date">
+            <formal-name>Date flag</formal-name>
+            <description>A flag for a date</description>
+        </define-flag>
+        <define-flag name="flagged-decimal" as-type="decimal">
+            <formal-name>Decimal flag</formal-name>
+            <description>A flag with a decimal value</description>
+        </define-flag>
+    </define-field>
+    
+    <define-field name="field-wrappable">
+        <formal-name>Wrappable field</formal-name>
+        <description>field field-wrappable</description>
+    </define-field>
+    
+    <define-field name="field-by-key">
+        <formal-name>Keyed field</formal-name>
+        <description>field field-by-key</description>
+        <json-key flag-name="id"/>
+        <flag ref="id" required="yes"/>
+    </define-field>
+    
+    <define-field name="field-named-value">
+        <formal-name>Named-value field</formal-name>
+        <description>field field-named-value</description>
+        <json-value-key>CUSTOM-VALUE-KEY</json-value-key>
+        <flag ref="id" required="yes"/>
+    </define-field>
+    
+    <define-field name="field-dynamic-value-key">
+        <formal-name>Dynamic value key field</formal-name>
+        <description>field field-dynamic-value-key</description>
+        <json-value-key flag-name="id"/>
+        <flag ref="id" required="yes"/>
+        <define-flag name="color">
+            <formal-name>COLOR</formal-name>
+            <description>flag color</description>    
+        </define-flag>
+    </define-field>
+
+    <define-field name="markup-line" as-type="markup-line">
+        <formal-name>Markup line field</formal-name>
+        <description>field markup-line</description>
+    </define-field>
+    
+    <define-field name="wrapped-prose" as-type="markup-multiline">
+        <formal-name>Wrapped prose field</formal-name>
+        <description>field wrapped-prose</description>
+    </define-field>
+    
+    <define-field name="loose-prose" as-type="markup-multiline">
+        <formal-name>Unwrapped prose</formal-name>
+        <description>field loose-prose</description>
+    </define-field>
+    
+    <define-assembly name="assembly-empty">
+        <formal-name>Empty assembly</formal-name>
+        <description>assembly assembly-empty</description>
+        <flag ref="id" required="yes"/>
+    </define-assembly>
+    
+    <define-assembly name="assembly-empty-grouped">
+        <formal-name>Groupable empty assembly</formal-name>
+        <description>assembly assembly-empty-grouped</description>
+        <flag ref="id" required="yes"/>
+    </define-assembly>
+    
+    <define-assembly name="assembly-1only">
+        <formal-name>Solitary assembly</formal-name>
+        <description>assembly assembly-1only</description>
+        <root-name>ASSEMBLY-1ONLY</root-name>
+        <model>
+            <field ref="field-1only"/>
+            <assembly ref="assembly-1only"/>
+        </model>
+    </define-assembly>
+    
+    <define-assembly name="assembly-with-inlines">
+        <formal-name>Assembly with inline definitions</formal-name>
+        <description>Inline definitions have their own metadata too.</description>
+        <model>
+            <field ref="field-1only"/>
+            <assembly ref="assembly-1only"/>
+            <assembly ref="assembly-alias2">
+                <use-name>alias</use-name>
+            </assembly>
+            <define-assembly name="inline-assembly">
+                <formal-name>Inline assembly</formal-name>
+                <description>Assembly whose definition is inline</description>
+            </define-assembly>
+            <define-assembly name="inline-aliased-assemby">
+                <formal-name>An inline assembly named 'alias'</formal-name>
+                <description>Assembly whose definition is inline, but whose name is 'alias'</description>
+            </define-assembly>
+        </model>
+    </define-assembly>
+    
+    <define-assembly name="assembly-alias1">
+        <formal-name>Aliased assembly - outer</formal-name>
+        <description>first aliased assembly (has a name conflict)</description>
+        <use-name>alias</use-name>
+        <model>
+            <field ref="field-1only"/>
+            <assembly ref="assembly-1only"/>
+            <assembly ref="assembly-alias2">
+                <use-name>alias</use-name>
+            </assembly>
+        </model>
+    </define-assembly>
+    
+    <define-assembly name="assembly-alias2">
+        <formal-name>Aliased assembly - inner</formal-name>
+        <description>second aliased assembly (has a name conflict) appears only in the context of its parent of the same name.</description>
+        <model>
+            <assembly ref="assembly-1only"/>
+            <field ref="field-1only"/>
+        </model>
+    </define-assembly>
+    
+    <define-assembly name="assembly-groupable">
+        <formal-name>Groupable assembly.</formal-name>
+        <description>assembly assembly-groupable</description>
+        <model>
+            <field ref="field-simple-groupable" max-occurs="unbounded">
+                <group-as name="groupable-simple-fields"/>
+            </field>
+            <assembly ref="assembly-groupable" max-occurs="unbounded">
+                <group-as name="groupable-assemblies"/>
+            </assembly>
+        </model>
+    </define-assembly>
+    
+    <define-assembly name="assembly-wrappable">
+        <formal-name>Wrappable assembly</formal-name>
+        <description>assembly assembly-wrappable</description>
+        <model>
+            <field ref="field-wrappable" max-occurs="unbounded">
+                <group-as name="wrapped-fields" in-xml="GROUPED" in-json="ARRAY"/>
+            </field>
+            <assembly ref="assembly-wrappable" max-occurs="unbounded">
+                <group-as name="wrapped-assemblies" in-xml="GROUPED" in-json="ARRAY"/>
+            </assembly>
+        </model>
+        
+    </define-assembly>
+    
+    <define-assembly name="assembly-by-key">
+        <formal-name>Keyed assembly</formal-name>
+        <description>assembly assembly-by-key</description>
+        <json-key flag-name="id"/>
+        <flag ref="id" required="yes"/>
+        
+        <model>
+            <field ref="field-by-key" max-occurs="unbounded">
+                <group-as name="keyed-fields" in-json="BY_KEY"/>
+            </field>
+            <assembly ref="assembly-by-key" max-occurs="unbounded">
+                <group-as name="keyed-assemblies" in-json="BY_KEY"/>
+            </assembly>
+        </model>
+    </define-assembly>
+
+</METASCHEMA>
\ No newline at end of file
diff --git a/toolchains/xslt-M4/document/json/json-docs-hugo-uswds.xsl b/toolchains/xslt-M4/document/json/json-docs-hugo-uswds.xsl
index 7d209e1ce..24b450419 100644
--- a/toolchains/xslt-M4/document/json/json-docs-hugo-uswds.xsl
+++ b/toolchains/xslt-M4/document/json/json-docs-hugo-uswds.xsl
@@ -249,7 +249,9 @@
    </xsl:template>
 
    <xsl:template mode="occurrence-code" match="*">
-      <xsl:variable name="minOccurs" select="(@min-occurs, '0')[1]"/>
+      <xsl:param name="require-member" select="false()"/>
+      <xsl:variable name="minOccurs" select="if ($require-member) then  (@min-occurs[not(.='0')], '1')[1]
+         else (@min-occurs, '0')[1]"/>
       <xsl:variable name="maxOccurs"
          select="
             (@max-occurs, '1')[1] ! (if (. eq 'unbounded') then
@@ -510,7 +512,7 @@
             <xsl:apply-templates select="." mode="group-type"/>
          </span>
          <span class="occurrence">
-            <xsl:text expand-text="true">{ if (not(@min-occurs != '0')) then 'optional' else 'required' }</xsl:text>
+            <xsl:text expand-text="true">[{ if (not(@min-occurs != '0')) then 'optional' else 'required' }]</xsl:text>
          </span>
          <span>
             <xsl:apply-templates select="." mode="group-qualifier"/>
@@ -659,7 +661,9 @@
                <!-- should be 'requirement' with mode 'requirement' for flags -->
                <xsl:apply-templates select="self::flag | self::define-flag" mode="requirement"/>
                <xsl:apply-templates select=". except (self::flag | self::define-flag)"
-                  mode="occurrence-code"/>
+                  mode="occurrence-code">
+                  <xsl:with-param name="require-member" select="exists(group-as)"/>
+               </xsl:apply-templates>
             </span>
             <span class="frmname">{ $definition/formal-name
                }{'&#xA0;'[empty($definition/formal-name)] }</span>
diff --git a/toolchains/xslt-M4/document/json/object-map-html.xsl b/toolchains/xslt-M4/document/json/object-map-html.xsl
index 989e49453..f95540e39 100644
--- a/toolchains/xslt-M4/document/json/object-map-html.xsl
+++ b/toolchains/xslt-M4/document/json/object-map-html.xsl
@@ -11,7 +11,7 @@
 
    <xsl:output omit-xml-declaration="true" indent="no"/>
 
-   <xsl:variable name="datatype-page">../../datatypes</xsl:variable>
+   <xsl:variable name="datatype-page">../../../datatypes</xsl:variable>
    
    <xsl:template match="/" mode="make-page">
       <html lang="en">
@@ -62,14 +62,14 @@ details:not([open]) .show-closed { display: inline }
 
    <xsl:template match="m:schema-name | m:schema-version"/>
    
-   <!-- string object singleton-or-array array group-by-key -->
-   
    <xsl:template match="m:string">
       <xsl:variable name="last-appearing" select="position() eq last()"/>
       <div class="OM-entry">
-         <p class="OM-line">
-            <!--<div class="OM-flex">-->
-               <span class="sq">
+         <p class="OM-line">  <!-- OM-flex -->
+            <!--<span class="sq card">
+                  <xsl:call-template name="cardinality-note"/>
+               </span>
+               <span class="sq">-->
                   <xsl:apply-templates select="." mode="json-key"/>
                   <xsl:call-template name="cardinality-note"/>
                   <xsl:text>: </xsl:text>
@@ -77,7 +77,7 @@ details:not([open]) .show-closed { display: inline }
                   <xsl:if test="not(position() eq last())">
                      <span class="OM-lit">,</span>
                   </xsl:if>
-               </span>
+               <!--</span>-->
          </p>
       </div>
    </xsl:template>
@@ -93,8 +93,11 @@ details:not([open]) .show-closed { display: inline }
             <xsl:attribute name="open">open</xsl:attribute>
          </xsl:for-each>
          <summary>
-            <!--<div class="OM-flex">-->
-               <span class="sq">
+            <!-- <div class="OM-flex">-->
+            <!-- <span class="sq card">
+                  <xsl:call-template name="cardinality-note"/>
+               </span>-->
+            <!--<span class="sq">-->
                   <xsl:apply-templates select="." mode="json-key"/>
                   <xsl:call-template name="cardinality-note"/>
                   <xsl:text>: </xsl:text>
@@ -104,18 +107,12 @@ details:not([open]) .show-closed { display: inline }
                         <xsl:text> &#8230; }</xsl:text>
                         <xsl:if test="not(position() eq last())">, </xsl:if>
                      </span>
-                  </span>
+                  <!--</span>-->
                </span>
-               <!--<span class="sq cardinality">
-                  <xsl:call-template name="cardinality-note"/>
-               </span>-->
+               
             <!--</div>-->
          </summary>
          <div class="OM-map">
-         <!--<p class="OM-map-name">
-            <xsl:apply-templates select="@formal-name"/>
-            <xsl:text>, an object with properties</xsl:text>
-         </p>-->
          <xsl:apply-templates select="." mode="contents"/>
          <p>
             <span class="OM-lit">
@@ -139,16 +136,9 @@ details:not([open]) .show-closed { display: inline }
             <xsl:call-template name="cardinality-note"/>
             <xsl:if test="not(empty(*))">
                <span class="OM-lit"> { </span>
-               <!--<span class="show-closed">
-                  <xsl:text> &#8230; }</xsl:text>
-                  <xsl:if test="not(position() eq last())">, </xsl:if>
-               </span>-->
             </xsl:if>
             
          </p>
-         <!--<p class="OM-map-name">
-            <xsl:apply-templates select="@formal-name"/>
-         </p>-->
          <xsl:if test="not(empty(*))">
             <xsl:apply-templates select="." mode="contents"/>
             <p>
@@ -164,7 +154,10 @@ details:not([open]) .show-closed { display: inline }
    <xsl:template match="m:array | m:singleton-or-array">
       <details class="OM-entry">
          <summary>
-            <!--<div class="OM-flex">-->
+            <!--<div class="OM-flex">
+               <span class="sq card">
+                  <xsl:call-template name="cardinality-note"/>
+               </span>-->
                <span class="sq">
                   <xsl:apply-templates select="." mode="json-key"/>
                   <xsl:call-template name="cardinality-note"/>
@@ -174,13 +167,10 @@ details:not([open]) .show-closed { display: inline }
                      <xsl:with-param name="has-subsequent" select="not(position() eq last())"/>
                   </xsl:apply-templates>
                </span>
-            <!--<span class="sq cardinality">
-               <xsl:call-template name="cardinality-note"/>
-            </span>-->
             <!--</div>-->
          </summary>
-         <div class="OM-map">
-            
+         <!--<div class="OM-map">
+         -->   
          <xsl:apply-templates select="." mode="contents"/>
          <p>
             <span class="OM-lit">
@@ -188,7 +178,7 @@ details:not([open]) .show-closed { display: inline }
                <xsl:if test="not(position() eq last())">, </xsl:if>
             </span>
          </p>
-         </div>
+         <!--</div>-->
            
       </details>
    </xsl:template>
@@ -276,14 +266,11 @@ details:not([open]) .show-closed { display: inline }
    </xsl:template>
    
    <xsl:template priority="2" mode="inline-link-to" match="m:string" expand-text="true">
-      <span class="OM-datatype"><a href="{$datatype-page}/#{@as-type}">{ @as-type }</a></span>
+      <span class="OM-datatype"><a href="{$datatype-page}/#{lower-case(@as-type)}">{ @as-type }</a></span>
    </xsl:template>
    
-   <!--<xsl:template mode="contents" match="m:string">
-      <span class="OM-datatype">string</span>
-   </xsl:template>-->
    
-  <xsl:template mode="contents" match="m:array | m:object | m:singleton-or-array | m:group-by-key">
+   <xsl:template mode="contents" match="m:array | m:object | m:singleton-or-array | m:group-by-key">
       <div class="OM-map">
          <xsl:apply-templates select="*"/>
       </div>
diff --git a/toolchains/xslt-M4/document/json/object-tree.xsl b/toolchains/xslt-M4/document/json/object-tree.xsl
index 8a847b32a..77f6c1b03 100644
--- a/toolchains/xslt-M4/document/json/object-tree.xsl
+++ b/toolchains/xslt-M4/document/json/object-tree.xsl
@@ -42,6 +42,17 @@
         </object>
     </xsl:template>
     
+    <xsl:template match="group/assembly">
+        <object min-occurs="1">
+            <xsl:call-template name="global-id"/>
+            <xsl:apply-templates select="@key,@name,@min-occurs,@max-occurs,@formal-name"/>
+            <xsl:apply-templates/>
+        </object>
+    </xsl:template>
+    
+    <!-- Within a group, an assembly is always required even for min-occurs='0' because its wrapper (array or object) is optional.   -->
+    <xsl:template match="group[@group-json='ARRAY']/assembly/@min-occurs[.='0']"/>
+    
     <xsl:template name="global-id">
         <xsl:if test="@scope = 'global'">
             <xsl:attribute name="id" select="'global_' || @name"/>
diff --git a/toolchains/xslt-M4/document/xml/element-map-html.xsl b/toolchains/xslt-M4/document/xml/element-map-html.xsl
index bbec28dcb..a64d68dda 100644
--- a/toolchains/xslt-M4/document/xml/element-map-html.xsl
+++ b/toolchains/xslt-M4/document/xml/element-map-html.xsl
@@ -5,7 +5,7 @@
    xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
    exclude-result-prefixes="#all">
 
-   
+   <xsl:output indent="yes"/>
    <xsl:variable as="xs:string" name="model-label" select="string(/map/@prefix)"/>
 
    <xsl:variable as="xs:string" name="path-to-docs" select="'../xml-schema/'"/>
@@ -79,14 +79,11 @@ div.OM-map p { margin: 0ex }
    <xsl:variable name="datatype-page">../../../datatypes</xsl:variable>
    
    <xsl:template priority="2" mode="linked-datatype" match="*" expand-text="true">
-      <xsl:variable name="type" select="(@as-type,'string')[1]"/>
+      <xsl:variable name="type" select="(lower-case(@as-type),'string')[1]"/>
       <span class="OM-datatype"><a href="{$datatype-page}/#{$type}">{ $type }</a></span>
    </xsl:template>
    
    <xsl:template match="m:element">
-      <!--<xsl:variable name="contents">
-         <xsl:apply-templates select="." mode="contents"/>
-      </xsl:variable>-->
       <details class="OM-entry">
          <xsl:for-each select="parent::m:map">
             <xsl:attribute name="open">open</xsl:attribute>
@@ -108,9 +105,6 @@ div.OM-map p { margin: 0ex }
    </xsl:template>
 
    <xsl:template match="m:element[empty(* except (m:attribute|m:value))]">
-      <!--<xsl:variable name="contents">
-         <xsl:apply-templates select="." mode="contents"/>
-      </xsl:variable>-->
       <div class="OM-entry">
          <p class="OM-line">
             <!--<div class="OM-flex">-->
@@ -122,15 +116,16 @@ div.OM-map p { margin: 0ex }
    
    
    <xsl:template name="summary-line-content">
+      <xsl:variable name="recurses" select="@id=ancestor::*/@id"/>
       <span class="sq">
          <span class="nobr">
             <xsl:text>&lt;</xsl:text>
             <xsl:apply-templates select="." mode="linked-name"/>
          </span>
          <xsl:apply-templates select="m:attribute" mode="as-attribute"/>
-         <xsl:if test="empty(* except m:attribute)">/</xsl:if>
+         <xsl:if test="empty(* except m:attribute) and not($recurses)">/</xsl:if>
          <xsl:text>&gt;</xsl:text>
-         <xsl:if test="exists(* except m:attribute)">
+         <xsl:if test="exists(* except m:attribute) or $recurses">
             <span class="show-closed">
                <xsl:apply-templates select="." mode="summary-contents"/>
                <span class="nobr">
@@ -146,51 +141,7 @@ div.OM-map p { margin: 0ex }
       </span>
    </xsl:template>
  
-   <!--<xsl:template match="m:element[empty(* except m:flag)]">
-      <xsl:variable name="contents">
-         <xsl:apply-templates select="." mode="contents"/>
-      </xsl:variable>
-      <p class="OM-entry">
-         <span class="sq">
-            <xsl:call-template name="cardinality-note"/>
-         </span>
-         <span class="sq">
-            <span class="nobr">
-               <xsl:text>&lt;</xsl:text>
-               <xsl:apply-templates select="." mode="linked-name"/>
-            </span>
-            <xsl:apply-templates select="m:attribute" mode="as-attribute"/>
-            <xsl:if test="not(matches($contents, '\S'))">/</xsl:if>
-            <xsl:text>></xsl:text>
-            <xsl:if test="matches($contents, '\S')">
-               <xsl:sequence select="$contents"/>
-               <span class="nobr">
-                  
-                  <xsl:text>&lt;/</xsl:text>
-                  <xsl:value-of select="@name"/>
-                  <xsl:text>></xsl:text>
-               </span>
-            </xsl:if>
-         </span>
-      </p>
-   </xsl:template>
-   
-   <xsl:template match="m:element[m:value/@as-type='empty']">
-      <p class="OM-entry">
-         <span class="sq">
-            <xsl:call-template name="cardinality-note"/>
-         </span>
-         <span class="OM-sq">
-            <span class="nobr">
-               <xsl:text>&lt;</xsl:text>
-               <xsl:apply-templates select="." mode="linked-name"/>
-            </span>
-            <xsl:apply-templates select="m:attribute" mode="as-attribute"/>
-            <xsl:text>/&gt;</xsl:text>
-         </span>
-      </p>
-   </xsl:template>-->
-   
+
    <xsl:template match="m:attribute" mode="as-attribute">
       <xsl:text> </xsl:text>
       <span class="nobr">
@@ -270,14 +221,18 @@ div.OM-map p { margin: 0ex }
       <xsl:apply-templates select="m:value" mode="linked-datatype"/>
    </xsl:template>
    
-   <!--<xsl:template priority="4" mode="contents" match="m:value[@as-type='markup-line']">
-      <!-\-<p class="OM-lit">Text and inline markup including <code>&lt;em></code>, <code>&lt;strong></code>, <code>&lt;code></code> and the like.</p>-\->
+   <xsl:template priority="4" mode="contents" match="m:value[@as-type='markup-line']">
+      <div class="OM-entry">
+         <p class="OM-line OM-lit OM-gloss"> Text and inline markup including <code>&lt;insert></code> <code>&lt;em></code>, <code>&lt;strong></code>, <code>&lt;code></code>. </p>
+      </div>
    </xsl:template>
    
    <xsl:template priority="4" mode="contents #default" match="m:value[@as-type='markup-multiline']">
-      <!-\-<p class="OM-lit">
-         Block-level markup including <code>&lt;p></code>, <code>&lt;ul></code>, <code>&lt;ol></code> and a few other (markdown-compatible) HTML-flavored elements.</p>-\->
-   </xsl:template>-->
+      <div class="OM-entry">
+         <p class="OM-line">&lt;p> <span class="OM-lit OM-gloss"><!-- — -->or other elements defined as <xsl:apply-templates select="." mode="linked-datatype"/></span> <xsl:call-template name="cardinality-note"/></p>
+            <!--: block-level markup including <span class="OM-name">&lt;p></span>, <span class="OM-name">&lt;ul></span>, <span class="OM-name">&lt;ol></span>, headers (<span class="OM-name">&lt;h1></span>-<span class="OM-name">&lt;h6></span>) and <span class="OM-name">&lt;table></span>. -->
+      </div>
+   </xsl:template>
    
    <xsl:template mode="summary-contents" match="m:element[empty(m:element) and exists(m:value)]" expand-text="true">
       <xsl:apply-templates select="m:value" mode="linked-datatype"/>
@@ -290,7 +245,14 @@ div.OM-map p { margin: 0ex }
       <xsl:text> &#8230; </xsl:text>
    </xsl:template>
    
+   <xsl:template mode="summary-contents" match="m:element[@id=parent::element/@id]" priority="11" expand-text="true">
+      <span class="OM-lit OM-gloss"> (recursive: model like parent <span class="OM-ref">{ @gi }</span>) </span>
+   </xsl:template>
    
+   <xsl:template mode="summary-contents" match="m:element[@id=ancestor::*/@id]" priority="10" expand-text="true">
+      <span class="OM-lit OM-gloss"> (recursive: model like ancestor <span class="OM-ref">{ @gi }</span>) </span>
+   </xsl:template>
+
    <xsl:template name="cardinality-note">
       <xsl:text> </xsl:text>
       <span class="OM-cardinality">
@@ -311,5 +273,9 @@ div.OM-map p { margin: 0ex }
       <xsl:text>]</xsl:text>
    </xsl:template>
 
+   <xsl:template mode="occurrence-code" match="m:value[@as-type='markup-multiline']">
+      <xsl:param name="on" select="." tunnel="true"/>
+      <xsl:text expand-text="true">[0 to &#x221e;]</xsl:text>
+   </xsl:template>
 
 </xsl:stylesheet>
diff --git a/toolchains/xslt-M4/document/xml/xml-docs-hugo-uswds.xsl b/toolchains/xslt-M4/document/xml/xml-docs-hugo-uswds.xsl
index 2ca88b98c..d930a6bf9 100644
--- a/toolchains/xslt-M4/document/xml/xml-docs-hugo-uswds.xsl
+++ b/toolchains/xslt-M4/document/xml/xml-docs-hugo-uswds.xsl
@@ -761,10 +761,10 @@
          </p>
          <xsl:choose expand-text="true">
             <xsl:when test="@allow-other and @allow-other = 'yes'">
-               <p>The value <em>may be locally defined</em>, or { 'one of '[count($enums) gt 1] }the following ({count($enums)}):</p>
+               <p>The value <b>may be locally defined</b>, or { 'one of '[count($enums) gt 1] }the following:</p>
             </xsl:when>
             <xsl:otherwise>
-               <p>The value <em>must</em> be one of the following ({count(enum)}):</p>
+               <p>The value <b>must</b> be one of the following ({count(enum)}):</p>
             </xsl:otherwise>
          </xsl:choose>
          <ul>
@@ -865,17 +865,13 @@
    
    <!-- Only display allowed-values for now -->
    <xsl:template name="display-applicable-constraints">
-      <xsl:variable name="context" select="."/>
-      <xsl:variable name="applicable-constraints" select="key('constraints-for-target',m:use-name(.))[m:include-constraint(.,$context)]"/>
-      <xsl:for-each-group select="$applicable-constraints" group-by="true()" expand-text="true">
+      <xsl:param name="context" select="."/>
+      <xsl:variable name="applicable-constraints"
+         select="$context/key('constraints-for-target', m:use-name(.), $home)[m:include-constraint(., $context)]"/>
+      <xsl:for-each-group select="$applicable-constraints/self::allowed-values" group-by="true()"
+         expand-text="true">
          <div class="constraints">
-            <xsl:apply-templates select="$applicable-constraints/self::allowed-values"/>
-            <!--<xsl:for-each-group select="$applicable-constraints except $applicable-constraints/self::allowed-values" group-by="true()">
-               <details>
-                  <summary class="subhead">Applicable { if (count(current-group()) eq 1) then 'constraint' else 'constraints' } ({ count(current-group()) })</summary>
-                  <xsl:apply-templates select="current-group()"/>
-               </details>
-            </xsl:for-each-group>-->
+            <xsl:apply-templates select="current-group()"/>
          </div>
       </xsl:for-each-group>
    </xsl:template>  
@@ -883,29 +879,32 @@
 <!-- This filter returns 'true' pairwise for any constraint and context-indicating element (whether definition or reference),
      when the two overlap. This must account for when constraints designate multiple targets. -->
    <xsl:function name="m:include-constraint" as="xs:boolean">
-      <xsl:param name="constraint" as="element()"/><!-- has-cardinality, matches, allowed-values etc -->
-      <xsl:param name="context"    as="element()"/><!-- assembly, field, flag, define-assembly, define-field, define-flag -->
-      <xsl:variable name="context-path" select="string-join($context/(ancestor::* | .) ! m:use-name(.),'/')"/>
-      <!-- /METASCHEMA/define-field name='prop' will be 'prop'
-           /METASCHEMA/define-assembly[@name='control']/define-assembly[@name='part']/field[@name='prop']
-           will be 'control/part/prop' -->
-      <xsl:variable name="constraint-context-path" select="string-join($constraint/ancestor-or-self::*/m:use-name(.),'/')"/>
-      <!-- /METASCHEMA/define-assembly[@name='control']/constraint/allowed-values[@target='.//prop'] => 'control' -->
+      <xsl:param name="constraint" as="element()"/>
+      <!-- has-cardinality, matches, allowed-values etc -->
+      <xsl:param name="context" as="element()"/>
+      <!-- assembly, field, flag, define-assembly, define-field, define-flag -->
+      <xsl:variable name="context-path"
+         select="string-join($context/(ancestor::* | .) ! m:use-name(.), '/')"/>
+      <xsl:variable name="constraint-context-path"
+         select="string-join($constraint/ancestor-or-self::*/m:use-name(.), '/')"/>
       <xsl:variable name="constraint-targets" as="xs:string*">
          <xsl:choose>
             <xsl:when test="empty($constraint/@target)">
                <xsl:sequence select="$constraint-context-path"/>
             </xsl:when>
             <xsl:otherwise>
-               <xsl:sequence select="$constraint/@target/m:express-targets(.) ! string-join(($constraint-context-path,.[normalize-space(.)]),'/')"/>
+               <xsl:sequence
+                  select="$constraint/@target/m:express-targets(.) ! string-join(($constraint-context-path, .[normalize-space(.)]), '/')"
+               />
             </xsl:otherwise>
          </xsl:choose>
       </xsl:variable>
-      <!-- debugging <xsl:if test="contains($context-path,'control')">
-         <xsl:message expand-text="true">on { name($constraint)}, testing { $context-path } against { string-join($constraint-targets,', ')} getting { m:match-paths($constraint-targets[1],$context-path)}</xsl:message>
-      </xsl:if>-->
-      <xsl:sequence select="some $t in $constraint-targets satisfies
-         m:match-paths($t,$context-path)"/>
+      <xsl:sequence
+         select="
+            some $t in $constraint-targets
+               satisfies
+               m:match-paths($t, $context-path)"
+      />
    </xsl:function>
    
    <xsl:template mode="make-definition" match="field | flag | assembly"/>
@@ -1101,11 +1100,11 @@
    
    <xsl:function name="m:use-name" as="xs:string?">
       <xsl:param name="who" as="element()"/>
-      <xsl:variable name="definition" select="($who/self::assembly/key('assembly-definitions',@ref),
-         $who/self::field/key('field-definitions',@ref),
-         $who/self::flag/key('flag-definitions',@ref),$who)[1]"/>
-      <xsl:value-of
-         select="($who/self::any/'(ANY)', $who/root-name, $who/use-name, $definition/root-name, $definition/use-name, $definition/@name, '-')[1]"/>
+      <xsl:variable name="definition" select="$who/self::assembly/key('assembly-definitions', @ref) |
+         $who/self::field/key('field-definitions', @ref) | $who/self::flag/key('flag-definitions',@ref)"/>
+      <xsl:variable name="using-name"
+         select="($who/self::any/'ANY', $who/root-name, $who/use-name, $definition/root-name, $definition/use-name, $definition/@name,$who/@name)[1]"/>
+      <xsl:sequence select="$using-name"/>
    </xsl:function>
    
 </xsl:stylesheet>