diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index cfcb58df..6ef59f96 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -466,6 +466,10 @@
       <concept id="8581119423153238082" name="jetbrains.mps.lang.coderules.structure.NodeAnchor" flags="ng" index="3BlFb$">
         <child id="8581119423153238083" name="node" index="3BlFb_" />
       </concept>
+      <concept id="1877115349178398764" name="jetbrains.mps.lang.coderules.structure.EqualsConstraint" flags="ng" index="3GeI9q">
+        <child id="1877115349178398815" name="right" index="3GeI8D" />
+        <child id="1877115349178398813" name="left" index="3GeI8F" />
+      </concept>
       <concept id="1553157749316176827" name="jetbrains.mps.lang.coderules.structure.PatternLogicalVariable" flags="ng" index="1HFMs5">
         <child id="5131913661993028915" name="variable" index="1uarlU" />
         <child id="5131913661993028917" name="value" index="1uarlW" />
@@ -6422,11 +6426,11 @@
             <node concept="3Aq9E8" id="2O9ahh6MeOI" role="1nLNMd">
               <node concept="3I6sU6" id="2O9ahh6MeOJ" role="3Ip0Jz">
                 <node concept="3I6s7M" id="2O9ahh6MeOK" role="3I6sU7">
-                  <node concept="3A8Hvi" id="2ZFX$PQmL_k" role="3I6s78">
-                    <node concept="a7P8L" id="2O9ahh6Mf11" role="3A8wtg">
+                  <node concept="3GeI9q" id="1LIpFAayA1l" role="3I6s78">
+                    <node concept="a7P8L" id="1LIpFAayA1u" role="3GeI8F">
                       <ref role="a7OzE" node="2O9ahh6MeOl" resolve="Bound" />
                     </node>
-                    <node concept="ns1u0" id="2O9ahh6MeON" role="3A8w4Q">
+                    <node concept="ns1u0" id="2O9ahh6MeON" role="3GeI8D">
                       <ref role="ns1xF" node="48ZGLP8wdTf" resolve="VarRef" />
                       <node concept="nsMwS" id="2O9ahh6MeOO" role="ns1xD">
                         <ref role="nsMwP" node="48ZGLP8wdUk" resolve="def" />
@@ -6454,6 +6458,13 @@
             </node>
             <node concept="3Aq9_M" id="2O9ahh6Mf0j" role="1nLNMa">
               <node concept="3I6sU6" id="2O9ahh6Mf0k" role="3Ip0Jz">
+                <node concept="3I6s7M" id="1LIpFAa_bJd" role="3I6sU7">
+                  <node concept="2aM9Np" id="1LIpFAa_bJb" role="3I6s78">
+                    <node concept="a7P8L" id="1LIpFAa_bJk" role="2aLmnP">
+                      <ref role="a7OzE" node="2O9ahh6MeOl" resolve="Bound" />
+                    </node>
+                  </node>
+                </node>
                 <node concept="3I6s7M" id="2O9ahh6Mf0q" role="3I6sU7">
                   <node concept="3A8Hvi" id="2O9ahh6Mf0n" role="3I6s78">
                     <node concept="a7P8L" id="2O9ahh6Mf0v" role="3A8wtg">
@@ -6796,11 +6807,11 @@
             <node concept="3Aq9E8" id="1IKbs5Xwa8Y" role="1nLNMd">
               <node concept="3I6sU6" id="1IKbs5Xwa8Z" role="3Ip0Jz">
                 <node concept="3I6s7M" id="1IKbs5Xwa90" role="3I6sU7">
-                  <node concept="3A8Hvi" id="2ZFX$PQmL_l" role="3I6s78">
-                    <node concept="a7P8L" id="2O9ahh6LqjP" role="3A8wtg">
+                  <node concept="3GeI9q" id="1LIpFAayA1X" role="3I6s78">
+                    <node concept="a7P8L" id="1LIpFAayA26" role="3GeI8F">
                       <ref role="a7OzE" node="1IKbs5Xwa9h" resolve="Rigid" />
                     </node>
-                    <node concept="ns1u0" id="1IKbs5Xwa93" role="3A8w4Q">
+                    <node concept="ns1u0" id="1IKbs5Xwa93" role="3GeI8D">
                       <ref role="ns1xF" node="48ZGLP8wdTf" resolve="VarRef" />
                       <node concept="nsMwS" id="1IKbs5Xwa94" role="ns1xD">
                         <ref role="nsMwP" node="48ZGLP8wdUk" resolve="def" />
@@ -6909,6 +6920,13 @@
             </node>
             <node concept="3Aq9_M" id="1IKbs5Xwa9K" role="1nLNMa">
               <node concept="3I6sU6" id="1IKbs5Xwa9L" role="3Ip0Jz">
+                <node concept="3I6s7M" id="1LIpFAa_bIU" role="3I6sU7">
+                  <node concept="2aM9Np" id="1LIpFAa_bIS" role="3I6s78">
+                    <node concept="a7P8L" id="1LIpFAa_bJ1" role="2aLmnP">
+                      <ref role="a7OzE" node="1IKbs5Xwa9h" resolve="Rigid" />
+                    </node>
+                  </node>
+                </node>
                 <node concept="3I6s7M" id="1IKbs5Xwa9M" role="3I6sU7">
                   <node concept="3A8Hvi" id="1IKbs5Xwa9N" role="3I6s78">
                     <node concept="a7P8L" id="1IKbs5Xwa9O" role="3A8wtg">
