diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 157d4d74..76bded3e 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -15419,114 +15419,93 @@
         </node>
       </node>
     </node>
-    <node concept="1nLNMY" id="12QmIo_7siC" role="1nK1Vg">
-      <property role="TrG5h" value="converts_free_and_ground" />
-      <node concept="3clFbS" id="12QmIo_7siD" role="1nLNMH">
-        <node concept="3SKdUt" id="3R6X$QWb7uN" role="3cqZAp">
-          <node concept="1PaTwC" id="3R6X$QWb7uO" role="3ndbpf">
-            <node concept="3oM_SD" id="3R6X$QWb7uQ" role="1PaTwD">
-              <property role="3oM_SC" value="if" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QWb7zb" role="1PaTwD">
-              <property role="3oM_SC" value="free" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QWxx$o" role="1PaTwD">
-              <property role="3oM_SC" value="var" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QWb7ze" role="1PaTwD">
-              <property role="3oM_SC" value="has" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QWb7ES" role="1PaTwD">
-              <property role="3oM_SC" value="a" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QWb7EX" role="1PaTwD">
-              <property role="3oM_SC" value="bound" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QWb824" role="1PaTwD">
-              <property role="3oM_SC" value="then" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QWb860" role="1PaTwD">
-              <property role="3oM_SC" value="it" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QWb86a" role="1PaTwD">
-              <property role="3oM_SC" value="will" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QWb8a8" role="1PaTwD">
-              <property role="3oM_SC" value="be" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QWb8ak" role="1PaTwD">
-              <property role="3oM_SC" value="checked" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QWb8ek" role="1PaTwD">
-              <property role="3oM_SC" value="through" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QWb8ey" role="1PaTwD">
-              <property role="3oM_SC" value="reactivation" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QWb8i$" role="1PaTwD">
-              <property role="3oM_SC" value="of" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QWxxK2" role="1PaTwD">
-              <property role="3oM_SC" value="hasBound()" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3R6X$QWxxnN" role="3cqZAp" />
-        <node concept="1nLNNL" id="12QmIo_7siE" role="3cqZAp">
-          <node concept="1nLNMm" id="12QmIo_7siF" role="1nLNNK">
-            <node concept="0eUR_" id="7lt0LtPBjTI" role="0UC6o">
-              <node concept="3NuqgR" id="2CsZ2XTaB1" role="0eVf_">
-                <node concept="aZer4" id="2CsZ2XTaB2" role="3XD1gS">
+    <node concept="1nLNMY" id="5o9$c3zAtP8" role="1nK1Vg">
+      <property role="TrG5h" value="converts_freeBounded_and_ground" />
+      <node concept="3clFbS" id="5o9$c3zAtP9" role="1nLNMH">
+        <node concept="1nLNNL" id="5o9$c3zGerb" role="3cqZAp">
+          <node concept="1nLNMm" id="5o9$c3zGerc" role="1nLNNK">
+            <node concept="0eUR_" id="5o9$c3zGerd" role="0UC6o">
+              <node concept="3NuqgR" id="5o9$c3zGere" role="0eVf_">
+                <node concept="aZer4" id="5o9$c3zGerf" role="3XD1gS">
                   <property role="TrG5h" value="S" />
                 </node>
-                <node concept="aZer4" id="2CsZ2XTaBb" role="3XD1gS">
+                <node concept="aZer4" id="5o9$c3zGerg" role="3XD1gS">
                   <property role="TrG5h" value="T" />
                 </node>
+                <node concept="aZer4" id="5o9$c3zGerh" role="3XD1gS">
+                  <property role="TrG5h" value="SBound" />
+                </node>
               </node>
             </node>
-            <node concept="3Aq93q" id="24Vro6cMAGL" role="1nLNMb">
+            <node concept="3Aq93q" id="5o9$c3zGeri" role="1nLNMb">
               <property role="3ArMco" value="false" />
-              <node concept="3I6sU6" id="4nIWweBB_8S" role="3Ip0Jz">
-                <node concept="3I6s7M" id="4nIWweBB_8T" role="3I6sU7">
-                  <node concept="3Aqt3T" id="24Vro6cMANV" role="3I6s78">
+              <node concept="3I6sU6" id="5o9$c3zGerj" role="3Ip0Jz">
+                <node concept="3I6s7M" id="5o9$c3zGerk" role="3I6sU7">
+                  <node concept="3Aqt3T" id="5o9$c3zGerl" role="3I6s78">
                     <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
