diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/au1-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/au1-expected.xml
index 29552b3bd..49aa227c1 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/au1-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/au1-expected.xml
@@ -80,7 +80,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/au1a.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/au1a.xml
index ae84c1e33..307a7b003 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/au1a.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/au1a.xml
@@ -86,7 +86,7 @@
         <expression
                     value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
         <xpath
-               value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+               value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/au3-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/au3-expected.xml
index ae8e55a88..6eb93eb86 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/au3-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/au3-expected.xml
@@ -353,7 +353,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/samply1-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/samply1-expected.xml
index a110fef80..7eabfbc3a 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/samply1-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/samply1-expected.xml
@@ -113,7 +113,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t1-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t1-expected.xml
index a591dff01..a9b12ab88 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t1-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t1-expected.xml
@@ -62,7 +62,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t10-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t10-expected.xml
index 59e5c2857..e583d98f3 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t10-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t10-expected.xml
@@ -122,7 +122,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t11-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t11-expected.xml
index b7dae73ac..d19b1c5bf 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t11-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t11-expected.xml
@@ -119,7 +119,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t12-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t12-expected.xml
index 7885b3156..dbe4100b7 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t12-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t12-expected.xml
@@ -117,7 +117,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t12a-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t12a-expected.xml
index 6f6849385..977fb7c78 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t12a-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t12a-expected.xml
@@ -117,7 +117,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t13-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t13-expected.xml
index 66a62c61a..afc1b7491 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t13-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t13-expected.xml
@@ -120,7 +120,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t14-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t14-expected.xml
index 0543ad87c..2350769ff 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t14-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t14-expected.xml
@@ -133,7 +133,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t15-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t15-expected.xml
index b203aaf0d..9be73aafa 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t15-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t15-expected.xml
@@ -188,7 +188,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t16-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t16-expected.xml
index 325f4e674..8a691bdc2 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t16-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t16-expected.xml
@@ -158,7 +158,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t17-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t17-expected.xml
index 2bfa8e0c5..48bfeccf5 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t17-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t17-expected.xml
@@ -119,7 +119,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t18-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t18-expected.xml
index 6fbf7b526..d7ce9dc34 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t18-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t18-expected.xml
@@ -114,7 +114,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t19-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t19-expected.xml
index cf2e1d1fb..b8ea82f35 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t19-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t19-expected.xml
@@ -114,7 +114,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t2-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t2-expected.xml
index 91e303e10..03e53f722 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t2-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t2-expected.xml
@@ -56,7 +56,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t21-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t21-expected.xml
index 12479bb70..07cdb9d08 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t21-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t21-expected.xml
@@ -110,7 +110,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t22-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t22-expected.xml
index c916fd718..a60ef5bd5 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t22-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t22-expected.xml
@@ -281,7 +281,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t23-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t23-expected.xml
index 6ffe24833..b859825ad 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t23-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t23-expected.xml
@@ -204,7 +204,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t24a-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t24a-expected.xml
index c03212242..5d1114dac 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t24a-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t24a-expected.xml
@@ -70,7 +70,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t24b-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t24b-expected.xml
index d14819571..8af0deb8e 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t24b-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t24b-expected.xml
@@ -211,7 +211,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t27-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t27-expected.xml
index 0ec824f57..dac6db9f6 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t27-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t27-expected.xml
@@ -121,7 +121,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
@@ -513,7 +513,7 @@
     </element>
     <element id="Contract.status">
       <path value="Contract.status"/>
-      <short value="draft | active | suspended | cancelled | completed | entered-in-error | unknown"/>
+      <short value="amended | appended | cancelled | disputed | entered-in-error | executable | executed | negotiable | offered | policy | rejected | renewed | revoked | resolved | terminated"/>
       <definition value="The status of the resource instance."/>
       <comment value="This element is labeled as a modifier because the status contains codes that mark the contract as not currently valid or active."/>
       <requirements value="This is the Contract Business Workflow Status."/>
@@ -1875,8 +1875,8 @@
     </element>
     <element id="Contract.contentDefinition.publicationStatus">
       <path value="Contract.contentDefinition.publicationStatus"/>
-      <short value="draft | active | retired | unknown"/>
-      <definition value="draft | active | retired | unknown."/>
+      <short value="amended | appended | cancelled | disputed | entered-in-error | executable | executed | negotiable | offered | policy | rejected | renewed | revoked | resolved | terminated"/>
+      <definition value="amended | appended | cancelled | disputed | entered-in-error | executable | executed | negotiable | offered | policy | rejected | renewed | revoked | resolved | terminated."/>
       <min value="1"/>
       <max value="1"/>
       <base>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t28-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t28-expected.xml
