diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 0284e1c4..8792c304 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -1977,6 +1977,90 @@
           </node>
         </node>
         <node concept="3clFbH" id="oqSSCJcrNA" role="3cqZAp" />
+        <node concept="1nLNNL" id="47tET_X8c1e" role="3cqZAp">
+          <node concept="1nLNMm" id="47tET_X8c1g" role="1nLNNK">
+            <node concept="3Aq9E8" id="47tET_X8c3K" role="1nLNMd">
+              <node concept="3I6sU6" id="47tET_X8c3L" role="3Ip0Jz">
+                <node concept="3IrJb3" id="47tET_X8c3V" role="3I6sU7">
+                  <node concept="3clFbS" id="47tET_X8c3W" role="3IrJb0">
+                    <node concept="3Aqczg" id="47tET_X8c4f" role="3cqZAp">
+                      <node concept="3A8Hvi" id="47tET_X8c4c" role="3Aqpz8">
+                        <node concept="a7P8L" id="47tET_X8c4k" role="3A8wtg">
+                          <ref role="a7OzE" node="47tET_X8c43" resolve="F" />
+                        </node>
+                        <node concept="ns1u0" id="47tET_X8c4p" role="3A8w4Q">
+                          <ref role="ns1xF" node="7VBaGntJSG2" resolve="Fun" />
+                          <node concept="nsMwS" id="47tET_X8c4r" role="ns1xD">
+                            <ref role="nsMwP" node="7VBaGntJSG4" resolve="arg" />
+                            <node concept="1nq8_$" id="47tET_X8c4x" role="nsMwV">
+                              <node concept="a7P8L" id="47tET_X8c4v" role="1nq8_t">
+                                <ref role="a7OzE" node="1IKbs5XDAKq" resolve="A" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="nsMwS" id="47tET_X8c4C" role="ns1xD">
+                            <ref role="nsMwP" node="7VBaGntJSG5" resolve="res" />
+                            <node concept="1nq8_$" id="47tET_X8c4Z" role="nsMwV">
+                              <node concept="a7P8L" id="47tET_X8c4X" role="1nq8_t">
+                                <ref role="a7OzE" node="1IKbs5XDAKz" resolve="B" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3Aqczg" id="47tET_X8cbw" role="3cqZAp">
+                      <node concept="3Aqt3T" id="47tET_X8cbu" role="3Aqpz8">
+                        <ref role="3AqCNq" node="4KALGUEgLbG" resolve="typeOf" />
+                        <node concept="a7P8L" id="47tET_X8cbU" role="3AunhB">
+                          <ref role="a7OzE" node="3vXKzDNXAHO" resolve="Free" />
+                        </node>
+                        <node concept="a7P8L" id="47tET_X8cc2" role="3AunhB">
+                          <ref role="a7OzE" node="47tET_X8c43" resolve="F" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3Aqczg" id="47tET_X8c5X" role="3cqZAp">
+                      <node concept="3A8Hvi" id="47tET_X8c5R" role="3Aqpz8">
+                        <node concept="a7P8L" id="47tET_X8c6c" role="3A8wtg">
+                          <ref role="a7OzE" node="1IKbs5XDAKq" resolve="A" />
+                        </node>
+                        <node concept="a7P8L" id="47tET_X8c6h" role="3A8w4Q">
+                          <ref role="a7OzE" node="1IKbs5XDAKz" resolve="B" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3Aqczg" id="47tET_X8c7r" role="3cqZAp">
+                      <node concept="3A8Hvi" id="47tET_X8c7l" role="3Aqpz8">
+                        <node concept="a7P8L" id="47tET_X8c7N" role="3A8wtg">
+                          <ref role="a7OzE" node="1IKbs5XDAKz" resolve="B" />
+                        </node>
+                        <node concept="ns1u0" id="47tET_X8c8p" role="3A8w4Q">
+                          <ref role="ns1xF" node="48ZGLP8wdTf" resolve="VarRef" />
+                          <node concept="nsMwS" id="47tET_X8c8r" role="ns1xD">
+                            <ref role="nsMwP" node="48ZGLP8wdUk" resolve="def" />
+                            <node concept="1nq8_$" id="47tET_X8c8x" role="nsMwV">
+                              <node concept="a7P8L" id="47tET_X8cc8" role="1nq8_t">
+                                <ref role="a7OzE" node="1IKbs5XE3w$" resolve="U1" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="0eUR_" id="47tET_X8c40" role="0UC6o">
+              <node concept="3NuqgR" id="47tET_X8c42" role="0eVf_">
+                <node concept="aZer4" id="47tET_X8c43" role="3XD1gS">
+                  <property role="TrG5h" value="F" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="1nLNMY" id="6EwjVjWrA7F" role="1nK1Vg">
@@ -6021,7 +6105,7 @@
       <node concept="3clFbS" id="47tET_WheYm" role="1nLNMH">
         <node concept="3SKdUt" id="47tET_WiP2F" role="3cqZAp">
           <node concept="3SKdUq" id="47tET_WiP2H" role="3SKWNk">
-            <property role="3SKdUp" value="Just matches on Constraint set" />
+            <property role="3SKdUp" value="Just matches on Constraint set and gets name of typevar" />
           </node>
         </node>
         <node concept="1nLNNL" id="47tET_Whfau" role="3cqZAp">
@@ -6038,7 +6122,7 @@
                   <property role="TrG5h" value="TV" />
                 </node>
                 <node concept="aZer4" id="47tET_Whffz" role="3XD1gS">
-                  <property role="TrG5h" value="CtsSet" />
+                  <property role="TrG5h" value="CtsList" />
                 </node>
               </node>
               <node concept="3NuqgR" id="47tET_X13HG" role="0eVf_">
@@ -6064,6 +6148,7 @@
               </node>
             </node>
             <node concept="3Aq93q" id="47tET_WhfcZ" role="1nLNMb">
+              <property role="3ArMco" value="true" />
               <node concept="3I6sU6" id="47tET_Whfd0" role="3Ip0Jz">
                 <node concept="3I6s7M" id="47tET_WiT9F" role="3I6sU7">
                   <node concept="3Aqt3T" id="47tET_WiT9E" role="3I6s78">
@@ -6078,24 +6163,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3Aq9E8" id="47tET_WhfeU" role="1nLNMd">
-              <node concept="3I6sU6" id="47tET_WhfeV" role="3Ip0Jz">
-                <node concept="3I6s7M" id="47tET_WhhVb" role="3I6sU7">
-                  <node concept="3Aqt3T" id="47tET_WhhV9" role="3I6s78">
-                    <ref role="3AqCNq" node="47tET_Whfh$" resolve="recoverConstraintList" />
-                    <node concept="a7P8L" id="47tET_WhhVh" role="3AunhB">
-                      <ref role="a7OzE" node="47tET_Whfb4" resolve="CtsNodes" />
-                    </node>
-                    <node concept="a7P8L" id="47tET_X13Ir" role="3AunhB">
-                      <ref role="a7OzE" node="47tET_X13HH" resolve="TVName" />
-                    </node>
-                    <node concept="a7P8L" id="47tET_X4HOH" role="3AunhB">
-                      <ref role="a7OzE" node="47tET_Whffz" resolve="CtsList" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
             <node concept="3Aq93q" id="47tET_X13HU" role="1nLNMb">
               <property role="3ArMco" value="true" />
               <node concept="3I6sU6" id="47tET_X13HV" role="3Ip0Jz">
@@ -6112,6 +6179,24 @@
                 </node>
               </node>
             </node>