@@ -7404,66 +7422,89 @@
           </node>
         </node>
         <node concept="3clFbH" id="2O9ahh6PBD9" role="3cqZAp" />
-        <node concept="1nLNNL" id="2O9ahh6PBBD" role="3cqZAp">
-          <node concept="1nLNMm" id="2O9ahh6PBBE" role="1nLNNK">
-            <node concept="0eUR_" id="2O9ahh6PBBF" role="0UC6o">
-              <node concept="3NuqgR" id="2O9ahh6PBBG" role="0eVf_">
-                <node concept="aZer4" id="2O9ahh6PBBH" role="3XD1gS">
-                  <property role="TrG5h" value="LRigid" />
-                </node>
-                <node concept="aZer4" id="2O9ahh6PBBI" role="3XD1gS">
-                  <property role="TrG5h" value="RRigid" />
+        <node concept="3SKdUt" id="1LIpFAaCHEo" role="3cqZAp">
+          <node concept="3SKdUq" id="1LIpFAaCHEq" role="3SKWNk">
+            <property role="3SKdUp" value="Fixme: Fails! Although it's logically equivalent to what follows" />
+          </node>
+        </node>
+        <node concept="1X3_iC" id="1LIpFAaCHGz" role="lGtFl">
+          <property role="3V$3am" value="statement" />
+          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+          <node concept="1nLNNL" id="2O9ahh6PBBD" role="8Wnug">
+            <node concept="1nLNMm" id="2O9ahh6PBBE" role="1nLNNK">
+              <node concept="0eUR_" id="2O9ahh6PBBF" role="0UC6o">
+                <node concept="3NuqgR" id="2O9ahh6PBBG" role="0eVf_">
+                  <node concept="aZer4" id="2O9ahh6PBBH" role="3XD1gS">
+                    <property role="TrG5h" value="LRigid" />
+                  </node>
+                  <node concept="aZer4" id="2O9ahh6PBBI" role="3XD1gS">
+                    <property role="TrG5h" value="RRigid" />
+                  </node>
                 </node>
               </node>
-            </node>
-            <node concept="3Aq93q" id="2O9ahh6PBBJ" role="1nLNMb">
-              <node concept="3I6sU6" id="2O9ahh6PBBK" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2O9ahh6PBBL" role="3I6sU7">
-                  <node concept="3Aqt3T" id="2O9ahh6PBBM" role="3I6s78">
-                    <ref role="3AqCNq" node="48ZGLP8pG4u" resolve="subsumed" />
-                    <node concept="a7P8L" id="2O9ahh6PBEb" role="3AunhB">
-                      <ref role="a7OzE" node="2O9ahh6PBBH" resolve="LRigid" />
-                    </node>
-                    <node concept="a7P8L" id="2O9ahh6PBEi" role="3AunhB">
-                      <ref role="a7OzE" node="2O9ahh6PBBI" resolve="RRigid" />
+              <node concept="3Aq93q" id="2O9ahh6PBBJ" role="1nLNMb">
+                <node concept="3I6sU6" id="2O9ahh6PBBK" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="2O9ahh6PBBL" role="3I6sU7">
+                    <node concept="3Aqt3T" id="2O9ahh6PBBM" role="3I6s78">
+                      <ref role="3AqCNq" node="48ZGLP8pG4u" resolve="subsumed" />
+                      <node concept="a7P8L" id="2O9ahh6PBEb" role="3AunhB">
+                        <ref role="a7OzE" node="2O9ahh6PBBH" resolve="LRigid" />
+                      </node>
+                      <node concept="a7P8L" id="2O9ahh6PBEi" role="3AunhB">
+                        <ref role="a7OzE" node="2O9ahh6PBBI" resolve="RRigid" />
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="3Aq9E8" id="2O9ahh6PBBV" role="1nLNMd">
-              <node concept="3I6sU6" id="2O9ahh6PBBW" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2O9ahh6PBBX" role="3I6sU7">
-                  <node concept="3A8Hvi" id="2ZFX$PQmL_m" role="3I6s78">
-                    <node concept="a7P8L" id="2O9ahh6PBBZ" role="3A8wtg">
-                      <ref role="a7OzE" node="2O9ahh6PBBH" resolve="LRigid" />
-                    </node>
-                    <node concept="a7P8L" id="2O9ahh6PBC0" role="3A8w4Q">
-                      <ref role="a7OzE" node="2O9ahh6PBBI" resolve="RRigid" />
+              <node concept="3Aq9E8" id="2O9ahh6PBBV" role="1nLNMd">
+                <node concept="3I6sU6" id="2O9ahh6PBBW" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="1LIpFAayA2M" role="3I6sU7">
+                    <node concept="3GeI9q" id="1LIpFAayA2z" role="3I6s78">
+                      <node concept="a7P8L" id="1LIpFAayA2R" role="3GeI8F">
+                        <ref role="a7OzE" node="2O9ahh6PBBH" resolve="LRigid" />
+                      </node>
+                      <node concept="a7P8L" id="1LIpFAayA2W" role="3GeI8D">
+                        <ref role="a7OzE" node="2O9ahh6PBBI" resolve="RRigid" />
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="3Aq9_M" id="2O9ahh6PBEq" role="1nLNMa">
-              <node concept="3I6sU6" id="2O9ahh6PBEr" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2O9ahh6PBEx" role="3I6sU7">
-                  <node concept="3A8Hvi" id="2O9ahh6PBEu" role="3I6s78">
-                    <node concept="a7P8L" id="2O9ahh6PBEA" role="3A8wtg">
-                      <ref role="a7OzE" node="2O9ahh6PBBH" resolve="LRigid" />
-                    </node>
-                    <node concept="ns1u0" id="2O9ahh6PBF9" role="3A8w4Q">
-                      <ref role="ns1xF" node="48ZGLP8wdTf" resolve="VarRef" />
+              <node concept="3Aq9_M" id="2O9ahh6PBEq" role="1nLNMa">
+                <node concept="3I6sU6" id="2O9ahh6PBEr" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="1LIpFAa_bI2" role="3I6sU7">
+                    <node concept="2aM9Np" id="1LIpFAa_bI0" role="3I6s78">
+                      <node concept="a7P8L" id="1LIpFAa_bId" role="2aLmnP">
+                        <ref role="a7OzE" node="2O9ahh6PBBH" resolve="LRigid" />
+                      </node>
                     </node>
                   </node>
