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 911b025b..63f695a3 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,62 +1902,66 @@
         </node>
       </node>
     </node>
-    <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="1IKbs5X738d" role="1DVIrw">
-                <ref role="t0$VJ" node="1IKbs5X738c" resolve="y" />
-              </node>
-            </node>
-            <node concept="t0$VC" id="1IKbs5X738e" role="1DVIo4">
-              <ref role="t0$VJ" node="1IKbs5X738g" resolve="r" />
-            </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="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="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 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 concept="aFS0r" id="1IKbs5X73ff" role="1jz_f_">
-                    <ref role="aFS0e" node="1IKbs5X73fa" resolve="b" />
+                </node>
+                <node concept="t0$VC" id="1IKbs5X738d" role="1DVIrw">
+                  <ref role="t0$VJ" node="1IKbs5X738c" resolve="y" />
+                </node>
+              </node>
+              <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="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>
                 </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 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>
-              <node concept="t0$VC" id="1IKbs5X738q" role="1DVIrw">
-                <ref role="t0$VJ" node="1IKbs5X738p" resolve="x" />
+              <node concept="1U20sH" id="1IKbs5XIE8M" role="lGtFl">
+                <property role="1U20sK" value="error" />
               </node>
             </node>
-            <node concept="1U20sH" id="1IKbs5XIE8M" role="lGtFl">
-              <property role="1U20sK" value="error" />
-            </node>
           </node>
         </node>
       </node>
@@ -3577,131 +3581,135 @@
         </node>
       </node>
     </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>
-          <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">
-                      <ref role="aFS0e" node="1IKbs5XpTxk" resolve="b" />
-                    </node>
-                  </node>
-                  <node concept="2BbKIm" id="1IKbs5XpTxk" role="5lUUh">
-                    <property role="TrG5h" value="b" />
-                  </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>
-            <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 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="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">
+                  <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">
+                        <ref role="aFS0e" node="1IKbs5XpTxk" resolve="b" />
                       </node>
                     </node>
-                    <node concept="2BbKIm" id="1IKbs5XpTxw" role="5lUUh">
-                      <property role="TrG5h" value="c" />
+                    <node concept="2BbKIm" id="1IKbs5XpTxk" role="5lUUh">
+                      <property role="TrG5h" value="b" />
                     </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 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="3EUms" id="1IKbs5XpTxz" role="1DVIo8">
-                  <node concept="3P8MHP" id="1IKbs5XpTx$" role="3EUmv" />
-                  <node concept="3P8MHP" id="1IKbs5XpTx_" role="3EUmh" />
+                <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>
-        </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="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="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="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="3EVAj" id="1IKbs5XpTxT" role="1jz_f_">
-                      <node concept="aFS0r" id="1IKbs5XpTxU" role="3EVAk">
+                <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="aFS0r" id="1IKbs5XpTxV" role="3EVAi">
+                      <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>
+                  <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="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>
-            <node concept="2BbKIm" id="1IKbs5XpTxW" role="5lUUh">
-              <property role="TrG5h" value="a" />
+              <node concept="2BbKIm" id="1IKbs5XpTxW" role="5lUUh">
+                <property role="TrG5h" value="a" />
+              </node>
             </node>
           </node>
         </node>