+            <node concept="3Aq9E8" id="47tET_WhfeU" role="1nLNMd">
+              <node concept="3I6sU6" id="47tET_WhfeV" role="3Ip0Jz">
+                <node concept="3I6s7M" id="47tET_WhhVb" role="3I6sU7">
+                  <node concept="3Aqt3T" id="47tET_WhhV9" role="3I6s78">
+                    <ref role="3AqCNq" node="47tET_Whfh$" resolve="recoverConstraintList" />
+                    <node concept="a7P8L" id="47tET_WhhVh" role="3AunhB">
+                      <ref role="a7OzE" node="47tET_Whfb4" resolve="CtsNodes" />
+                    </node>
+                    <node concept="a7P8L" id="47tET_X13Ir" role="3AunhB">
+                      <ref role="a7OzE" node="47tET_X13HH" resolve="TVName" />
+                    </node>
+                    <node concept="a7P8L" id="47tET_X5Qtt" role="3AunhB">
+                      <ref role="a7OzE" node="47tET_Whffz" resolve="CtsList" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
         <node concept="3clFbH" id="47tET_WiLcX" role="3cqZAp" />
@@ -6148,7 +6233,7 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="a7P8L" id="47tET_X4HOP" role="1uarlU">
+                      <node concept="a7P8L" id="47tET_X5k6Z" role="1uarlU">
                         <ref role="a7OzE" node="47tET_Whffz" resolve="CtsList" />
                       </node>
                     </node>
@@ -6156,6 +6241,22 @@
                 </node>
               </node>
             </node>
+            <node concept="3Aq93q" id="47tET_WUxRa" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="47tET_WUxRb" role="3Ip0Jz">
+                <node concept="3I6s7M" id="47tET_WUy3n" role="3I6sU7">
+                  <node concept="3Aqt3T" id="47tET_WUy3m" role="3I6s78">
+                    <ref role="3AqCNq" node="47tET_WTCdy" resolve="typeclassName" />
+                    <node concept="a7P8L" id="47tET_WUy3s" role="3AunhB">
+                      <ref role="a7OzE" node="47tET_WTERH" resolve="Cts0" />
+                    </node>
+                    <node concept="a7P8L" id="47tET_WUy3P" role="3AunhB">
+                      <ref role="a7OzE" node="47tET_WUy3_" resolve="TcName" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="0eUR_" id="47tET_WiLgT" role="0UC6o">
               <node concept="3NuqgR" id="47tET_WiLgV" role="0eVf_">
                 <node concept="aZer4" id="47tET_WiLgW" role="3XD1gS">
@@ -6271,22 +6372,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3Aq93q" id="47tET_WUxRa" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="47tET_WUxRb" role="3Ip0Jz">
-                <node concept="3I6s7M" id="47tET_WUy3n" role="3I6sU7">
-                  <node concept="3Aqt3T" id="47tET_WUy3m" role="3I6s78">
-                    <ref role="3AqCNq" node="47tET_WTCdy" resolve="typeclassName" />
-                    <node concept="a7P8L" id="47tET_WUy3s" role="3AunhB">
-                      <ref role="a7OzE" node="47tET_WTERH" resolve="Cts0" />
-                    </node>
-                    <node concept="a7P8L" id="47tET_WUy3P" role="3AunhB">
-                      <ref role="a7OzE" node="47tET_WUy3_" resolve="TcName" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
             <node concept="3Aq9_M" id="47tET_WTESu" role="1nLNMa">
               <node concept="3I6sU6" id="47tET_WTESv" role="3Ip0Jz">
                 <node concept="3I6s7M" id="47tET_WTES_" role="3I6sU7">
@@ -6303,6 +6388,29 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="47tET_X5RbV" role="3cqZAp" />
+        <node concept="1nLNNL" id="47tET_X5RfG" role="3cqZAp">
+          <node concept="1nLNMm" id="47tET_X5RfI" role="1nLNNK">
+            <node concept="3Aq93q" id="47tET_X5RhK" role="1nLNMb">
+              <node concept="3I6sU6" id="47tET_X5RhL" role="3Ip0Jz">
+                <node concept="3I6s7M" id="47tET_X5RhM" role="3I6sU7">
+                  <node concept="3Aqt3T" id="47tET_X5RhN" role="3I6s78">
+                    <ref role="3AqCNq" node="47tET_Whfh$" resolve="recoverConstraintList" />
+                    <node concept="a7P8L" id="47tET_X5RhO" role="3AunhB">
+                      <ref role="a7OzE" node="47tET_Whfb4" resolve="CtsNodes" />
+                    </node>
+                    <node concept="a7P8L" id="47tET_X5RhP" role="3AunhB">
+                      <ref role="a7OzE" node="47tET_X13HH" resolve="TVName" />
+                    </node>
+                    <node concept="ns1u0" id="47tET_X5Rj5" role="3AunhB">
+                      <ref role="ns1xF" node="48ZGLP7pl6N" resolve="Nil" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
   </node>
@@ -11449,6 +11557,12 @@
         <property role="TrG5h" value="typeVars" />
       </node>
     </node>
+    <node concept="3AqmO8" id="47tET_XcN9h" role="8PkJo">
+      <property role="TrG5h" value="produceTypeConstraint" />
+      <node concept="1zAUYm" id="47tET_XcN9O" role="1zAUyy">
+        <property role="TrG5h" value="typeVar" />
+      </node>
+    </node>
     <node concept="3AqmO8" id="47tET_WlK9C" role="8PkJo">
       <property role="TrG5h" value="reproduceTypeConstraints" />
     </node>
@@ -11671,6 +11785,123 @@
     <node concept="1nLNMY" id="47tET_W6FC8" role="1nK1Vg">
       <property role="TrG5h" value="produceTypeConstraints" />
       <node concept="3clFbS" id="47tET_W6FC9" role="1nLNMH">