-                </node>
-                <node concept="3I6s7M" id="2O9ahh6PBER" role="3I6sU7">
-                  <node concept="3A8Hvi" id="2O9ahh6PBEL" role="3I6s78">
-                    <node concept="a7P8L" id="2O9ahh6PBF0" role="3A8wtg">
-                      <ref role="a7OzE" node="2O9ahh6PBBI" resolve="RRigid" />
+                  <node concept="3I6s7M" id="2O9ahh6PBEx" role="3I6sU7">
+                    <node concept="3A8Hvi" id="2O9ahh6PBEu" role="3I6s78">
+                      <node concept="a7P8L" id="2O9ahh6PBEA" role="3A8wtg">
+                        <ref role="a7OzE" node="2O9ahh6PBBH" resolve="LRigid" />
+                      </node>
+                      <node concept="ns1u0" id="2O9ahh6PBF9" role="3A8w4Q">
+                        <ref role="ns1xF" node="48ZGLP8wdTf" resolve="VarRef" />
+                      </node>
                     </node>
-                    <node concept="ns1u0" id="2O9ahh6PBF7" role="3A8w4Q">
-                      <ref role="ns1xF" node="48ZGLP8wdTf" resolve="VarRef" />
+                  </node>
+                  <node concept="3I6s7M" id="1LIpFAa_bIw" role="3I6sU7">
+                    <node concept="2aM9Np" id="1LIpFAa_bIu" role="3I6s78">
+                      <node concept="a7P8L" id="1LIpFAa_bII" role="2aLmnP">
+                        <ref role="a7OzE" node="2O9ahh6PBBI" resolve="RRigid" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="2O9ahh6PBER" role="3I6sU7">
+                    <node concept="3A8Hvi" id="2O9ahh6PBEL" role="3I6s78">
+                      <node concept="a7P8L" id="2O9ahh6PBF0" role="3A8wtg">
+                        <ref role="a7OzE" node="2O9ahh6PBBI" resolve="RRigid" />
+                      </node>
+                      <node concept="ns1u0" id="2O9ahh6PBF7" role="3A8w4Q">
+                        <ref role="ns1xF" node="48ZGLP8wdTf" resolve="VarRef" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -7472,50 +7513,41 @@
           </node>
         </node>
         <node concept="3clFbH" id="2O9ahh6PBAk" role="3cqZAp" />
-        <node concept="3SKdUt" id="2O9ahh6RDXv" role="3cqZAp">
-          <node concept="3SKdUq" id="2O9ahh6RDXx" role="3SKWNk">
-            <property role="3SKdUp" value="Doesn't work yet" />
-          </node>
-        </node>
-        <node concept="1X3_iC" id="2O9ahh6RDVc" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="1nLNNL" id="2O9ahh6NINK" role="8Wnug">
-            <node concept="1nLNMm" id="2O9ahh6NINL" role="1nLNNK">
-              <node concept="0eUR_" id="2O9ahh6NINM" role="0UC6o">
-                <node concept="3NuqgR" id="2O9ahh6NINN" role="0eVf_">
-                  <node concept="aZer4" id="2O9ahh6NINO" role="3XD1gS">
-                    <property role="TrG5h" value="LRigid" />
-                  </node>
-                  <node concept="aZer4" id="2O9ahh6NINP" role="3XD1gS">
-                    <property role="TrG5h" value="RRigid" />
-                  </node>
+        <node concept="1nLNNL" id="2O9ahh6NINK" role="3cqZAp">
+          <node concept="1nLNMm" id="2O9ahh6NINL" role="1nLNNK">
+            <node concept="0eUR_" id="2O9ahh6NINM" role="0UC6o">
+              <node concept="3NuqgR" id="2O9ahh6NINN" role="0eVf_">
+                <node concept="aZer4" id="2O9ahh6NINO" role="3XD1gS">
+                  <property role="TrG5h" value="LRigid" />
+                </node>
+                <node concept="aZer4" id="2O9ahh6NINP" role="3XD1gS">
+                  <property role="TrG5h" value="RRigid" />
                 </node>
               </node>