-                    <node concept="a7P8L" id="24Vro6cMAOx" role="3AunhB">
-                      <ref role="a7OzE" node="2CsZ2XTaB2" resolve="S" />
+                    <node concept="a7P8L" id="5o9$c3zGerm" role="3AunhB">
+                      <ref role="a7OzE" node="5o9$c3zGerf" resolve="S" />
                     </node>
-                    <node concept="a7P8L" id="24Vro6cMAOD" role="3AunhB">
-                      <ref role="a7OzE" node="2CsZ2XTaBb" resolve="T" />
+                    <node concept="a7P8L" id="5o9$c3zGern" role="3AunhB">
+                      <ref role="a7OzE" node="5o9$c3zGerg" resolve="T" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3Aq9_M" id="5upUcEtp6xc" role="1nLNMa">
-              <node concept="3I6sU6" id="5upUcEtp6xd" role="3Ip0Jz">
-                <node concept="3I6s7M" id="5upUcEtp6ye" role="3I6sU7">
-                  <node concept="2aLmEc" id="5upUcEtp6yc" role="3I6s78">
-                    <node concept="a7P8L" id="5upUcEtp6yk" role="2aLmnP">
-                      <ref role="a7OzE" node="2CsZ2XTaB2" resolve="S" />
+            <node concept="3Aq93q" id="5o9$c3zGero" role="1nLNMb">
+              <node concept="3I6sU6" id="5o9$c3zGerp" role="3Ip0Jz">
+                <node concept="3I6s7M" id="5o9$c3zGerq" role="3I6sU7">
+                  <node concept="3Aqt3T" id="5o9$c3zGerr" role="3I6s78">
+                    <ref role="3AqCNq" node="5310cdpUCuT" resolve="hasBound" />
+                    <node concept="a7P8L" id="5o9$c3zGers" role="3AunhB">
+                      <ref role="a7OzE" node="5o9$c3zGerf" resolve="S" />
                     </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="5upUcEtp6xh" role="3I6sU7">
-                  <node concept="2aM9Np" id="5upUcEtp6xg" role="3I6s78">
-                    <node concept="a7P8L" id="5upUcEtp6xk" role="2aLmnP">
-                      <ref role="a7OzE" node="2CsZ2XTaBb" resolve="T" />
+                    <node concept="a7P8L" id="5o9$c3zGert" role="3AunhB">
+                      <ref role="a7OzE" node="5o9$c3zGerh" resolve="SBound" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3Aq9E8" id="24Vro6cMAG_" role="1nLNMd">
-              <node concept="3I6sU6" id="4nIWweBB_9E" role="3Ip0Jz">
-                <node concept="3I6s7M" id="5upUcEtp6xO" role="3I6sU7">
-                  <node concept="3A8Hvi" id="5upUcEtp6xI" role="3I6s78">
-                    <node concept="a7P8L" id="5upUcEtp6xX" role="3A8wtg">
-                      <ref role="a7OzE" node="2CsZ2XTaB2" resolve="S" />
+            <node concept="3Aq9_M" id="5o9$c3zGeru" role="1nLNMa">
+              <node concept="3I6sU6" id="5o9$c3zGerv" role="3Ip0Jz">
+                <node concept="3I6s7M" id="5o9$c3zGerw" role="3I6sU7">
+                  <node concept="2aLmEc" id="5o9$c3zGerx" role="3I6s78">
+                    <node concept="a7P8L" id="5o9$c3zGery" role="2aLmnP">
+                      <ref role="a7OzE" node="5o9$c3zGerf" resolve="S" />
                     </node>