+        <node concept="3SKdUt" id="47tET_W6Guf" role="3cqZAp">
+          <node concept="3SKdUq" id="47tET_W6Guh" role="3SKWNk">
+            <property role="3SKdUp" value="Produce empty Constraint set for other type variables" />
+          </node>
+        </node>
+        <node concept="1nLNNL" id="47tET_W6Gpp" role="3cqZAp">
+          <node concept="1nLNMm" id="47tET_W6Gpq" role="1nLNNK">
+            <node concept="3Aq93q" id="47tET_W6Gpy" role="1nLNMb">
+              <node concept="3I6sU6" id="47tET_W6Gpz" role="3Ip0Jz">
+                <node concept="3I6s7M" id="47tET_W6Gp$" role="3I6sU7">
+                  <node concept="3Aqt3T" id="47tET_W6Gp_" role="3I6s78">
+                    <ref role="3AqCNq" node="47tET_W6Fxn" resolve="produceTypeConstraints" />
+                    <node concept="1HFMs5" id="47tET_W6GpA" role="3AunhB">
+                      <node concept="ns1u0" id="47tET_W6GpC" role="1uarlW">
+                        <ref role="ns1xF" node="48ZGLP7pl6j" resolve="Cons" />
+                        <node concept="nsMwS" id="47tET_W6GpD" role="ns1xD">
+                          <ref role="nsMwP" node="48ZGLP7pl6$" resolve="head" />
+                          <node concept="1nq8_$" id="47tET_W6GpE" role="nsMwV">
+                            <node concept="a7P8L" id="47tET_XcN4f" role="1nq8_t">
+                              <ref role="a7OzE" node="47tET_XcMXL" resolve="TV" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="nsMwS" id="47tET_W6GpG" role="ns1xD">
+                          <ref role="nsMwP" node="48ZGLP7pl6J" resolve="tail" />
+                          <node concept="1nq8_$" id="47tET_W6GpH" role="nsMwV">
+                            <node concept="a7P8L" id="47tET_XcN4i" role="1nq8_t">
+                              <ref role="a7OzE" node="47tET_XcMY0" resolve="TVsTail" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="47tET_XcN48" role="1uarlU">
+                        <ref role="a7OzE" node="47tET_XcMX_" resolve="TVs" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9E8" id="47tET_W6GpS" role="1nLNMd">
+              <node concept="3I6sU6" id="47tET_W6GpT" role="3Ip0Jz">
+                <node concept="3IrJb3" id="47tET_XcNpI" role="3I6sU7">
+                  <node concept="3clFbS" id="47tET_XcNpJ" role="3IrJb0">
+                    <node concept="3Aqczg" id="47tET_XcNpK" role="3cqZAp">
+                      <node concept="3Aqt3T" id="47tET_W6GpV" role="3Aqpz8">
+                        <ref role="3AqCNq" node="47tET_WOmOE" resolve="tdefConstraints" />
+                        <node concept="a7P8L" id="47tET_XcN4l" role="3AunhB">
+                          <ref role="a7OzE" node="47tET_XcMXL" resolve="TV" />
+                        </node>
+                        <node concept="a7P8L" id="47tET_XcMYE" role="3AunhB">
+                          <ref role="a7OzE" node="47tET_XcMYk" resolve="NewCtrSet" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3Aqczg" id="47tET_XcNpL" role="3cqZAp">
+                      <node concept="3Aqt3T" id="47tET_XcNp$" role="3Aqpz8">
+                        <ref role="3AqCNq" node="47tET_XcN9h" resolve="produceTypeConstraint" />
+                        <node concept="a7P8L" id="47tET_XcNpD" role="3AunhB">
+                          <ref role="a7OzE" node="47tET_XcMXL" resolve="TV" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3Aqczg" id="47tET_XcNpM" role="3cqZAp">
+                      <node concept="3Aqt3T" id="47tET_W6GpZ" role="3Aqpz8">
+                        <ref role="3AqCNq" node="47tET_W6Fxn" resolve="produceTypeConstraints" />
+                        <node concept="a7P8L" id="47tET_XcN4p" role="3AunhB">
+                          <ref role="a7OzE" node="47tET_XcMY0" resolve="TVsTail" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="0eUR_" id="47tET_XcMXy" role="0UC6o">
+              <node concept="3NuqgR" id="47tET_XcMX$" role="0eVf_">
+                <node concept="aZer4" id="47tET_XcMX_" role="3XD1gS">
+                  <property role="TrG5h" value="TVs" />
+                </node>
+                <node concept="aZer4" id="47tET_XcMXL" role="3XD1gS">
+                  <property role="TrG5h" value="TV" />
+                </node>
+                <node concept="aZer4" id="47tET_XcMY0" role="3XD1gS">
+                  <property role="TrG5h" value="TVsTail" />
+                </node>
+              </node>
+              <node concept="3NuqgR" id="47tET_XcMYj" role="0eVf_">
+                <node concept="aZer4" id="47tET_XcMYk" role="3XD1gS">
+                  <property role="TrG5h" value="NewCtrSet" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="47tET_XcNwp" role="3cqZAp" />
+        <node concept="1nLNNL" id="47tET_W6G$2" role="3cqZAp">
+          <node concept="1nLNMm" id="47tET_W6G$4" role="1nLNNK">
+            <node concept="3Aq93q" id="47tET_W6G_h" role="1nLNMb">
+              <node concept="3I6sU6" id="47tET_W6G_i" role="3Ip0Jz">
+                <node concept="3I6s7M" id="47tET_W6G_m" role="3I6sU7">
+                  <node concept="3Aqt3T" id="47tET_W6G_l" role="3I6s78">
+                    <ref role="3AqCNq" node="47tET_W6Fxn" resolve="produceTypeConstraints" />
+                    <node concept="ns1u0" id="47tET_W6G_r" role="3AunhB">
+                      <ref role="ns1xF" node="48ZGLP7pl6N" resolve="Nil" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="47tET_Xf3FZ" role="1nK1Vg">
+      <property role="TrG5h" value="produceTypeConstraint" />
+      <node concept="3clFbS" id="47tET_Xf3G0" role="1nLNMH">
         <node concept="3SKdUt" id="47tET_W6G7c" role="3cqZAp">
           <node concept="3SKdUq" id="47tET_W6G7e" role="3SKWNk">
             <property role="3SKdUp" value="Note: VarRef (instead of just TV) because this rule is called after freeTypeVars" />
@@ -11678,121 +11909,187 @@
         </node>
         <node concept="3SKdUt" id="47tET_W6Gab" role="3cqZAp">
           <node concept="3SKdUq" id="47tET_W6Gac" role="3SKWNk">
-            <property role="3SKdUp" value="To be more consistent, reproduce this altered constraint without VarRef" />
+            <property role="3SKdUp" value="Definition Constraints must be on type vars, so reproduce Constraint set without VarRef" />
           </node>
         </node>
-        <node concept="1nLNNL" id="47tET_W6FKG" role="3cqZAp">
-          <node concept="1nLNMm" id="47tET_W6FKH" role="1nLNNK">
-            <node concept="0eUR_" id="47tET_W6FKL" role="0UC6o">
-              <node concept="3NuqgR" id="47tET_W6FKN" role="0eVf_">
-                <node concept="aZer4" id="47tET_W6FKO" role="3XD1gS">
-                  <property role="TrG5h" value="TVs" />
+        <node concept="1X3_iC" id="47tET_XgGt0" role="lGtFl">
+          <property role="3V$3am" value="statement" />
+          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+          <node concept="1nLNNL" id="47tET_W6FKG" role="8Wnug">
+            <node concept="1nLNMm" id="47tET_W6FKH" role="1nLNNK">
+              <node concept="0eUR_" id="47tET_W6FKL" role="0UC6o">
+                <node concept="3NuqgR" id="47tET_W6FKN" role="0eVf_">
+                  <node concept="aZer4" id="47tET_Xf3Vl" role="3XD1gS">
+                    <property role="TrG5h" value="TV" />
+                  </node>
+                  <node concept="aZer4" id="47tET_Wcd0y" role="3XD1gS">
+                    <property role="TrG5h" value="TV0" />
+                  </node>
                 </node>
-                <node concept="aZer4" id="47tET_W6FLH" role="3XD1gS">
-                  <property role="TrG5h" value="TV" />
-                </node>
-                <node concept="aZer4" id="47tET_Wcd0y" role="3XD1gS">
-                  <property role="TrG5h" value="TV0" />
-                </node>
-                <node concept="aZer4" id="47tET_W6FM1" role="3XD1gS">
-                  <property role="TrG5h" value="TVsTail" />
+                <node concept="3NuqgR" id="47tET_W6G5G" role="0eVf_">
+                  <node concept="aZer4" id="47tET_W6G5H" role="3XD1gS">
+                    <property role="TrG5h" value="CtrSet" />
+                  </node>
                 </node>
               </node>