-              <node concept="3Aq93q" id="2O9ahh6NINQ" role="1nLNMb">
-                <node concept="3I6sU6" id="2O9ahh6NINR" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="2O9ahh6NINS" role="3I6sU7">
-                    <node concept="3Aqt3T" id="2O9ahh6NINT" role="3I6s78">
-                      <ref role="3AqCNq" node="48ZGLP8pG4u" resolve="subsumed" />
-                      <node concept="ns1u0" id="2O9ahh6NIPQ" role="3AunhB">
-                        <ref role="ns1xF" node="48ZGLP8wdTf" resolve="VarRef" />
-                        <node concept="nsMwS" id="2O9ahh6NIPY" role="ns1xD">
-                          <ref role="nsMwP" node="48ZGLP8wdUk" resolve="def" />
-                          <node concept="1nq8_$" id="2O9ahh6NIQc" role="nsMwV">
-                            <node concept="a7P8L" id="2O9ahh6NIQa" role="1nq8_t">
-                              <ref role="a7OzE" node="2O9ahh6NINO" resolve="LRigid" />
-                            </node>
+            </node>
+            <node concept="3Aq93q" id="2O9ahh6NINQ" role="1nLNMb">
+              <node concept="3I6sU6" id="2O9ahh6NINR" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2O9ahh6NINS" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2O9ahh6NINT" role="3I6s78">
+                    <ref role="3AqCNq" node="48ZGLP8pG4u" resolve="subsumed" />
+                    <node concept="ns1u0" id="2O9ahh6NIPQ" role="3AunhB">
+                      <ref role="ns1xF" node="48ZGLP8wdTf" resolve="VarRef" />
+                      <node concept="nsMwS" id="2O9ahh6NIPY" role="ns1xD">
+                        <ref role="nsMwP" node="48ZGLP8wdUk" resolve="def" />
+                        <node concept="1nq8_$" id="2O9ahh6NIQc" role="nsMwV">
+                          <node concept="a7P8L" id="2O9ahh6NIQa" role="1nq8_t">
+                            <ref role="a7OzE" node="2O9ahh6NINO" resolve="LRigid" />
                           </node>
                         </node>
                       </node>
-                      <node concept="ns1u0" id="2O9ahh6NIQC" role="3AunhB">
-                        <ref role="ns1xF" node="48ZGLP8wdTf" resolve="VarRef" />
-                        <node concept="nsMwS" id="2O9ahh6NIQN" role="ns1xD">
-                          <ref role="nsMwP" node="48ZGLP8wdUk" resolve="def" />
-                          <node concept="1nq8_$" id="2O9ahh6NIQT" role="nsMwV">
-                            <node concept="a7P8L" id="2O9ahh6NIQR" role="1nq8_t">
-                              <ref role="a7OzE" node="2O9ahh6NINP" resolve="RRigid" />
-                            </node>
+                    </node>
+                    <node concept="ns1u0" id="2O9ahh6NIQC" role="3AunhB">
+                      <ref role="ns1xF" node="48ZGLP8wdTf" resolve="VarRef" />
+                      <node concept="nsMwS" id="2O9ahh6NIQN" role="ns1xD">
+                        <ref role="nsMwP" node="48ZGLP8wdUk" resolve="def" />
+                        <node concept="1nq8_$" id="2O9ahh6NIQT" role="nsMwV">
+                          <node concept="a7P8L" id="2O9ahh6NIQR" role="1nq8_t">
+                            <ref role="a7OzE" node="2O9ahh6NINP" resolve="RRigid" />
                           </node>
                         </node>
                       </node>
@@ -7523,16 +7555,16 @@
                   </node>
                 </node>
               </node>
-              <node concept="3Aq9E8" id="2O9ahh6NINW" role="1nLNMd">
-                <node concept="3I6sU6" id="2O9ahh6NINX" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="2O9ahh6NINY" role="3I6sU7">
-                    <node concept="3A8Hvi" id="2ZFX$PQmL_n" role="3I6s78">
-                      <node concept="a7P8L" id="2O9ahh6NIRr" role="3A8wtg">
-                        <ref role="a7OzE" node="2O9ahh6NINO" resolve="LRigid" />
-                      </node>
-                      <node concept="a7P8L" id="2O9ahh6NIRw" role="3A8w4Q">
-                        <ref role="a7OzE" node="2O9ahh6NINP" resolve="RRigid" />
-                      </node>
+            </node>
+            <node concept="3Aq9E8" id="2O9ahh6NINW" role="1nLNMd">
+              <node concept="3I6sU6" id="2O9ahh6NINX" role="3Ip0Jz">
+                <node concept="3I6s7M" id="1LIpFAaAm2M" role="3I6sU7">
+                  <node concept="3GeI9q" id="1LIpFAaAm2J" role="3I6s78">
+                    <node concept="a7P8L" id="1LIpFAaAm2R" role="3GeI8F">
+                      <ref role="a7OzE" node="2O9ahh6NINO" resolve="LRigid" />
+                    </node>
+                    <node concept="a7P8L" id="1LIpFAaAm2W" role="3GeI8D">
+                      <ref role="a7OzE" node="2O9ahh6NINP" resolve="RRigid" />
                     </node>
                   </node>
                 </node>
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps
index 63f695a3..911b025b 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps
@@ -1902,66 +1902,62 @@
         </node>
       </node>
     </node>