-                    <node concept="a7P8L" id="5upUcEtp6y2" role="3A8w4Q">
-                      <ref role="a7OzE" node="2CsZ2XTaBb" resolve="T" />
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="5o9$c3zGerz" role="3I6sU7">
+                  <node concept="2aM9Np" id="5o9$c3zGer$" role="3I6s78">
+                    <node concept="a7P8L" id="5o9$c3zGer_" role="2aLmnP">
+                      <ref role="a7OzE" node="5o9$c3zGerg" resolve="T" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9E8" id="5o9$c3zGerA" role="1nLNMd">
+              <node concept="3I6sU6" id="5o9$c3zGerB" role="3Ip0Jz">
+                <node concept="3I6s7M" id="5o9$c3zGerC" role="3I6sU7">
+                  <node concept="3Aqt3T" id="5o9$c3zGerD" role="3I6s78">
+                    <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
+                    <node concept="a7P8L" id="5o9$c3zGe_$" role="3AunhB">
+                      <ref role="a7OzE" node="5o9$c3zGerg" resolve="T" />
+                    </node>
+                    <node concept="a7P8L" id="5o9$c3zGeHn" role="3AunhB">
+                      <ref role="a7OzE" node="5o9$c3zGerh" resolve="SBound" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="5o9$c3zGerG" role="3I6sU7">
+                  <node concept="3A8Hvi" id="5o9$c3zGerH" role="3I6s78">
+                    <node concept="a7P8L" id="5o9$c3zGerI" role="3A8wtg">
+                      <ref role="a7OzE" node="5o9$c3zGerf" resolve="S" />
+                    </node>
+                    <node concept="a7P8L" id="5o9$c3zGeLp" role="3A8w4Q">
+                      <ref role="a7OzE" node="5o9$c3zGerg" resolve="T" />
                     </node>
                   </node>
                 </node>
@@ -15534,62 +15513,294 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="3R6X$QWxxf2" role="3cqZAp" />
-        <node concept="1nLNNL" id="3R6X$QWxx9l" role="3cqZAp">
-          <node concept="1nLNMm" id="3R6X$QWxx9m" role="1nLNNK">
-            <node concept="0eUR_" id="3R6X$QWxx9n" role="0UC6o">
-              <node concept="3NuqgR" id="3R6X$QWxx9o" role="0eVf_">
-                <node concept="aZer4" id="3R6X$QWxx9p" role="3XD1gS">
+        <node concept="3clFbH" id="5o9$c3zAtPJ" role="3cqZAp" />
+        <node concept="1nLNNL" id="5o9$c3zAtPK" role="3cqZAp">
+          <node concept="1nLNMm" id="5o9$c3zAtPL" role="1nLNNK">
+            <node concept="0eUR_" id="5o9$c3zAtPM" role="0UC6o">
+              <node concept="3NuqgR" id="5o9$c3zAtPN" role="0eVf_">
+                <node concept="aZer4" id="5o9$c3zAtPO" role="3XD1gS">
                   <property role="TrG5h" value="S" />
                 </node>
-                <node concept="aZer4" id="3R6X$QWxx9q" role="3XD1gS">
+                <node concept="aZer4" id="5o9$c3zAtPP" role="3XD1gS">
                   <property role="TrG5h" value="T" />
                 </node>
+                <node concept="aZer4" id="5o9$c3zAtPQ" role="3XD1gS">
+                  <property role="TrG5h" value="TBound" />
+                </node>
               </node>
             </node>
-            <node concept="3Aq93q" id="3R6X$QWxx9t" role="1nLNMb">
+            <node concept="3Aq93q" id="5o9$c3zAtPR" role="1nLNMb">
               <property role="3ArMco" value="false" />
-              <node concept="3I6sU6" id="3R6X$QWxx9u" role="3Ip0Jz">
-                <node concept="3I6s7M" id="3R6X$QWxx9v" role="3I6sU7">
-                  <node concept="3Aqt3T" id="3R6X$QWxx9w" role="3I6s78">
+              <node concept="3I6sU6" id="5o9$c3zAtPS" role="3Ip0Jz">
+                <node concept="3I6s7M" id="5o9$c3zAtPT" role="3I6sU7">
+                  <node concept="3Aqt3T" id="5o9$c3zAtPU" role="3I6s78">
                     <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
-                    <node concept="a7P8L" id="3R6X$QWxx9x" role="3AunhB">
-                      <ref role="a7OzE" node="3R6X$QWxx9p" resolve="S" />
+                    <node concept="a7P8L" id="5o9$c3zAtPV" role="3AunhB">
+                      <ref role="a7OzE" node="5o9$c3zAtPO" resolve="S" />
                     </node>