-              <node concept="3NuqgR" id="47tET_W6G5G" role="0eVf_">
-                <node concept="aZer4" id="47tET_W6G5H" role="3XD1gS">
+              <node concept="3Aq93q" id="47tET_W6FL6" role="1nLNMb">
+                <node concept="3I6sU6" id="47tET_W6FL7" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="47tET_W6FLb" role="3I6sU7">
+                    <node concept="3Aqt3T" id="47tET_W6FLa" role="3I6s78">
+                      <ref role="3AqCNq" node="47tET_XcN9h" />
+                      <node concept="a7P8L" id="47tET_Xf3VM" role="3AunhB">
+                        <ref role="a7OzE" node="47tET_Xf3Vl" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3Aq93q" id="47tET_W6FMG" role="1nLNMb">
+                <node concept="3I6sU6" id="47tET_W6FMH" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="47tET_W6G5v" role="3I6sU7">
+                    <node concept="3Aqt3T" id="47tET_W6G5u" role="3I6s78">
+                      <ref role="3AqCNq" node="47tET_W4MQg" />
+                      <node concept="ns1u0" id="47tET_W6G6i" role="3AunhB">
+                        <ref role="ns1xF" node="48ZGLP8wdTf" />
+                        <node concept="nsMwS" id="47tET_W6G6s" role="ns1xD">
+                          <ref role="nsMwP" node="48ZGLP8wdUk" />
+                          <node concept="1nq8_$" id="47tET_W6G6y" role="nsMwV">
+                            <node concept="a7P8L" id="47tET_Xf3Wa" role="1nq8_t">
+                              <ref role="a7OzE" node="47tET_Wcd0y" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="47tET_W6G66" role="3AunhB">
+                        <ref role="a7OzE" node="47tET_W6G5H" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3Aq9E8" id="47tET_W6FLm" role="1nLNMd">
+                <node concept="3I6sU6" id="47tET_W6FLn" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="47tET_W6Gn9" role="3I6sU7">
+                    <node concept="3Aqt3T" id="47tET_W6Gn8" role="3I6s78">
+                      <ref role="3AqCNq" node="47tET_WOmOE" />
+                      <node concept="a7P8L" id="47tET_Xf3WO" role="3AunhB">
+                        <ref role="a7OzE" node="47tET_Xf3Vl" />
+                      </node>
+                      <node concept="a7P8L" id="47tET_W6Gnn" role="3AunhB">
+                        <ref role="a7OzE" node="47tET_W6G5H" resolve="CtrSet" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3Aq9_M" id="47tET_Wcd1o" role="1nLNMa">
+                <node concept="3I6sU6" id="47tET_Wcd1p" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="47tET_Wcd1v" role="3I6sU7">
+                    <node concept="3GeI9q" id="47tET_Wcd1s" role="3I6s78">
+                      <node concept="a7P8L" id="47tET_Xf3Wu" role="3GeI8F">
+                        <ref role="a7OzE" node="47tET_Xf3Vl" />
+                      </node>
+                      <node concept="a7P8L" id="47tET_Wcd1D" role="3GeI8D">
+                        <ref role="a7OzE" node="47tET_Wcd0y" resolve="TV0" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="47tET_XhSMg" role="3cqZAp" />
+        <node concept="1nLNNL" id="47tET_XgGv4" role="3cqZAp">
+          <node concept="1nLNMm" id="47tET_XgGv5" role="1nLNNK">
+            <node concept="0eUR_" id="47tET_XgGv6" role="0UC6o">
+              <node concept="3NuqgR" id="47tET_XgGv7" role="0eVf_">
+                <node concept="aZer4" id="47tET_XgGv8" role="3XD1gS">
+                  <property role="TrG5h" value="TV" />
+                </node>
+                <node concept="aZer4" id="47tET_XgGv9" role="3XD1gS">
+                  <property role="TrG5h" value="TV0" />
+                </node>
+                <node concept="aZer4" id="47tET_XgGyh" role="3XD1gS">
+                  <property role="TrG5h" value="TV0Ref" />
+                </node>
+              </node>
+              <node concept="3NuqgR" id="47tET_XgGva" role="0eVf_">
+                <node concept="aZer4" id="47tET_XgGvb" role="3XD1gS">
                   <property role="TrG5h" value="CtrSet" />
                 </node>
               </node>
             </node>
-            <node concept="3Aq93q" id="47tET_W6FL6" role="1nLNMb">
-              <node concept="3I6sU6" id="47tET_W6FL7" role="3Ip0Jz">
-                <node concept="3I6s7M" id="47tET_W6FLb" role="3I6sU7">
-                  <node concept="3Aqt3T" id="47tET_W6FLa" role="3I6s78">
-                    <ref role="3AqCNq" node="47tET_W6Fxn" resolve="produceTypeConstraints" />
-                    <node concept="1HFMs5" id="47tET_W6FLr" role="3AunhB">
-                      <node concept="a7P8L" id="47tET_W6FLg" role="1uarlU">
-                        <ref role="a7OzE" node="47tET_W6FKO" resolve="TVs" />
-                      </node>
-                      <node concept="ns1u0" id="47tET_W6FLB" role="1uarlW">
-                        <ref role="ns1xF" node="48ZGLP7pl6j" resolve="Cons" />
-                        <node concept="nsMwS" id="47tET_W6FLD" role="ns1xD">
-                          <ref role="nsMwP" node="48ZGLP7pl6$" resolve="head" />
-                          <node concept="1nq8_$" id="47tET_W6FMl" role="nsMwV">
-                            <node concept="a7P8L" id="47tET_W6FMj" role="1nq8_t">
-                              <ref role="a7OzE" node="47tET_W6FLH" resolve="TV" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="nsMwS" id="47tET_W6FMs" role="ns1xD">
-                          <ref role="nsMwP" node="48ZGLP7pl6J" resolve="tail" />
-                          <node concept="1nq8_$" id="47tET_W6FM_" role="nsMwV">
-                            <node concept="a7P8L" id="47tET_W6FMz" role="1nq8_t">
-                              <ref role="a7OzE" node="47tET_W6FM1" resolve="TVsTail" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
+            <node concept="3Aq93q" id="47tET_XgGvc" role="1nLNMb">
+              <node concept="3I6sU6" id="47tET_XgGvd" role="3Ip0Jz">
+                <node concept="3I6s7M" id="47tET_XgGve" role="3I6sU7">
+                  <node concept="3Aqt3T" id="47tET_XgGvf" role="3I6s78">
+                    <ref role="3AqCNq" node="47tET_XcN9h" resolve="produceTypeConstraint" />
+                    <node concept="a7P8L" id="47tET_XgGvg" role="3AunhB">
+                      <ref role="a7OzE" node="47tET_XgGv8" resolve="TV" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3Aq93q" id="47tET_W6FMG" role="1nLNMb">
-              <node concept="3I6sU6" id="47tET_W6FMH" role="3Ip0Jz">
-                <node concept="3I6s7M" id="47tET_W6G5v" role="3I6sU7">
-                  <node concept="3Aqt3T" id="47tET_W6G5u" role="3I6s78">
+            <node concept="3Aq93q" id="47tET_XgGvh" role="1nLNMb">
+              <node concept="3I6sU6" id="47tET_XgGvi" role="3Ip0Jz">
+                <node concept="3I6s7M" id="47tET_XgGvj" role="3I6sU7">
+                  <node concept="3Aqt3T" id="47tET_XgGvk" role="3I6s78">
                     <ref role="3AqCNq" node="47tET_W4MQg" resolve="typeConstraints" />
-                    <node concept="ns1u0" id="47tET_W6G6i" role="3AunhB">
+                    <node concept="a7P8L" id="47tET_XgGyZ" role="3AunhB">
+                      <ref role="a7OzE" node="47tET_XgGyh" resolve="TV0Ref" />
+                    </node>
+                    <node concept="a7P8L" id="47tET_XgGvp" role="3AunhB">
+                      <ref role="a7OzE" node="47tET_XgGvb" resolve="CtrSet" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9E8" id="47tET_XgGvq" role="1nLNMd">
+              <node concept="3I6sU6" id="47tET_XgGvr" role="3Ip0Jz">
+                <node concept="3I6s7M" id="47tET_XgGvs" role="3I6sU7">
+                  <node concept="3Aqt3T" id="47tET_XgGvt" role="3I6s78">
+                    <ref role="3AqCNq" node="47tET_WOmOE" resolve="tdefConstraints" />
+                    <node concept="a7P8L" id="47tET_XgGvu" role="3AunhB">
+                      <ref role="a7OzE" node="47tET_XgGv8" resolve="TV" />
+                    </node>
+                    <node concept="a7P8L" id="47tET_XgGvv" role="3AunhB">
+                      <ref role="a7OzE" node="47tET_XgGvb" resolve="CtrSet" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9_M" id="47tET_XgGvw" role="1nLNMa">
+              <node concept="3I6sU6" id="47tET_XgGvx" role="3Ip0Jz">
+                <node concept="3I6s7M" id="47tET_XgGy8" role="3I6sU7">
+                  <node concept="3A8Hvi" id="47tET_XgGy2" role="3I6s78">
+                    <node concept="ns1u0" id="47tET_XgGzE" role="3A8w4Q">
                       <ref role="ns1xF" node="48ZGLP8wdTf" resolve="VarRef" />