index 0504c4107..055b6738e 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t28-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t28-expected.xml
@@ -266,7 +266,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t3-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t3-expected.xml
index 3565d34a0..8503e54af 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t3-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t3-expected.xml
@@ -114,7 +114,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t30b-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t30b-expected.xml
index dab6693b1..ec860fcd7 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t30b-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t30b-expected.xml
@@ -229,7 +229,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t32-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t32-expected.xml
index 2426c58be..8e1513066 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t32-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t32-expected.xml
@@ -226,7 +226,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t33-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t33-expected.xml
index 423184f36..9b6dcaa40 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t33-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t33-expected.xml
@@ -185,7 +185,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t34-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t34-expected.xml
index 464b8f8ad..77313985a 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t34-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t34-expected.xml
@@ -192,7 +192,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t35-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t35-expected.xml
index 16c5bff95..18bd53240 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t35-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t35-expected.xml
@@ -197,7 +197,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t36-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t36-expected.xml
index d43fd4b3d..47533f096 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t36-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t36-expected.xml
@@ -278,7 +278,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t38-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t38-expected.xml
index 1d390fbe7..a599462f7 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t38-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t38-expected.xml
@@ -203,7 +203,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
@@ -650,7 +650,7 @@
     </element>
     <element id="MedicationRequest.intent">
       <path value="MedicationRequest.intent"/>
-      <short value="proposal | plan | order | original-order | instance-order | option"/>
+      <short value="proposal | plan | order | original-order | reflex-order | filler-order | instance-order | option"/>
       <definition value="Whether the request is a proposal, plan, or an original order."/>
       <comment value="It is expected that the type of requester will be restricted for different stages of a MedicationRequest.  For example, Proposals can be created by a patient, relatedPerson, Practitioner or Device.  Plans can be created by Practitioners, Patients, RelatedPersons and Devices.  Original orders can be created by a Practitioner only.&#xD;&#xD;An instance-order is an instantiation of a request or order and may be used to populate Medication Administration Record.&#xD;&#xD;This element is labeled as a modifier because the intent alters when and how the resource is actually applicable."/>
       <min value="1"/>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t4-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t4-expected.xml
index 2bd788667..7df19fc32 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t4-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t4-expected.xml
@@ -118,7 +118,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t40-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t40-expected.xml
index 582393125..5cbbf8ed8 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t40-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t40-expected.xml
@@ -161,7 +161,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t41-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t41-expected.xml
index 95e5ff16e..71e2d96e1 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t41-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t41-expected.xml
@@ -175,7 +175,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t42-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t42-expected.xml
index 299edce9c..3d119fe21 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t42-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t42-expected.xml
@@ -145,7 +145,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t43-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t43-expected.xml
index 0fa75b25f..2e32ca8d0 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t43-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t43-expected.xml
@@ -190,7 +190,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t44-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t44-expected.xml
index 3b9f2e3d2..a92b3308c 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t44-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t44-expected.xml
@@ -182,7 +182,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t45-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t45-expected.xml
index 44c7bf109..0599d9976 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t45-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t45-expected.xml
@@ -153,7 +153,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t4a-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t4a-expected.xml
index 83628af5c..1648089ef 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t4a-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t4a-expected.xml
@@ -118,7 +118,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t5-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t5-expected.xml
index daac44165..2af162d29 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t5-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t5-expected.xml
@@ -118,7 +118,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t6-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t6-expected.xml
index b614c9c7d..9e8425c22 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t6-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t6-expected.xml
@@ -118,7 +118,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t7-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t7-expected.xml
index 3ef164fe7..561e2d092 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t7-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t7-expected.xml
@@ -118,7 +118,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t8-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t8-expected.xml
index 605831014..b3b42ea91 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t8-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t8-expected.xml
@@ -142,7 +142,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>
diff --git a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t9-expected.xml b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t9-expected.xml
index 01cb4ed60..5fe60e39a 100644
--- a/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t9-expected.xml
+++ b/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t9-expected.xml
@@ -120,7 +120,7 @@
         <severity value="error"/>
         <human value="If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource"/>
         <expression value="contained.where(((&#39;#&#39;+id in (%resource.descendants().reference | %resource.descendants().as(canonical) | %resource.descendants().as(uri) | %resource.descendants().as(url))) or descendants().where(reference = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists() or descendants().where(as(canonical) = &#39;#&#39;).exists()).not()).trace(&#39;unmatched&#39;, id).empty()"/>
-        <xpath value="not(exists(for $contained in f:contained return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
+        <xpath value="not(exists(for $id in f:contained/*/f:id/@value return $contained[not(parent::*/descendant::f:reference/@value=concat(&#39;#&#39;, $contained/*/id/@value) or descendant::f:reference[@value=&#39;#&#39;])]))"/>
         <source value="DomainResource"/>
       </constraint>
       <constraint>