-                    <node concept="a7P8L" id="3R6X$QWxx9y" role="3AunhB">
-                      <ref role="a7OzE" node="3R6X$QWxx9q" resolve="T" />
+                    <node concept="a7P8L" id="5o9$c3zAtPW" role="3AunhB">
+                      <ref role="a7OzE" node="5o9$c3zAtPP" resolve="T" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3Aq9_M" id="3R6X$QWxx9z" role="1nLNMa">
-              <node concept="3I6sU6" id="3R6X$QWxx9$" role="3Ip0Jz">
-                <node concept="3I6s7M" id="3R6X$QWxx9_" role="3I6sU7">
-                  <node concept="2aLmEc" id="3R6X$QWxx9A" role="3I6s78">
-                    <node concept="a7P8L" id="3R6X$QWxyq3" role="2aLmnP">
-                      <ref role="a7OzE" node="3R6X$QWxx9q" resolve="T" />
+            <node concept="3Aq93q" id="5o9$c3zAtPX" role="1nLNMb">
+              <node concept="3I6sU6" id="5o9$c3zAtPY" role="3Ip0Jz">
+                <node concept="3I6s7M" id="5o9$c3zAtPZ" role="3I6sU7">
+                  <node concept="3Aqt3T" id="5o9$c3zAtQ0" role="3I6s78">
+                    <ref role="3AqCNq" node="5310cdpUCuT" resolve="hasBound" />
+                    <node concept="a7P8L" id="5o9$c3zAtQ1" role="3AunhB">
+                      <ref role="a7OzE" node="5o9$c3zAtPP" resolve="T" />
                     </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="3R6X$QWxx9C" role="3I6sU7">
-                  <node concept="2aM9Np" id="3R6X$QWxx9D" role="3I6s78">
-                    <node concept="a7P8L" id="3R6X$QWxyu2" role="2aLmnP">
-                      <ref role="a7OzE" node="3R6X$QWxx9p" resolve="S" />
+                    <node concept="a7P8L" id="5o9$c3zAtQ2" role="3AunhB">
+                      <ref role="a7OzE" node="5o9$c3zAtPQ" resolve="TBound" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3Aq9E8" id="3R6X$QWxx9F" role="1nLNMd">
-              <node concept="3I6sU6" id="3R6X$QWxx9G" role="3Ip0Jz">
-                <node concept="3I6s7M" id="3R6X$QWxx9H" role="3I6sU7">
-                  <node concept="3A8Hvi" id="3R6X$QWxx9I" role="3I6s78">
-                    <node concept="a7P8L" id="3R6X$QWxx9J" role="3A8wtg">
-                      <ref role="a7OzE" node="3R6X$QWxx9p" resolve="S" />
+            <node concept="3Aq9_M" id="5o9$c3zAtQ3" role="1nLNMa">
+              <node concept="3I6sU6" id="5o9$c3zAtQ4" role="3Ip0Jz">
+                <node concept="3I6s7M" id="5o9$c3zAtQ5" role="3I6sU7">
+                  <node concept="2aLmEc" id="5o9$c3zAtQ6" role="3I6s78">
+                    <node concept="a7P8L" id="5o9$c3zAtQ7" role="2aLmnP">
+                      <ref role="a7OzE" node="5o9$c3zAtPP" resolve="T" />
                     </node>