-                      <node concept="nsMwS" id="47tET_W6G6s" role="ns1xD">
+                    </node>
+                    <node concept="a7P8L" id="47tET_XgGzA" role="3A8wtg">
+                      <ref role="a7OzE" node="47tET_XgGyh" resolve="TV0Ref" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="47tET_XgGvy" role="3I6sU7">
+                  <node concept="3GeI9q" id="47tET_XgGvz" role="3I6s78">
+                    <node concept="a7P8L" id="47tET_XgGzN" role="3GeI8D">
+                      <ref role="a7OzE" node="47tET_XgGyh" resolve="TV0Ref" />
+                    </node>
+                    <node concept="ns1u0" id="47tET_XgGz9" role="3GeI8F">
+                      <ref role="ns1xF" node="48ZGLP8wdTf" resolve="VarRef" />
+                      <node concept="nsMwS" id="47tET_XgGzb" role="ns1xD">
                         <ref role="nsMwP" node="48ZGLP8wdUk" resolve="def" />
-                        <node concept="1nq8_$" id="47tET_W6G6y" role="nsMwV">
-                          <node concept="a7P8L" id="47tET_Wcd1I" role="1nq8_t">
-                            <ref role="a7OzE" node="47tET_Wcd0y" resolve="TV0" />
+                        <node concept="1nq8_$" id="47tET_XgGzh" role="nsMwV">
+                          <node concept="a7P8L" id="47tET_XgGzf" role="1nq8_t">
+                            <ref role="a7OzE" node="47tET_XgGv8" resolve="TV" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="a7P8L" id="47tET_W6G66" role="3AunhB">
-                      <ref role="a7OzE" node="47tET_W6G5H" resolve="CtrSet" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq9E8" id="47tET_W6FLm" role="1nLNMd">
-              <node concept="3I6sU6" id="47tET_W6FLn" role="3Ip0Jz">
-                <node concept="3I6s7M" id="47tET_W6Gn9" role="3I6sU7">
-                  <node concept="3Aqt3T" id="47tET_W6Gn8" role="3I6s78">
-                    <ref role="3AqCNq" node="47tET_WOmOE" resolve="tdefConstraints" />
-                    <node concept="a7P8L" id="47tET_W6Gnh" role="3AunhB">
-                      <ref role="a7OzE" node="47tET_W6FLH" resolve="TV" />
-                    </node>
-                    <node concept="a7P8L" id="47tET_W6Gnn" role="3AunhB">
-                      <ref role="a7OzE" node="47tET_W6G5H" resolve="CtrSet" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="47tET_W6Gn_" role="3I6sU7">
-                  <node concept="3Aqt3T" id="47tET_W6GnG" role="3I6s78">
-                    <ref role="3AqCNq" node="47tET_W6Fxn" resolve="produceTypeConstraints" />
-                    <node concept="a7P8L" id="47tET_W6GnL" role="3AunhB">
-                      <ref role="a7OzE" node="47tET_W6FM1" resolve="TVsTail" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq9_M" id="47tET_Wcd1o" role="1nLNMa">
-              <node concept="3I6sU6" id="47tET_Wcd1p" role="3Ip0Jz">
-                <node concept="3I6s7M" id="47tET_Wcd1v" role="3I6sU7">
-                  <node concept="3GeI9q" id="47tET_Wcd1s" role="3I6s78">
-                    <node concept="a7P8L" id="47tET_Wcd1$" role="3GeI8F">
-                      <ref role="a7OzE" node="47tET_W6FLH" resolve="TV" />
-                    </node>
-                    <node concept="a7P8L" id="47tET_Wcd1D" role="3GeI8D">
-                      <ref role="a7OzE" node="47tET_Wcd0y" resolve="TV0" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -11816,30 +12113,9 @@
               <node concept="3I6sU6" id="47tET_WgaMv" role="3Ip0Jz">
                 <node concept="3I6s7M" id="47tET_WgaMw" role="3I6sU7">
                   <node concept="3Aqt3T" id="47tET_WgaMx" role="3I6s78">
-                    <ref role="3AqCNq" node="47tET_W6Fxn" resolve="produceTypeConstraints" />
-                    <node concept="1HFMs5" id="47tET_WgaMy" role="3AunhB">
-                      <node concept="a7P8L" id="47tET_WgaMz" role="1uarlU">
-                        <ref role="a7OzE" node="47tET_W6FKO" resolve="TVs" />
-                      </node>
-                      <node concept="ns1u0" id="47tET_WgaM$" role="1uarlW">
-                        <ref role="ns1xF" node="48ZGLP7pl6j" resolve="Cons" />
-                        <node concept="nsMwS" id="47tET_WgaM_" role="ns1xD">
-                          <ref role="nsMwP" node="48ZGLP7pl6$" resolve="head" />
-                          <node concept="1nq8_$" id="47tET_WgaMA" role="nsMwV">
-                            <node concept="a7P8L" id="47tET_WgaMB" role="1nq8_t">
-                              <ref role="a7OzE" node="47tET_W6FLH" resolve="TV" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="nsMwS" id="47tET_WgaMC" role="ns1xD">
-                          <ref role="nsMwP" node="48ZGLP7pl6J" resolve="tail" />
-                          <node concept="1nq8_$" id="47tET_WgaMD" role="nsMwV">
-                            <node concept="a7P8L" id="47tET_WgaME" role="1nq8_t">
-                              <ref role="a7OzE" node="47tET_W6FM1" resolve="TVsTail" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
+                    <ref role="3AqCNq" node="47tET_XcN9h" />
+                    <node concept="a7P8L" id="47tET_Xf3X9" role="3AunhB">
+                      <ref role="a7OzE" node="47tET_Xf3Vl" />
                     </node>
                   </node>
                 </node>
@@ -11849,12 +12125,12 @@
               <node concept="3I6sU6" id="47tET_WgaQR" role="3Ip0Jz">
                 <node concept="3I6s7M" id="47tET_WgaR8" role="3I6sU7">
                   <node concept="3Aqt3T" id="47tET_WgaR7" role="3I6s78">
-                    <ref role="3AqCNq" node="47tET_W4MQg" resolve="typeConstraints" />
+                    <ref role="3AqCNq" node="47tET_W4MQg" />
                     <node concept="a7P8L" id="47tET_WgaRd" role="3AunhB">
                       <ref role="a7OzE" node="47tET_Wcd0y" resolve="TV0" />
                     </node>
                     <node concept="a7P8L" id="47tET_WgaRl" role="3AunhB">
-                      <ref role="a7OzE" node="47tET_W6G5H" resolve="CtrSet" />
+                      <ref role="a7OzE" node="47tET_W6G5H" />
                     </node>
                   </node>
                 </node>
@@ -11864,20 +12140,12 @@
               <node concept="3I6sU6" id="47tET_WgaMG" role="3Ip0Jz">
                 <node concept="3I6s7M" id="47tET_WOmPn" role="3I6sU7">
                   <node concept="3Aqt3T" id="47tET_WOmPl" role="3I6s78">
-                    <ref role="3AqCNq" node="47tET_WOmOE" resolve="tdefConstraints" />
-                    <node concept="a7P8L" id="47tET_WOmPv" role="3AunhB">
+                    <ref role="3AqCNq" node="47tET_WOmOE" />
+                    <node concept="a7P8L" id="47tET_Xf3Yj" role="3AunhB">
                       <ref role="a7OzE" node="47tET_Wcd0y" resolve="TV0" />
                     </node>
                     <node concept="a7P8L" id="47tET_WOmPB" role="3AunhB">
-                      <ref role="a7OzE" node="47tET_W6G5H" resolve="CtrSet" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="47tET_WgaML" role="3I6sU7">
-                  <node concept="3Aqt3T" id="47tET_WgaMM" role="3I6s78">
-                    <ref role="3AqCNq" node="47tET_W6Fxn" resolve="produceTypeConstraints" />
-                    <node concept="a7P8L" id="47tET_WgaMN" role="3AunhB">
-                      <ref role="a7OzE" node="47tET_W6FM1" resolve="TVsTail" />
+                      <ref role="a7OzE" node="47tET_W6G5H" />
                     </node>
                   </node>
                 </node>