-    <node concept="1X3_iC" id="2ZFX$PQnB9g" role="lGtFl">
-      <property role="3V$3am" value="clause" />
-      <property role="3V$3ak" value="af858d84-85f2-42f4-a854-0b3c6b5cd482/8739282858702982568/8739282858702982571" />
-      <node concept="1DVJbV" id="1IKbs5X7385" role="8Wnug">
-        <node concept="1DVIrG" id="1IKbs5X7386" role="j9CMd">
-          <node concept="1DVIoH" id="1IKbs5X7387" role="1DVIrJ">
-            <property role="TrG5h" value="r4_bad" />
-          </node>
-          <node concept="1DVIrH" id="1IKbs5X7388" role="1DVIrD">
-            <node concept="1DVIo5" id="1IKbs5X7389" role="1DVIrk">
-              <node concept="1DVIrU" id="1IKbs5X738a" role="1DVIo8">
-                <node concept="1DVIrB" id="1IKbs5X738b" role="1DVIr_">
-                  <node concept="1DVIoH" id="1IKbs5X738c" role="1DVIrA">
-                    <property role="TrG5h" value="y" />
-                  </node>
-                </node>
-                <node concept="t0$VC" id="1IKbs5X738d" role="1DVIrw">
-                  <ref role="t0$VJ" node="1IKbs5X738c" resolve="y" />
+    <node concept="1DVJbV" id="1IKbs5X7385" role="1DVIru">
+      <node concept="1DVIrG" id="1IKbs5X7386" role="j9CMd">
+        <node concept="1DVIoH" id="1IKbs5X7387" role="1DVIrJ">
+          <property role="TrG5h" value="r4_bad" />
+        </node>
+        <node concept="1DVIrH" id="1IKbs5X7388" role="1DVIrD">
+          <node concept="1DVIo5" id="1IKbs5X7389" role="1DVIrk">
+            <node concept="1DVIrU" id="1IKbs5X738a" role="1DVIo8">
+              <node concept="1DVIrB" id="1IKbs5X738b" role="1DVIr_">
+                <node concept="1DVIoH" id="1IKbs5X738c" role="1DVIrA">
+                  <property role="TrG5h" value="y" />
                 </node>
               </node>
-              <node concept="t0$VC" id="1IKbs5X738e" role="1DVIo4">
-                <ref role="t0$VJ" node="1IKbs5X738g" resolve="r" />
+              <node concept="t0$VC" id="1IKbs5X738d" role="1DVIrw">
+                <ref role="t0$VJ" node="1IKbs5X738c" resolve="y" />
               </node>
             </node>
-            <node concept="1DVIrG" id="1IKbs5X738f" role="1DVIrE">
-              <node concept="3TPQf" id="1IKbs5X738g" role="1DVIrJ">
-                <node concept="1DVIoH" id="1IKbs5X738h" role="3TPQ0">
-                  <property role="TrG5h" value="r" />
+            <node concept="t0$VC" id="1IKbs5X738e" role="1DVIo4">
+              <ref role="t0$VJ" node="1IKbs5X738g" resolve="r" />
+            </node>
+          </node>
+          <node concept="1DVIrG" id="1IKbs5X738f" role="1DVIrE">
+            <node concept="3TPQf" id="1IKbs5X738g" role="1DVIrJ">
+              <node concept="1DVIoH" id="1IKbs5X738h" role="3TPQ0">
+                <property role="TrG5h" value="r" />
+              </node>
+              <node concept="3JbUGG" id="1IKbs5X738i" role="3TPQk">
+                <node concept="2BbKIm" id="1IKbs5X738j" role="5lUUh">
+                  <property role="TrG5h" value="a" />
                 </node>
-                <node concept="3JbUGG" id="1IKbs5X738i" role="3TPQk">
-                  <node concept="2BbKIm" id="1IKbs5X738j" role="5lUUh">
-                    <property role="TrG5h" value="a" />
+                <node concept="2BbKIm" id="1IKbs5X73fa" role="5lUUh">
+                  <property role="TrG5h" value="b" />
+                </node>
+                <node concept="1jz_ff" id="1IKbs5X738k" role="3JbKvY">
+                  <node concept="aFS0r" id="1IKbs5X738l" role="1jz_fp">
+                    <ref role="aFS0e" node="1IKbs5X738j" resolve="a" />
                   </node>
-                  <node concept="2BbKIm" id="1IKbs5X73fa" role="5lUUh">
-                    <property role="TrG5h" value="b" />
-                  </node>
-                  <node concept="1jz_ff" id="1IKbs5X738k" role="3JbKvY">
-                    <node concept="aFS0r" id="1IKbs5X738l" role="1jz_fp">
-                      <ref role="aFS0e" node="1IKbs5X738j" resolve="a" />
-                    </node>
-                    <node concept="aFS0r" id="1IKbs5X73ff" role="1jz_f_">
-                      <ref role="aFS0e" node="1IKbs5X73fa" resolve="b" />
-                    </node>
+                  <node concept="aFS0r" id="1IKbs5X73ff" role="1jz_f_">
+                    <ref role="aFS0e" node="1IKbs5X73fa" resolve="b" />
                   </node>
                 </node>
               </node>