-                    <node concept="a7P8L" id="3R6X$QWxx9K" role="3A8w4Q">
-                      <ref role="a7OzE" node="3R6X$QWxx9q" resolve="T" />
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="5o9$c3zAtQ8" role="3I6sU7">
+                  <node concept="2aM9Np" id="5o9$c3zAtQ9" role="3I6s78">
+                    <node concept="a7P8L" id="5o9$c3zAtQa" role="2aLmnP">
+                      <ref role="a7OzE" node="5o9$c3zAtPO" resolve="S" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9E8" id="5o9$c3zAtQb" role="1nLNMd">
+              <node concept="3I6sU6" id="5o9$c3zAtQc" role="3Ip0Jz">
+                <node concept="3I6s7M" id="5o9$c3zAtQd" role="3I6sU7">
+                  <node concept="3Aqt3T" id="5o9$c3zAtQe" role="3I6s78">
+                    <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
+                    <node concept="a7P8L" id="5o9$c3zAtQf" role="3AunhB">
+                      <ref role="a7OzE" node="5o9$c3zAtPO" resolve="S" />
+                    </node>
+                    <node concept="a7P8L" id="5o9$c3zAtQg" role="3AunhB">
+                      <ref role="a7OzE" node="5o9$c3zAtPQ" resolve="TBound" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="5o9$c3zAtQh" role="3I6sU7">
+                  <node concept="3A8Hvi" id="5o9$c3zAtQi" role="3I6s78">
+                    <node concept="a7P8L" id="5o9$c3zAtQj" role="3A8wtg">
+                      <ref role="a7OzE" node="5o9$c3zAtPO" resolve="S" />
+                    </node>
+                    <node concept="a7P8L" id="5o9$c3zAtQk" role="3A8w4Q">
+                      <ref role="a7OzE" node="5o9$c3zAtPP" resolve="T" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1X3_iC" id="5o9$c3zwp8G" role="lGtFl">
+      <property role="3V$3am" value="template" />
+      <property role="3V$3ak" value="c4803b19-6d89-4a3b-bf82-390769514add/8335224865066015764/3575255234175157601" />
+      <node concept="1nLNMY" id="5o9$c3zwkZ9" role="8Wnug">
+        <property role="TrG5h" value="converts_free_and_ground" />
+        <node concept="3clFbS" id="5o9$c3zwkZa" role="1nLNMH">
+          <node concept="3SKdUt" id="5o9$c3zK7hp" role="3cqZAp">
+            <node concept="1PaTwC" id="5o9$c3zK7hq" role="3ndbpf">
+              <node concept="3oM_SD" id="5o9$c3zK7hs" role="1PaTwD">
+                <property role="3oM_SC" value="fixme:" />
+              </node>
+              <node concept="3oM_SD" id="5o9$c3zK7ms" role="1PaTwD">
+                <property role="3oM_SC" value="hasBound" />
+              </node>
+              <node concept="3oM_SD" id="5o9$c3zK7qi" role="1PaTwD">
+                <property role="3oM_SC" value="must" />
+              </node>
+              <node concept="3oM_SD" id="5o9$c3zK7qm" role="1PaTwD">
+                <property role="3oM_SC" value="be" />
+              </node>
+              <node concept="3oM_SD" id="5o9$c3zK7qr" role="1PaTwD">
+                <property role="3oM_SC" value="reactivated" />
+              </node>
+            </node>
+          </node>
+          <node concept="3SKdUt" id="3R6X$QWb7uN" role="3cqZAp">
+            <node concept="1PaTwC" id="3R6X$QWb7uO" role="3ndbpf">
+              <node concept="3oM_SD" id="3R6X$QWb7uQ" role="1PaTwD">
+                <property role="3oM_SC" value="if" />
+              </node>
+              <node concept="3oM_SD" id="3R6X$QWb7zb" role="1PaTwD">
+                <property role="3oM_SC" value="free" />
+              </node>
+              <node concept="3oM_SD" id="3R6X$QWxx$o" role="1PaTwD">
+                <property role="3oM_SC" value="var" />
+              </node>
+              <node concept="3oM_SD" id="3R6X$QWb7ze" role="1PaTwD">
+                <property role="3oM_SC" value="has" />
+              </node>
+              <node concept="3oM_SD" id="3R6X$QWb7ES" role="1PaTwD">
+                <property role="3oM_SC" value="a" />
+              </node>
+              <node concept="3oM_SD" id="3R6X$QWb7EX" role="1PaTwD">
+                <property role="3oM_SC" value="bound" />
+              </node>
+              <node concept="3oM_SD" id="3R6X$QWb824" role="1PaTwD">
+                <property role="3oM_SC" value="then" />
+              </node>
+              <node concept="3oM_SD" id="3R6X$QWb860" role="1PaTwD">
+                <property role="3oM_SC" value="it" />
+              </node>
+              <node concept="3oM_SD" id="3R6X$QWb86a" role="1PaTwD">
+                <property role="3oM_SC" value="will" />
+              </node>
+              <node concept="3oM_SD" id="3R6X$QWb8a8" role="1PaTwD">
+                <property role="3oM_SC" value="be" />
+              </node>
+              <node concept="3oM_SD" id="3R6X$QWb8ak" role="1PaTwD">
+                <property role="3oM_SC" value="checked" />
+              </node>
+              <node concept="3oM_SD" id="3R6X$QWb8ek" role="1PaTwD">
+                <property role="3oM_SC" value="through" />
+              </node>
+              <node concept="3oM_SD" id="3R6X$QWb8ey" role="1PaTwD">
+                <property role="3oM_SC" value="reactivation" />
+              </node>
+              <node concept="3oM_SD" id="3R6X$QWb8i$" role="1PaTwD">
+                <property role="3oM_SC" value="of" />
+              </node>
+              <node concept="3oM_SD" id="3R6X$QWxxK2" role="1PaTwD">
+                <property role="3oM_SC" value="hasBound()" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="3R6X$QWxxnN" role="3cqZAp" />
+          <node concept="1nLNNL" id="5o9$c3zwkZb" role="3cqZAp">
+            <node concept="1nLNMm" id="5o9$c3zwkZc" role="1nLNNK">
+              <node concept="0eUR_" id="5o9$c3zwkZd" role="0UC6o">
+                <node concept="3NuqgR" id="5o9$c3zwkZe" role="0eVf_">
+                  <node concept="aZer4" id="5o9$c3zwkZf" role="3XD1gS">
+                    <property role="TrG5h" value="S" />
+                  </node>
+                  <node concept="aZer4" id="5o9$c3zwkZg" role="3XD1gS">
+                    <property role="TrG5h" value="T" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3Aq93q" id="5o9$c3zwkZh" role="1nLNMb">
+                <property role="3ArMco" value="false" />
+                <node concept="3I6sU6" id="5o9$c3zwkZi" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="5o9$c3zwkZj" role="3I6sU7">
+                    <node concept="3Aqt3T" id="5o9$c3zwkZk" role="3I6s78">
+                      <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
+                      <node concept="a7P8L" id="5o9$c3zwkZl" role="3AunhB">
+                        <ref role="a7OzE" node="5o9$c3zwkZf" resolve="S" />
+                      </node>
+                      <node concept="a7P8L" id="5o9$c3zwkZm" role="3AunhB">
+                        <ref role="a7OzE" node="5o9$c3zwkZg" resolve="T" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3Aq9_M" id="5o9$c3zwkZn" role="1nLNMa">
+                <node concept="3I6sU6" id="5o9$c3zwkZo" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="5o9$c3zwkZp" role="3I6sU7">
+                    <node concept="2aLmEc" id="5o9$c3zwkZq" role="3I6s78">
+                      <node concept="a7P8L" id="5o9$c3zwkZr" role="2aLmnP">
+                        <ref role="a7OzE" node="5o9$c3zwkZf" resolve="S" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="5o9$c3zwkZs" role="3I6sU7">
+                    <node concept="2aM9Np" id="5o9$c3zwkZt" role="3I6s78">
+                      <node concept="a7P8L" id="5o9$c3zwkZu" role="2aLmnP">
+                        <ref role="a7OzE" node="5o9$c3zwkZg" resolve="T" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3Aq9E8" id="5o9$c3zwkZv" role="1nLNMd">
+                <node concept="3I6sU6" id="5o9$c3zwkZw" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="5o9$c3zwkZx" role="3I6sU7">
+                    <node concept="3A8Hvi" id="5o9$c3zwkZy" role="3I6s78">
+                      <node concept="a7P8L" id="5o9$c3zwkZz" role="3A8wtg">
+                        <ref role="a7OzE" node="5o9$c3zwkZf" resolve="S" />
+                      </node>
+                      <node concept="a7P8L" id="5upUcEtp6y2" role="3A8w4Q">
+                        <ref role="a7OzE" node="5o9$c3zwkZg" resolve="T" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="5o9$c3zwkZ$" role="3cqZAp" />
+          <node concept="1nLNNL" id="5o9$c3zwkZ_" role="3cqZAp">
+            <node concept="1nLNMm" id="5o9$c3zwkZA" role="1nLNNK">
+              <node concept="0eUR_" id="5o9$c3zwkZB" role="0UC6o">
+                <node concept="3NuqgR" id="5o9$c3zwkZC" role="0eVf_">
+                  <node concept="aZer4" id="5o9$c3zwkZD" role="3XD1gS">
+                    <property role="TrG5h" value="S" />
+                  </node>
+                  <node concept="aZer4" id="5o9$c3zwkZE" role="3XD1gS">
+                    <property role="TrG5h" value="T" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3Aq93q" id="5o9$c3zwkZF" role="1nLNMb">
+                <property role="3ArMco" value="false" />
+                <node concept="3I6sU6" id="5o9$c3zwkZG" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="5o9$c3zwkZH" role="3I6sU7">
+                    <node concept="3Aqt3T" id="5o9$c3zwkZI" role="3I6s78">
+                      <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
+                      <node concept="a7P8L" id="5o9$c3zwkZJ" role="3AunhB">
+                        <ref role="a7OzE" node="5o9$c3zwkZD" resolve="S" />
+                      </node>
+                      <node concept="a7P8L" id="5o9$c3zwkZK" role="3AunhB">
+                        <ref role="a7OzE" node="5o9$c3zwkZE" resolve="T" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3Aq9_M" id="5o9$c3zwkZL" role="1nLNMa">
+                <node concept="3I6sU6" id="5o9$c3zwkZM" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="5o9$c3zwkZN" role="3I6sU7">
+                    <node concept="2aLmEc" id="5o9$c3zwkZO" role="3I6s78">
+                      <node concept="a7P8L" id="5o9$c3zwkZP" role="2aLmnP">
+                        <ref role="a7OzE" node="5o9$c3zwkZE" resolve="T" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="5o9$c3zwkZQ" role="3I6sU7">
+                    <node concept="2aM9Np" id="5o9$c3zwkZR" role="3I6s78">
+                      <node concept="a7P8L" id="5o9$c3zwkZS" role="2aLmnP">
+                        <ref role="a7OzE" node="5o9$c3zwkZD" resolve="S" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3Aq9E8" id="5o9$c3zwkZT" role="1nLNMd">
+                <node concept="3I6sU6" id="5o9$c3zwkZU" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="5o9$c3zwkZV" role="3I6sU7">
+                    <node concept="3A8Hvi" id="5o9$c3zwkZW" role="3I6s78">
+                      <node concept="a7P8L" id="5o9$c3zwkZX" role="3A8wtg">
+                        <ref role="a7OzE" node="5o9$c3zwkZD" resolve="S" />
+                      </node>
+                      <node concept="a7P8L" id="5o9$c3zwkZY" role="3A8w4Q">
+                        <ref role="a7OzE" node="5o9$c3zwkZE" resolve="T" />
+                      </node>
                     </node>
                   </node>
                 </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps
index 25869172..f7bce8d4 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps
@@ -3762,9 +3762,9 @@
                     <node concept="liA8E" id="5o9$c3zrsTD" role="2OqNvi">
                       <ref role="37wK5l" node="1TH_SRmEWFV" resolve="h" />
                     </node>
-                  </node>
-                  <node concept="1U20sH" id="5o9$c3zrxIc" role="lGtFl">
-                    <property role="1U20sK" value="error" />
+                    <node concept="1U20sH" id="5o9$c3zysat" role="lGtFl">
+                      <property role="1U20sK" value="error" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -3789,9 +3789,9 @@
                     <node concept="liA8E" id="5o9$c3zrjCj" role="2OqNvi">
                       <ref role="37wK5l" node="1TH_SRmEWFV" resolve="h" />
                     </node>
-                  </node>
-                  <node concept="1U20sH" id="5o9$c3zry8d" role="lGtFl">
-                    <property role="1U20sK" value="error" />
+                    <node concept="1U20sH" id="5o9$c3zyu2J" role="lGtFl">
+                      <property role="1U20sK" value="error" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -3813,28 +3813,6 @@
         <property role="DiZV1" value="false" />
         <node concept="3cqZAl" id="5o9$c3zrWfP" role="3clF45" />
         <node concept="3clFbS" id="5o9$c3zrWfQ" role="3clF47">