@@ -11885,19 +12153,19 @@
             </node>
             <node concept="3Aq9_M" id="47tET_WgaQE" role="1nLNMa">
               <node concept="3I6sU6" id="47tET_WgaQF" role="3Ip0Jz">
+                <node concept="3I6s7M" id="47tET_XgaKb" role="3I6sU7">
+                  <node concept="2aLmEc" id="47tET_XgaK9" role="3I6s78">
+                    <node concept="a7P8L" id="47tET_XgaKm" role="2aLmnP">
+                      <ref role="a7OzE" node="47tET_Wcd0y" resolve="TV0" />
+                    </node>
+                  </node>
+                </node>
                 <node concept="3I6s7M" id="47tET_WgaSm" role="3I6sU7">
                   <node concept="3GeI9q" id="47tET_WgaSg" role="3I6s78">
-                    <node concept="a7P8L" id="47tET_WgaSu" role="3GeI8F">
-                      <ref role="a7OzE" node="47tET_W6FLH" resolve="TV" />
+                    <node concept="a7P8L" id="47tET_Xf3Xr" role="3GeI8F">
+                      <ref role="a7OzE" node="47tET_Xf3Vl" />
                     </node>
-                    <node concept="a7P8L" id="47tET_WgaSz" role="3GeI8D">
-                      <ref role="a7OzE" node="47tET_Wcd0y" resolve="TV0" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="47tET_WgaQJ" role="3I6sU7">
-                  <node concept="2aLmEc" id="47tET_WgaQI" role="3I6s78">
-                    <node concept="a7P8L" id="47tET_WgaSC" role="2aLmnP">
+                    <node concept="a7P8L" id="47tET_Xf3XF" role="3GeI8D">
                       <ref role="a7OzE" node="47tET_Wcd0y" resolve="TV0" />
                     </node>
                   </node>
@@ -11906,82 +12174,41 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="47tET_W6GnU" role="3cqZAp" />
-        <node concept="3SKdUt" id="47tET_W6Guf" role="3cqZAp">
-          <node concept="3SKdUq" id="47tET_W6Guh" role="3SKWNk">
-            <property role="3SKdUp" value="Produce empty Constraint set for other type variables" />
+        <node concept="3clFbH" id="47tET_Xk9CE" role="3cqZAp" />
+        <node concept="3SKdUt" id="47tET_Xk9Gf" role="3cqZAp">
+          <node concept="3SKdUq" id="47tET_Xk9Gh" role="3SKWNk">
+            <property role="3SKdUp" value="Produce empty constraint set for other variables" />
           </node>
         </node>
-        <node concept="1nLNNL" id="47tET_W6Gpp" role="3cqZAp">
-          <node concept="1nLNMm" id="47tET_W6Gpq" role="1nLNNK">
-            <node concept="3Aq93q" id="47tET_W6Gpy" role="1nLNMb">
-              <node concept="3I6sU6" id="47tET_W6Gpz" role="3Ip0Jz">
-                <node concept="3I6s7M" id="47tET_W6Gp$" role="3I6sU7">
-                  <node concept="3Aqt3T" id="47tET_W6Gp_" role="3I6s78">
-                    <ref role="3AqCNq" node="47tET_W6Fxn" resolve="produceTypeConstraints" />
-                    <node concept="1HFMs5" id="47tET_W6GpA" role="3AunhB">
-                      <node concept="a7P8L" id="47tET_W6GsA" role="1uarlU">
-                        <ref role="a7OzE" node="47tET_W6FKO" resolve="TVs" />
-                      </node>
-                      <node concept="ns1u0" id="47tET_W6GpC" role="1uarlW">
-                        <ref role="ns1xF" node="48ZGLP7pl6j" resolve="Cons" />
-                        <node concept="nsMwS" id="47tET_W6GpD" role="ns1xD">
-                          <ref role="nsMwP" node="48ZGLP7pl6$" resolve="head" />
-                          <node concept="1nq8_$" id="47tET_W6GpE" role="nsMwV">
-                            <node concept="a7P8L" id="47tET_W6GsD" role="1nq8_t">
-                              <ref role="a7OzE" node="47tET_W6FLH" resolve="TV" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="nsMwS" id="47tET_W6GpG" role="ns1xD">
-                          <ref role="nsMwP" node="48ZGLP7pl6J" resolve="tail" />
-                          <node concept="1nq8_$" id="47tET_W6GpH" role="nsMwV">
-                            <node concept="a7P8L" id="47tET_W6GsG" role="1nq8_t">
-                              <ref role="a7OzE" node="47tET_W6FM1" resolve="TVsTail" />
-                            </node>
-                          </node>
-                        </node>
+        <node concept="1X3_iC" id="47tET_Xk9Mu" role="lGtFl">
+          <property role="3V$3am" value="statement" />
+          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+          <node concept="1nLNNL" id="47tET_Xk9JU" role="8Wnug">
+            <node concept="1nLNMm" id="47tET_Xk9JW" role="1nLNNK">
+              <node concept="3Aq93q" id="47tET_Xk9LN" role="1nLNMb">
+                <property role="3ArMco" value="true" />
+                <node concept="3I6sU6" id="47tET_Xk9LO" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="47tET_Xk9LS" role="3I6sU7">
+                    <node concept="3Aqt3T" id="47tET_Xk9LR" role="3I6s78">
+                      <ref role="3AqCNq" node="47tET_XcN9h" resolve="produceTypeConstraint" />
+                      <node concept="a7P8L" id="47tET_Xk9LX" role="3AunhB">
+                        <ref role="a7OzE" node="47tET_Xf3Vl" resolve="TV" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="3Aq9E8" id="47tET_W6GpS" role="1nLNMd">
-              <node concept="3I6sU6" id="47tET_W6GpT" role="3Ip0Jz">
-                <node concept="3I6s7M" id="47tET_W6GpU" role="3I6sU7">
-                  <node concept="3Aqt3T" id="47tET_W6GpV" role="3I6s78">
-                    <ref role="3AqCNq" node="47tET_WOmOE" resolve="tdefConstraints" />
-                    <node concept="a7P8L" id="47tET_W6GsJ" role="3AunhB">
-                      <ref role="a7OzE" node="47tET_W6FLH" resolve="TV" />
-                    </node>
-                    <node concept="a7P8L" id="47tET_W6GsN" role="3AunhB">
-                      <ref role="a7OzE" node="47tET_W6G5H" resolve="CtrSet" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="47tET_W6GpY" role="3I6sU7">
-                  <node concept="3Aqt3T" id="47tET_W6GpZ" role="3I6s78">
-                    <ref role="3AqCNq" node="47tET_W6Fxn" resolve="produceTypeConstraints" />
-                    <node concept="a7P8L" id="47tET_W6Gsv" role="3AunhB">
-                      <ref role="a7OzE" node="47tET_W6FM1" resolve="TVsTail" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="47tET_W6GxH" role="3cqZAp" />
-        <node concept="1nLNNL" id="47tET_W6G$2" role="3cqZAp">
-          <node concept="1nLNMm" id="47tET_W6G$4" role="1nLNNK">
-            <node concept="3Aq93q" id="47tET_W6G_h" role="1nLNMb">
-              <node concept="3I6sU6" id="47tET_W6G_i" role="3Ip0Jz">
-                <node concept="3I6s7M" id="47tET_W6G_m" role="3I6sU7">
-                  <node concept="3Aqt3T" id="47tET_W6G_l" role="3I6s78">
-                    <ref role="3AqCNq" node="47tET_W6Fxn" resolve="produceTypeConstraints" />
-                    <node concept="ns1u0" id="47tET_W6G_r" role="3AunhB">
-                      <ref role="ns1xF" node="48ZGLP7pl6N" resolve="Nil" />
+              <node concept="3Aq9E8" id="47tET_Xk9M2" role="1nLNMd">
+                <node concept="3I6sU6" id="47tET_Xk9M3" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="47tET_Xk9M7" role="3I6sU7">
+                    <node concept="3Aqt3T" id="47tET_Xk9M6" role="3I6s78">
+                      <ref role="3AqCNq" node="47tET_WOmOE" resolve="tdefConstraints" />
+                      <node concept="a7P8L" id="47tET_Xk9Mg" role="3AunhB">
+                        <ref role="a7OzE" node="47tET_Xf3Vl" resolve="TV" />
+                      </node>
+                      <node concept="a7P8L" id="47tET_Xk9Mo" role="3AunhB">
+                        <ref role="a7OzE" node="47tET_W6G5H" resolve="CtrSet" />
+                      </node>
                     </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 d80f68cc..85231c8c 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