-              <node concept="1DVIrU" id="1IKbs5X738n" role="1DVIrD">
-                <node concept="1DVIrB" id="1IKbs5X738o" role="1DVIr_">
-                  <node concept="1DVIoH" id="1IKbs5X738p" role="1DVIrA">
-                    <property role="TrG5h" value="x" />
-                  </node>
-                </node>
-                <node concept="t0$VC" id="1IKbs5X738q" role="1DVIrw">
-                  <ref role="t0$VJ" node="1IKbs5X738p" resolve="x" />
+            </node>
+            <node concept="1DVIrU" id="1IKbs5X738n" role="1DVIrD">
+              <node concept="1DVIrB" id="1IKbs5X738o" role="1DVIr_">
+                <node concept="1DVIoH" id="1IKbs5X738p" role="1DVIrA">
+                  <property role="TrG5h" value="x" />
                 </node>
               </node>
-              <node concept="1U20sH" id="1IKbs5XIE8M" role="lGtFl">
-                <property role="1U20sK" value="error" />
+              <node concept="t0$VC" id="1IKbs5X738q" role="1DVIrw">
+                <ref role="t0$VJ" node="1IKbs5X738p" resolve="x" />
               </node>
             </node>
+            <node concept="1U20sH" id="1IKbs5XIE8M" role="lGtFl">
+              <property role="1U20sK" value="error" />
+            </node>
           </node>
         </node>
       </node>
@@ -3581,135 +3577,131 @@
         </node>
       </node>
     </node>
-    <node concept="1X3_iC" id="2ZFX$PQnBog" role="lGtFl">
-      <property role="3V$3am" value="clause" />
-      <property role="3V$3ak" value="af858d84-85f2-42f4-a854-0b3c6b5cd482/8739282858702982568/8739282858702982571" />
-      <node concept="1DVJbV" id="1IKbs5XpTx5" role="8Wnug">
-        <node concept="1DVIrG" id="1IKbs5XpTx6" role="j9CMd">
-          <node concept="1DVIrU" id="1IKbs5XpTx7" role="1DVIrD">
-            <node concept="1DVIrB" id="1IKbs5XpTx8" role="1DVIr_">
-              <node concept="1DVIoH" id="1IKbs5XpTx9" role="1DVIrA">
-                <property role="TrG5h" value="x" />
-              </node>
+    <node concept="1DVJbV" id="1IKbs5XpTx5" role="1DVIru">
+      <node concept="1DVIrG" id="1IKbs5XpTx6" role="j9CMd">
+        <node concept="1DVIrU" id="1IKbs5XpTx7" role="1DVIrD">
+          <node concept="1DVIrB" id="1IKbs5XpTx8" role="1DVIr_">
+            <node concept="1DVIoH" id="1IKbs5XpTx9" role="1DVIrA">
+              <property role="TrG5h" value="x" />
             </node>
-            <node concept="1DVIrU" id="1IKbs5XpTxa" role="1DVIrw">
-              <node concept="1DVIrB" id="1IKbs5XpTxb" role="1DVIr_">
-                <node concept="3TPQf" id="1IKbs5XpTxc" role="1DVIrA">
-                  <node concept="1DVIoH" id="1IKbs5XpTxd" role="3TPQ0">
-                    <property role="TrG5h" value="g" />
-                  </node>
-                  <node concept="3JbUGG" id="1IKbs5XpTxe" role="3TPQk">
-                    <node concept="1jz_ff" id="1IKbs5XpTxf" role="3JbKvY">
-                      <node concept="3EVAj" id="1IKbs5XpTxg" role="1jz_f_">
-                        <node concept="aFS0r" id="1IKbs5XpTxh" role="3EVAi">
-                          <ref role="aFS0e" node="1IKbs5XpTxk" resolve="b" />
-                        </node>
-                        <node concept="aFS0r" id="1IKbs5XpTxi" role="3EVAk">
-                          <ref role="aFS0e" node="1IKbs5XpTxW" resolve="a" />
-                        </node>
-                      </node>
-                      <node concept="aFS0r" id="1IKbs5XpTxj" role="1jz_fp">
+          </node>
+          <node concept="1DVIrU" id="1IKbs5XpTxa" role="1DVIrw">
+            <node concept="1DVIrB" id="1IKbs5XpTxb" role="1DVIr_">
+              <node concept="3TPQf" id="1IKbs5XpTxc" role="1DVIrA">
+                <node concept="1DVIoH" id="1IKbs5XpTxd" role="3TPQ0">
+                  <property role="TrG5h" value="g" />
+                </node>
+                <node concept="3JbUGG" id="1IKbs5XpTxe" role="3TPQk">
+                  <node concept="1jz_ff" id="1IKbs5XpTxf" role="3JbKvY">
+                    <node concept="3EVAj" id="1IKbs5XpTxg" role="1jz_f_">
+                      <node concept="aFS0r" id="1IKbs5XpTxh" role="3EVAi">
                         <ref role="aFS0e" node="1IKbs5XpTxk" resolve="b" />
                       </node>
+                      <node concept="aFS0r" id="1IKbs5XpTxi" role="3EVAk">
+                        <ref role="aFS0e" node="1IKbs5XpTxW" resolve="a" />
+                      </node>
                     </node>
-                    <node concept="2BbKIm" id="1IKbs5XpTxk" role="5lUUh">
-                      <property role="TrG5h" value="b" />
+                    <node concept="aFS0r" id="1IKbs5XpTxj" role="1jz_fp">
+                      <ref role="aFS0e" node="1IKbs5XpTxk" resolve="b" />
                     </node>
                   </node>
+                  <node concept="2BbKIm" id="1IKbs5XpTxk" role="5lUUh">
+                    <property role="TrG5h" value="b" />
+                  </node>
                 </node>
               </node>