-          <node concept="3SKdUt" id="1TH_SRmMpkF" role="3cqZAp">
-            <node concept="1PaTwC" id="1TH_SRmMpkG" role="3ndbpf">
-              <node concept="3oM_SD" id="1TH_SRmMpkI" role="1PaTwD">
-                <property role="3oM_SC" value="FIXME" />
-              </node>
-              <node concept="3oM_SD" id="1TH_SRmMqrF" role="1PaTwD">
-                <property role="3oM_SC" value="the" />
-              </node>
-              <node concept="3oM_SD" id="1TH_SRmMqKK" role="1PaTwD">
-                <property role="3oM_SC" value="following" />
-              </node>
-              <node concept="3oM_SD" id="1TH_SRmMrdP" role="1PaTwD">
-                <property role="3oM_SC" value="line" />
-              </node>
-              <node concept="3oM_SD" id="1TH_SRmMrDL" role="1PaTwD">
-                <property role="3oM_SC" value="must" />
-              </node>
-              <node concept="3oM_SD" id="1TH_SRmMsBk" role="1PaTwD">
-                <property role="3oM_SC" value="typecheck" />
-              </node>
-            </node>
-          </node>
           <node concept="3cpWs8" id="5o9$c3zrWfR" role="3cqZAp">
             <node concept="3cpWsn" id="5o9$c3zrWfS" role="3cpWs9">
               <property role="TrG5h" value="a0" />