@@ -4962,6 +4962,9 @@
                 <ref role="t0$VJ" node="47tET_WwVda" resolve="x" />
               </node>
             </node>
+            <node concept="1U20sH" id="47tET_XliIO" role="lGtFl">
+              <property role="1U20sK" value="error" />
+            </node>
           </node>
           <node concept="1DVIrU" id="47tET_WwVdg" role="1DVIo8">
             <node concept="1DVIrB" id="47tET_WwVdh" role="1DVIr_">
@@ -4976,6 +4979,181 @@
         </node>
       </node>
     </node>
+    <node concept="1DVJbV" id="47tET_Xliiq" role="1DVIru">
+      <node concept="1DVIrG" id="47tET_Xliir" role="j9CMd">
+        <node concept="1DVIoH" id="47tET_Xliis" role="1DVIrJ">
+          <property role="TrG5h" value="ii2a" />
+        </node>
+        <node concept="1DVIo5" id="47tET_Xliit" role="1DVIrD">
+          <node concept="1DVIo5" id="47tET_Xliiu" role="1DVIo4">
+            <node concept="t0$VC" id="47tET_Xliiv" role="1DVIo4">
+              <ref role="t0$VJ" node="2O9ahh6x9Cr" resolve="mappend" />
+            </node>
+            <node concept="1DVIrU" id="47tET_Xliiw" role="1DVIo8">
+              <node concept="1DVIrB" id="47tET_Xliix" role="1DVIr_">
+                <node concept="3TPQf" id="47tET_Xlipa" role="1DVIrA">
+                  <node concept="1DVIoH" id="47tET_Xlipc" role="3TPQ0">
+                    <property role="TrG5h" value="x" />
+                  </node>
+                  <node concept="3JbUGG" id="47tET_Xlipn" role="3TPQk">
+                    <node concept="1FkZV4" id="47tET_Xlipv" role="1FkZ4g">
+                      <ref role="1FkZV7" node="2O9ahh6x9Cg" resolve="Monoid" />
+                      <ref role="1FvTW1" node="47tET_Xlipt" resolve="xx" />
+                    </node>
+                    <node concept="2BbKIm" id="47tET_Xlipt" role="5lUUh">
+                      <property role="TrG5h" value="xx" />
+                    </node>
+                    <node concept="aFS0r" id="47tET_Xlipx" role="3JbKvY">
+                      <ref role="aFS0e" node="47tET_Xlipt" resolve="xx" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="t0$VC" id="47tET_Xlit0" role="1DVIrw">
+                <ref role="t0$VJ" node="47tET_Xlipa" resolve="x" />
+              </node>
+            </node>
+          </node>
+          <node concept="1DVIrU" id="47tET_Xlii$" role="1DVIo8">
+            <node concept="1DVIrB" id="47tET_Xlii_" role="1DVIr_">
+              <node concept="3TPQf" id="47tET_Xlip$" role="1DVIrA">
+                <node concept="1DVIoH" id="47tET_XlipA" role="3TPQ0">
+                  <property role="TrG5h" value="y" />
+                </node>
+                <node concept="3JbUGG" id="47tET_XlipH" role="3TPQk">
+                  <node concept="1FkZV4" id="47tET_XlipP" role="1FkZ4g">
+                    <ref role="1FkZV7" node="2O9ahh6x9Cg" resolve="Monoid" />
+                    <ref role="1FvTW1" node="47tET_XlipN" resolve="yy" />
+                  </node>
+                  <node concept="2BbKIm" id="47tET_XlipN" role="5lUUh">
+                    <property role="TrG5h" value="yy" />
+                  </node>
+                  <node concept="aFS0r" id="47tET_XlipR" role="3JbKvY">
+                    <ref role="aFS0e" node="47tET_XlipN" resolve="yy" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="t0$VC" id="47tET_Xlit3" role="1DVIrw">
+              <ref role="t0$VJ" node="47tET_Xlip$" resolve="y" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1DVJbV" id="47tET_XliM6" role="1DVIru">
+      <node concept="1DVIrG" id="47tET_XliM7" role="j9CMd">
+        <node concept="1DVIoH" id="47tET_XliM8" role="1DVIrJ">
+          <property role="TrG5h" value="ii3" />
+        </node>
+        <node concept="1DVIo5" id="47tET_XliM9" role="1DVIrD">
+          <node concept="1DVIo5" id="47tET_XliMa" role="1DVIo4">
+            <node concept="t0$VC" id="47tET_XliMb" role="1DVIo4">
+              <ref role="t0$VJ" node="2O9ahh6x9Cr" resolve="mappend" />
+            </node>
+            <node concept="3TPRf" id="47tET_XliU0" role="1DVIo8">
+              <node concept="1DVIrU" id="47tET_XliMc" role="3TPR0">
+                <node concept="1DVIrB" id="47tET_XliMd" role="1DVIr_">
+                  <node concept="1DVIoH" id="47tET_XliTV" role="1DVIrA">
+                    <property role="TrG5h" value="x" />
+                  </node>
+                </node>
+                <node concept="t0$VC" id="47tET_XliTX" role="1DVIrw">
+                  <ref role="t0$VJ" node="47tET_XliTV" resolve="x" />
+                </node>
+              </node>
+              <node concept="3JbUGG" id="47tET_XliU6" role="3TPQk">
+                <node concept="1FkZV4" id="47tET_XliUc" role="1FkZ4g">
+                  <ref role="1FkZV7" node="2O9ahh6x9Cg" resolve="Monoid" />
+                  <ref role="1FvTW1" node="47tET_XliUa" resolve="x" />
+                </node>
+                <node concept="2BbKIm" id="47tET_XliUa" role="5lUUh">
+                  <property role="TrG5h" value="x" />
+                </node>
+                <node concept="1jz_ff" id="47tET_XliUe" role="3JbKvY">
+                  <node concept="aFS0r" id="47tET_XliUg" role="1jz_fp">
+                    <ref role="aFS0e" node="47tET_XliUa" resolve="x" />
+                  </node>
+                  <node concept="aFS0r" id="47tET_XliUi" role="1jz_f_">
+                    <ref role="aFS0e" node="47tET_XliUa" resolve="x" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1DVIrU" id="47tET_XliYs" role="1DVIo8">
+            <node concept="1DVIrB" id="47tET_XliYt" role="1DVIr_">
+              <node concept="1DVIoH" id="47tET_XliYu" role="1DVIrA">
+                <property role="TrG5h" value="y" />
+              </node>
+            </node>
+            <node concept="3P8MHP" id="47tET_Xlj0c" role="1DVIrw" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1DVJbV" id="47tET_Xliwm" role="1DVIru">
+      <node concept="1DVIrG" id="47tET_Xliwn" role="j9CMd">
+        <node concept="1DVIoH" id="47tET_Xliwo" role="1DVIrJ">
+          <property role="TrG5h" value="ii4" />
+        </node>
+        <node concept="1DVIo5" id="47tET_Xliwp" role="1DVIrD">
+          <node concept="1DVIo5" id="47tET_Xliwq" role="1DVIo4">
+            <node concept="t0$VC" id="47tET_Xliwr" role="1DVIo4">
+              <ref role="t0$VJ" node="2O9ahh6x9Cr" resolve="mappend" />
+            </node>
+            <node concept="1DVIrU" id="47tET_Xliws" role="1DVIo8">
+              <node concept="1DVIrB" id="47tET_Xliwt" role="1DVIr_">
+                <node concept="1DVIoH" id="47tET_XliBM" role="1DVIrA">
+                  <property role="TrG5h" value="x" />
+                </node>
+              </node>
+              <node concept="3TPRf" id="47tET_XliBO" role="1DVIrw">
+                <node concept="t0$VC" id="47tET_XliBQ" role="3TPR0">
+                  <ref role="t0$VJ" node="47tET_XliBM" resolve="x" />
+                </node>
+                <node concept="3JbUGG" id="47tET_XliBS" role="3TPQk">
+                  <node concept="2BbKIm" id="47tET_XliBY" role="5lUUh">
+                    <property role="TrG5h" value="x" />
+                  </node>
+                  <node concept="1FkZV4" id="47tET_XliBW" role="1FkZ4g">
+                    <ref role="1FkZV7" node="2O9ahh6x9Cg" resolve="Monoid" />
+                    <ref role="1FvTW1" node="47tET_XliBY" resolve="x" />
+                  </node>
+                  <node concept="aFS0r" id="47tET_XliC0" role="3JbKvY">
+                    <ref role="aFS0e" node="47tET_XliBY" resolve="x" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1DVIrU" id="47tET_Xliw_" role="1DVIo8">
+            <node concept="1DVIrB" id="47tET_XliwA" role="1DVIr_">
+              <node concept="1DVIoH" id="47tET_XliC3" role="1DVIrA">
+                <property role="TrG5h" value="y" />
+              </node>
+            </node>
+            <node concept="3TPRf" id="47tET_XliC7" role="1DVIrw">
+              <node concept="t0$VC" id="47tET_XliC9" role="3TPR0">
+                <ref role="t0$VJ" node="47tET_XliC3" resolve="y" />
+              </node>
+              <node concept="3JbUGG" id="47tET_XliCb" role="3TPQk">
+                <node concept="2BbKIm" id="47tET_XliCh" role="5lUUh">
+                  <property role="TrG5h" value="y" />
+                </node>
+                <node concept="1FkZV4" id="47tET_XliCf" role="1FkZ4g">
+                  <ref role="1FkZV7" node="2O9ahh6x9Cg" resolve="Monoid" />
+                  <ref role="1FvTW1" node="47tET_XliCh" resolve="y" />
+                </node>
+                <node concept="aFS0r" id="47tET_XliCj" role="3JbKvY">
+                  <ref role="aFS0e" node="47tET_XliCh" resolve="y" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="1DVIrt" id="47tET_WGoBb">
     <property role="TrG5h" value="Typeclasses" />