-              <node concept="3EUms" id="1IKbs5XpTxl" role="1DVIrw">
-                <node concept="1DVIo5" id="1IKbs5XpTxm" role="3EUmv">
-                  <node concept="3P8L2H" id="1IKbs5XpTxn" role="1DVIo8" />
-                  <node concept="3TPRf" id="1IKbs5XpTxo" role="1DVIo4">
-                    <node concept="t0$VC" id="1IKbs5XpTxp" role="3TPR0">
-                      <ref role="t0$VJ" node="1IKbs5XpTxc" resolve="g" />
-                    </node>
-                    <node concept="3JbUGG" id="1IKbs5XpTxq" role="3TPQk">
-                      <node concept="1jz_ff" id="1IKbs5XpTxr" role="3JbKvY">
-                        <node concept="aFS0r" id="1IKbs5XpTxs" role="1jz_fp">
-                          <ref role="aFS0e" node="1IKbs5XpTxw" resolve="c" />
-                        </node>
-                        <node concept="3EVAj" id="1IKbs5XpTxt" role="1jz_f_">
-                          <node concept="aFS0r" id="1IKbs5XpTxu" role="3EVAi">
-                            <ref role="aFS0e" node="1IKbs5XpTxw" resolve="c" />
-                          </node>
-                          <node concept="aFS0r" id="1IKbs5XpTGs" role="3EVAk">
-                            <ref role="aFS0e" node="1IKbs5XpTxk" resolve="b" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2BbKIm" id="1IKbs5XpTxw" role="5lUUh">
-                        <property role="TrG5h" value="c" />
-                      </node>
-                    </node>
-                    <node concept="1U20sH" id="1IKbs5XISQ9" role="lGtFl">
-                      <property role="1U20sK" value="error" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="1DVIo5" id="1IKbs5XpTxx" role="3EUmh">
-                  <node concept="t0$VC" id="1IKbs5XpTxy" role="1DVIo4">
+            </node>
+            <node concept="3EUms" id="1IKbs5XpTxl" role="1DVIrw">
+              <node concept="1DVIo5" id="1IKbs5XpTxm" role="3EUmv">
+                <node concept="3P8L2H" id="1IKbs5XpTxn" role="1DVIo8" />
+                <node concept="3TPRf" id="1IKbs5XpTxo" role="1DVIo4">
+                  <node concept="t0$VC" id="1IKbs5XpTxp" role="3TPR0">
                     <ref role="t0$VJ" node="1IKbs5XpTxc" resolve="g" />
                   </node>
-                  <node concept="3EUms" id="1IKbs5XpTxz" role="1DVIo8">
-                    <node concept="3P8MHP" id="1IKbs5XpTx$" role="3EUmv" />
-                    <node concept="3P8MHP" id="1IKbs5XpTx_" role="3EUmh" />
+                  <node concept="3JbUGG" id="1IKbs5XpTxq" role="3TPQk">
+                    <node concept="1jz_ff" id="1IKbs5XpTxr" role="3JbKvY">
+                      <node concept="aFS0r" id="1IKbs5XpTxs" role="1jz_fp">
+                        <ref role="aFS0e" node="1IKbs5XpTxw" resolve="c" />
+                      </node>
+                      <node concept="3EVAj" id="1IKbs5XpTxt" role="1jz_f_">
+                        <node concept="aFS0r" id="1IKbs5XpTxu" role="3EVAi">
+                          <ref role="aFS0e" node="1IKbs5XpTxw" resolve="c" />
+                        </node>
+                        <node concept="aFS0r" id="1IKbs5XpTGs" role="3EVAk">
+                          <ref role="aFS0e" node="1IKbs5XpTxk" resolve="b" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2BbKIm" id="1IKbs5XpTxw" role="5lUUh">
+                      <property role="TrG5h" value="c" />
+                    </node>
                   </node>