@@ -5281,5 +5459,114 @@
       </node>
     </node>
   </node>
+  <node concept="1DVIrt" id="47tET_X70kk">
+    <property role="TrG5h" value="TypeclassesTest" />
+    <node concept="1FkZNM" id="47tET_X70oO" role="1DVIru">
+      <property role="TrG5h" value="C1" />
+      <node concept="2BbKIm" id="47tET_X70oQ" role="1FkZN_">
+        <property role="TrG5h" value="c1" />
+      </node>
+    </node>
+    <node concept="1FkZNM" id="47tET_X70kl" role="1DVIru">
+      <property role="TrG5h" value="Monoid2" />
+      <node concept="2BbKIm" id="47tET_X70km" role="1FkZN_">
+        <property role="TrG5h" value="z" />
+      </node>
+      <node concept="1FkZNY" id="47tET_X70kn" role="1FkZNV">
+        <node concept="3TPQf" id="47tET_X70ko" role="1FkZNT">
+          <node concept="1DVIoH" id="47tET_X70kp" role="3TPQ0">
+            <property role="TrG5h" value="mempty" />
+          </node>
+          <node concept="aFS0r" id="47tET_X70kq" role="3TPQk">
+            <ref role="aFS0e" node="47tET_X70km" resolve="z" />
+          </node>
+        </node>
+      </node>
+      <node concept="1FkZNY" id="47tET_X70kr" role="1FkZNV">
+        <node concept="3TPQf" id="47tET_X70ks" role="1FkZNT">
+          <node concept="1DVIoH" id="47tET_X70kt" role="3TPQ0">
+            <property role="TrG5h" value="mappend" />
+          </node>
+          <node concept="1jz_ff" id="47tET_X70ku" role="3TPQk">
+            <node concept="aFS0r" id="47tET_X70kv" role="1jz_fp">
+              <ref role="aFS0e" node="47tET_X70km" resolve="z" />
+            </node>
+            <node concept="1jz_ff" id="47tET_X70kw" role="1jz_f_">
+              <node concept="aFS0r" id="47tET_X70kx" role="1jz_f_">
+                <ref role="aFS0e" node="47tET_X70km" resolve="z" />
+              </node>
+              <node concept="aFS0r" id="47tET_X70ky" role="1jz_fp">
+                <ref role="aFS0e" node="47tET_X70km" resolve="z" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1DVJbV" id="47tET_X70kz" role="1DVIru">
+      <node concept="1DVIrG" id="47tET_X70k$" role="j9CMd">
+        <node concept="1DVIoH" id="47tET_X70k_" role="1DVIrJ">
+          <property role="TrG5h" value="cc1" />
+        </node>
+        <node concept="1DVIrU" id="47tET_X70kA" role="1DVIrD">
+          <node concept="1DVIrB" id="47tET_X70kB" role="1DVIr_">
+            <node concept="1DVIoH" id="47tET_X70kC" role="1DVIrA">
+              <property role="TrG5h" value="x" />
+            </node>
+          </node>
+          <node concept="1DVIo5" id="47tET_X70kD" role="1DVIrw">
+            <node concept="1DVIo5" id="47tET_X70kE" role="1DVIo4">
+              <node concept="t0$VC" id="47tET_X70l7" role="1DVIo4">
+                <ref role="t0$VJ" node="47tET_X70ks" resolve="mappend" />
+              </node>
+              <node concept="t0$VC" id="47tET_X70kG" role="1DVIo8">
+                <ref role="t0$VJ" node="47tET_X70kC" resolve="x" />
+              </node>
+            </node>
+            <node concept="t0$VC" id="47tET_X70kH" role="1DVIo8">
+              <ref role="t0$VJ" node="47tET_X70kC" resolve="x" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1DVJbV" id="47tET_X71sL" role="1DVIru">
+      <node concept="1DVIrG" id="47tET_X71sM" role="j9CMd">
+        <node concept="1DVIoH" id="47tET_X71sN" role="1DVIrJ">
+          <property role="TrG5h" value="cc3" />
+        </node>
+        <node concept="1DVIrU" id="47tET_X71sO" role="1DVIrD">
+          <node concept="1DVIrB" id="47tET_X71sP" role="1DVIr_">
+            <node concept="3TPQf" id="47tET_X71sQ" role="1DVIrA">
+              <node concept="1DVIoH" id="47tET_X71sR" role="3TPQ0">
+                <property role="TrG5h" value="p1" />
+              </node>
+              <node concept="3JbUGG" id="47tET_X71sS" role="3TPQk">
+                <node concept="2BbKIm" id="47tET_X71sV" role="5lUUh">
+                  <property role="TrG5h" value="a" />
+                </node>
+                <node concept="aFS0r" id="47tET_X71T8" role="3JbKvY">
+                  <ref role="aFS0e" node="47tET_X71sV" resolve="a" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3TPRf" id="47tET_X71t0" role="1DVIrw">
+            <node concept="t0$VC" id="47tET_X71t1" role="3TPR0">
+              <ref role="t0$VJ" node="47tET_X71sQ" resolve="p1" />
+            </node>
+            <node concept="3JbUGG" id="47tET_X71t2" role="3TPQk">
+              <node concept="2BbKIm" id="47tET_X71t5" role="5lUUh">
+                <property role="TrG5h" value="b" />
+              </node>
+              <node concept="aFS0r" id="47tET_X71Td" role="3JbKvY">
+                <ref role="aFS0e" node="47tET_X71t5" resolve="b" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>