+                  <node concept="1U20sH" id="1IKbs5XISQ9" role="lGtFl">
+                    <property role="1U20sK" value="error" />
+                  </node>
+                </node>
+              </node>
+              <node concept="1DVIo5" id="1IKbs5XpTxx" role="3EUmh">
+                <node concept="t0$VC" id="1IKbs5XpTxy" role="1DVIo4">
+                  <ref role="t0$VJ" node="1IKbs5XpTxc" resolve="g" />
+                </node>
+                <node concept="3EUms" id="1IKbs5XpTxz" role="1DVIo8">
+                  <node concept="3P8MHP" id="1IKbs5XpTx$" role="3EUmv" />
+                  <node concept="3P8MHP" id="1IKbs5XpTx_" role="3EUmh" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3TPQf" id="1IKbs5XpTxA" role="1DVIrJ">
-            <node concept="1DVIoH" id="1IKbs5XpTxB" role="3TPQ0">
-              <property role="TrG5h" value="qq_lb2_bad" />
-            </node>
-            <node concept="3JbUGG" id="1IKbs5XpTxC" role="3TPQk">
-              <node concept="1jz_ff" id="1IKbs5XpTxD" role="3JbKvY">
-                <node concept="aFS0r" id="1IKbs5XpTxE" role="1jz_fp">
-                  <ref role="aFS0e" node="1IKbs5XpTxW" resolve="a" />
-                </node>
-                <node concept="1jz_ff" id="1IKbs5XpTxF" role="1jz_f_">
-                  <node concept="3EVAj" id="1IKbs5XpTxG" role="1jz_f_">
-                    <node concept="3EVAj" id="1IKbs5XpTxH" role="3EVAk">
-                      <node concept="aFS0r" id="1IKbs5XpTxI" role="3EVAk">
-                        <ref role="aFS0e" node="1IKbs5XpTxW" resolve="a" />
-                      </node>
-                      <node concept="3P8Jbz" id="1IKbs5XpTxJ" role="3EVAi" />
+        </node>
+        <node concept="3TPQf" id="1IKbs5XpTxA" role="1DVIrJ">
+          <node concept="1DVIoH" id="1IKbs5XpTxB" role="3TPQ0">
+            <property role="TrG5h" value="qq_lb2_bad" />
+          </node>
+          <node concept="3JbUGG" id="1IKbs5XpTxC" role="3TPQk">
+            <node concept="1jz_ff" id="1IKbs5XpTxD" role="3JbKvY">
+              <node concept="aFS0r" id="1IKbs5XpTxE" role="1jz_fp">
+                <ref role="aFS0e" node="1IKbs5XpTxW" resolve="a" />
+              </node>
+              <node concept="1jz_ff" id="1IKbs5XpTxF" role="1jz_f_">
+                <node concept="3EVAj" id="1IKbs5XpTxG" role="1jz_f_">
+                  <node concept="3EVAj" id="1IKbs5XpTxH" role="3EVAk">
+                    <node concept="aFS0r" id="1IKbs5XpTxI" role="3EVAk">
+                      <ref role="aFS0e" node="1IKbs5XpTxW" resolve="a" />
                     </node>
-                    <node concept="3EVAj" id="1IKbs5XpTxK" role="3EVAi">
-                      <node concept="aFS0r" id="1IKbs5XpTxL" role="3EVAk">
-                        <ref role="aFS0e" node="1IKbs5XpTxW" resolve="a" />
-                      </node>
-                      <node concept="3EVAj" id="1IKbs5XpTxM" role="3EVAi">
-                        <node concept="3P8Jbz" id="1IKbs5XpTxN" role="3EVAk" />
-                        <node concept="3P8Jbz" id="1IKbs5XpTxO" role="3EVAi" />
-                      </node>
+                    <node concept="3P8Jbz" id="1IKbs5XpTxJ" role="3EVAi" />
+                  </node>
+                  <node concept="3EVAj" id="1IKbs5XpTxK" role="3EVAi">
+                    <node concept="aFS0r" id="1IKbs5XpTxL" role="3EVAk">
+                      <ref role="aFS0e" node="1IKbs5XpTxW" resolve="a" />
+                    </node>
+                    <node concept="3EVAj" id="1IKbs5XpTxM" role="3EVAi">
+                      <node concept="3P8Jbz" id="1IKbs5XpTxN" role="3EVAk" />
+                      <node concept="3P8Jbz" id="1IKbs5XpTxO" role="3EVAi" />
                     </node>
                   </node>
-                  <node concept="3JbUGG" id="1IKbs5XpTxP" role="1jz_fp">
-                    <node concept="2BbKIm" id="1IKbs5XpTxQ" role="5lUUh">
-                      <property role="TrG5h" value="b" />
+                </node>
+                <node concept="3JbUGG" id="1IKbs5XpTxP" role="1jz_fp">
+                  <node concept="2BbKIm" id="1IKbs5XpTxQ" role="5lUUh">
+                    <property role="TrG5h" value="b" />
+                  </node>
+                  <node concept="1jz_ff" id="1IKbs5XpTxR" role="3JbKvY">
+                    <node concept="aFS0r" id="1IKbs5XpTxS" role="1jz_fp">
+                      <ref role="aFS0e" node="1IKbs5XpTxQ" resolve="b" />
                     </node>
-                    <node concept="1jz_ff" id="1IKbs5XpTxR" role="3JbKvY">
-                      <node concept="aFS0r" id="1IKbs5XpTxS" role="1jz_fp">
+                    <node concept="3EVAj" id="1IKbs5XpTxT" role="1jz_f_">
+                      <node concept="aFS0r" id="1IKbs5XpTxU" role="3EVAk">
+                        <ref role="aFS0e" node="1IKbs5XpTxW" resolve="a" />
+                      </node>
+                      <node concept="aFS0r" id="1IKbs5XpTxV" role="3EVAi">
                         <ref role="aFS0e" node="1IKbs5XpTxQ" resolve="b" />
                       </node>
-                      <node concept="3EVAj" id="1IKbs5XpTxT" role="1jz_f_">
-                        <node concept="aFS0r" id="1IKbs5XpTxU" role="3EVAk">
-                          <ref role="aFS0e" node="1IKbs5XpTxW" resolve="a" />
-                        </node>
-                        <node concept="aFS0r" id="1IKbs5XpTxV" role="3EVAi">
-                          <ref role="aFS0e" node="1IKbs5XpTxQ" resolve="b" />
-                        </node>
-                      </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="2BbKIm" id="1IKbs5XpTxW" role="5lUUh">
-                <property role="TrG5h" value="a" />
-              </node>
+            </node>
+            <node concept="2BbKIm" id="1IKbs5XpTxW" role="5lUUh">
+              <property role="TrG5h" value="a" />
             </node>
           </node>
         </node>