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 d9af8e00..def2243f 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
@@ -342,10 +342,27 @@
       <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
         <child id="1196350785114" name="quotedNode" index="2c44tc" />
       </concept>
+      <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
+        <reference id="5455284157994012188" name="link" index="2pIpSl" />
+        <child id="1595412875168045827" name="initValue" index="28nt2d" />
+      </concept>
+      <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
+        <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
+      </concept>
+      <concept id="5455284157993863840" name="jetbrains.mps.lang.quotation.structure.NodeBuilderNode" flags="nn" index="2pJPED">
+        <reference id="5455284157993910961" name="concept" index="2pJxaS" />
+        <child id="5455284157993911099" name="values" index="2pJxcM" />
+      </concept>
       <concept id="4056363777117001481" name="jetbrains.mps.lang.quotation.structure.StringToTypedValueMigrationInfo" flags="ng" index="AAgTk">
         <property id="2173356959483005420" name="stringValueMigrated" index="3qcH_f" />
       </concept>
       <concept id="1196866233735" name="jetbrains.mps.lang.quotation.structure.PropertyAntiquotation" flags="ng" index="2EMmih" />
+      <concept id="8182547171709752110" name="jetbrains.mps.lang.quotation.structure.NodeBuilderExpression" flags="nn" index="36biLy">
+        <child id="8182547171709752112" name="expression" index="36biLW" />
+      </concept>
+      <concept id="8182547171709614739" name="jetbrains.mps.lang.quotation.structure.NodeBuilderRef" flags="nn" index="36bGnv">
+        <reference id="8182547171709614741" name="target" index="36bGnp" />
+      </concept>
     </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
       <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
@@ -3004,10 +3021,10 @@
                 <node concept="1bVj0M" id="6_5E9TNz4Wt" role="37wK5m">
                   <node concept="3clFbS" id="6_5E9TNz4Wu" role="1bW5cS">
                     <node concept="3clFbF" id="6_5E9TNz4Wv" role="3cqZAp">
-                      <node concept="2YIFZM" id="dabFeLCMdb" role="3clFbG">
+                      <node concept="2YIFZM" id="1GAclsBz$gu" role="3clFbG">
                         <ref role="37wK5l" node="21fnip9BiFE" resolve="getResolver" />
                         <ref role="1Pybhc" node="tIwzd2cJHD" resolve="SubclassingUtil" />
-                        <node concept="3A2sRY" id="dabFeLCP6P" role="37wK5m">
+                        <node concept="3A2sRY" id="1GAclsBz$gv" role="37wK5m">
                           <ref role="3A2yKK" node="6_5E9TNz50W" resolve="cls" />
                         </node>
                       </node>
@@ -8940,45 +8957,96 @@
     <node concept="2tJIrI" id="29sKO70xG9h" role="jymVt" />
     <node concept="312cEu" id="29sKO70xIRu" role="jymVt">
       <property role="TrG5h" value="SupertypesResolver" />
-      <node concept="2tJIrI" id="29sKO70xNrV" role="jymVt" />
-      <node concept="3clFbW" id="29sKO70xJDa" role="jymVt">
-        <node concept="3cqZAl" id="29sKO70xJDb" role="3clF45" />
-        <node concept="3clFbS" id="29sKO70xJDd" role="3clF47">
-          <node concept="3clFbF" id="29sKO70xKjZ" role="3cqZAp">
-            <node concept="37vLTI" id="29sKO70xKV0" role="3clFbG">
-              <node concept="37vLTw" id="29sKO70xKZm" role="37vLTx">
-                <ref role="3cqZAo" node="29sKO70xJL3" resolve="rootCls" />
+      <node concept="2tJIrI" id="3XUOzowMJVo" role="jymVt" />
+      <node concept="3clFbW" id="3XUOzowME62" role="jymVt">
+        <node concept="3cqZAl" id="3XUOzowME63" role="3clF45" />
+        <node concept="3clFbS" id="3XUOzowME64" role="3clF47">
+          <node concept="3clFbF" id="3XUOzowME65" role="3cqZAp">
+            <node concept="37vLTI" id="3XUOzowME66" role="3clFbG">
+              <node concept="37vLTw" id="3XUOzowME67" role="37vLTx">
+                <ref role="3cqZAo" node="3XUOzowME6o" resolve="rootCls" />
               </node>
-              <node concept="2OqwBi" id="29sKO70xKpz" role="37vLTJ">
-                <node concept="Xjq3P" id="29sKO70xKjY" role="2Oq$k0" />
-                <node concept="2OwXpG" id="29sKO70xKvc" role="2OqNvi">
+              <node concept="2OqwBi" id="3XUOzowME68" role="37vLTJ">
+                <node concept="Xjq3P" id="3XUOzowME69" role="2Oq$k0" />
+                <node concept="2OwXpG" id="3XUOzowME6a" role="2OqNvi">
                   <ref role="2Oxat5" node="29sKO70xKaP" resolve="rootCls" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="29sKO70zGEj" role="3cqZAp">
-            <node concept="37vLTI" id="29sKO70zHWb" role="3clFbG">
-              <node concept="1rXfSq" id="29sKO70zIic" role="37vLTx">
-                <ref role="37wK5l" node="29sKO70yqj0" resolve="instAllSubtypePaths" />
-              </node>
-              <node concept="2OqwBi" id="29sKO70zGOh" role="37vLTJ">
-                <node concept="Xjq3P" id="29sKO70zGEh" role="2Oq$k0" />
-                <node concept="2OwXpG" id="29sKO70zGY_" role="2OqNvi">
-                  <ref role="2Oxat5" node="29sKO70zF6Z" resolve="subtypePaths" />
+          <node concept="3clFbF" id="3XUOzowNTF9" role="3cqZAp">
+            <node concept="37vLTI" id="3XUOzowNTFa" role="3clFbG">
+              <node concept="3clFbT" id="3XUOzowNTFb" role="37vLTx" />
+              <node concept="2OqwBi" id="3XUOzowNTFc" role="37vLTJ">
+                <node concept="Xjq3P" id="3XUOzowNTFd" role="2Oq$k0" />
+                <node concept="2OwXpG" id="3XUOzowNTFe" role="2OqNvi">
+                  <ref role="2Oxat5" node="3XUOzowA6d$" resolve="ignoreErasedTypes" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3Tm1VV" id="29sKO70xJup" role="1B3o_S" />
-        <node concept="37vLTG" id="29sKO70xJL3" role="3clF46">
+        <node concept="3Tm6S6" id="3XUOzowNjHP" role="1B3o_S" />
+        <node concept="37vLTG" id="3XUOzowME6o" role="3clF46">
           <property role="TrG5h" value="rootCls" />
-          <node concept="3Tqbb2" id="29sKO70xJL2" role="1tU5fm">
+          <node concept="3Tqbb2" id="3XUOzowME6p" role="1tU5fm">
             <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="3XUOzowNJ4C" role="jymVt" />
+      <node concept="3clFb_" id="3XUOzowNOMT" role="jymVt">
+        <property role="TrG5h" value="withRaw" />
+        <node concept="3clFbS" id="3XUOzowNOMW" role="3clF47">
+          <node concept="3clFbF" id="3XUOzowME6b" role="3cqZAp">
+            <node concept="37vLTI" id="3XUOzowME6c" role="3clFbG">
+              <node concept="3clFbT" id="3XUOzowNSPq" role="37vLTx">
+                <property role="3clFbU" value="true" />
+              </node>
+              <node concept="2OqwBi" id="3XUOzowME6e" role="37vLTJ">
+                <node concept="Xjq3P" id="3XUOzowME6f" role="2Oq$k0" />
+                <node concept="2OwXpG" id="3XUOzowME6g" role="2OqNvi">
+                  <ref role="2Oxat5" node="3XUOzowA6d$" resolve="ignoreErasedTypes" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="3XUOzowNVzE" role="3cqZAp">
+            <node concept="Xjq3P" id="3XUOzowNVzC" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="3Tm6S6" id="3XUOzowNLRf" role="1B3o_S" />
+        <node concept="3uibUv" id="3XUOzowNNSP" role="3clF45">
+          <ref role="3uigEE" node="29sKO70xIRu" resolve="SubclassingUtil.SupertypesResolver" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3XUOzowNpGD" role="jymVt" />
+      <node concept="3clFb_" id="3XUOzowNww8" role="jymVt">
+        <property role="TrG5h" value="resolveAll" />
+        <node concept="3clFbS" id="3XUOzowNwwb" role="3clF47">
+          <node concept="3clFbF" id="3XUOzowME6h" role="3cqZAp">
+            <node concept="37vLTI" id="3XUOzowME6i" role="3clFbG">
+              <node concept="1rXfSq" id="3XUOzowME6j" role="37vLTx">
+                <ref role="37wK5l" node="29sKO70yqj0" resolve="instAllSubtypePaths" />
+              </node>
+              <node concept="2OqwBi" id="3XUOzowME6k" role="37vLTJ">
+                <node concept="Xjq3P" id="3XUOzowME6l" role="2Oq$k0" />
+                <node concept="2OwXpG" id="3XUOzowME6m" role="2OqNvi">
+                  <ref role="2Oxat5" node="29sKO70zF6Z" resolve="subtypePaths" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="3XUOzowNEdg" role="3cqZAp">
+            <node concept="Xjq3P" id="3XUOzowNEde" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="3Tm6S6" id="3XUOzowNu7$" role="1B3o_S" />
+        <node concept="3uibUv" id="3XUOzowNBNY" role="3clF45">
+          <ref role="3uigEE" node="29sKO70xIRu" resolve="SubclassingUtil.SupertypesResolver" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3XUOzowNpP1" role="jymVt" />
       <node concept="2tJIrI" id="29sKO70xPgc" role="jymVt" />
       <node concept="3clFb_" id="29sKO70xP$G" role="jymVt">
         <property role="TrG5h" value="withResolvedTypeVars" />
@@ -9025,7 +9093,7 @@
             <node concept="1rXfSq" id="dabFeLR7lG" role="3clFbG">
               <ref role="37wK5l" node="dabFeLR2sX" resolve="substitute" />
               <node concept="1rXfSq" id="dabFeLR7z3" role="37wK5m">
-                <ref role="37wK5l" node="3jyhf9JqOgi" resolve="getTypeVarSubstMap" />
+                <ref role="37wK5l" node="3XUOzowC97v" resolve="getTypeVarSubstMap" />
                 <node concept="3EllGN" id="dabFeLR8k_" role="37wK5m">
                   <node concept="37vLTw" id="dabFeLR8vQ" role="3ElVtu">
                     <ref role="3cqZAo" node="dabFeLQXVB" resolve="typeVarsScope" />
@@ -9081,6 +9149,87 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="1GAclsBCcWN" role="jymVt" />
+      <node concept="3clFb_" id="1GAclsBC8Q7" role="jymVt">
+        <property role="TrG5h" value="withResolvedTypeVars" />
+        <node concept="37vLTG" id="1GAclsBC8Q8" role="3clF46">
+          <property role="TrG5h" value="typeVarsScope" />
+          <node concept="3Tqbb2" id="1GAclsBC8Q9" role="1tU5fm">
+            <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="1GAclsBC8Qa" role="3clF46">
+          <property role="TrG5h" value="types" />
+          <node concept="A3Dl8" id="1GAclsBCfWY" role="1tU5fm">
+            <node concept="3Tqbb2" id="1GAclsBCfWZ" role="A3Ik2">
+              <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbS" id="1GAclsBC8Qc" role="3clF47">
+          <node concept="3cpWs8" id="1GAclsBCksE" role="3cqZAp">
+            <node concept="3cpWsn" id="1GAclsBCksK" role="3cpWs9">
+              <property role="TrG5h" value="subs" />
+              <node concept="3rvAFt" id="1GAclsBCksM" role="1tU5fm">
+                <node concept="3Tqbb2" id="1GAclsBCowt" role="3rvQeY">
+                  <ref role="ehGHo" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
+                </node>
+                <node concept="3Tqbb2" id="1GAclsBCpS7" role="3rvSg0">
+                  <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+                </node>
+              </node>
+              <node concept="1rXfSq" id="1GAclsBC8Qf" role="33vP2m">
+                <ref role="37wK5l" node="3XUOzowC97v" resolve="getTypeVarSubstMap" />
+                <node concept="3EllGN" id="1GAclsBC8Qg" role="37wK5m">
+                  <node concept="37vLTw" id="1GAclsBC8Qh" role="3ElVtu">
+                    <ref role="3cqZAo" node="1GAclsBC8Q8" resolve="typeVarsScope" />
+                  </node>
+                  <node concept="37vLTw" id="1GAclsBC8Qi" role="3ElQJh">
+                    <ref role="3cqZAo" node="29sKO70xNBh" resolve="instantiated" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs6" id="1GAclsBCrVF" role="3cqZAp">
+            <node concept="2OqwBi" id="1GAclsBCvlz" role="3cqZAk">
+              <node concept="37vLTw" id="1GAclsBCuo9" role="2Oq$k0">
+                <ref role="3cqZAo" node="1GAclsBC8Qa" resolve="types" />
+              </node>
+              <node concept="3$u5V9" id="1GAclsBCxjC" role="2OqNvi">
+                <node concept="1bVj0M" id="1GAclsBCxjE" role="23t8la">
+                  <node concept="3clFbS" id="1GAclsBCxjF" role="1bW5cS">
+                    <node concept="3clFbF" id="1GAclsBCBKs" role="3cqZAp">
+                      <node concept="1rXfSq" id="1GAclsBC8Qe" role="3clFbG">
+                        <ref role="37wK5l" node="dabFeLR2sX" resolve="substitute" />
+                        <node concept="37vLTw" id="1GAclsBCNBB" role="37wK5m">
+                          <ref role="3cqZAo" node="1GAclsBCksK" resolve="subs" />
+                        </node>
+                        <node concept="2OqwBi" id="1GAclsBC8Qj" role="37wK5m">
+                          <node concept="37vLTw" id="1GAclsBCILI" role="2Oq$k0">
+                            <ref role="3cqZAo" node="1GAclsBCxjG" resolve="type" />
+                          </node>
+                          <node concept="1$rogu" id="1GAclsBC8Ql" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="1GAclsBCxjG" role="1bW2Oz">
+                    <property role="TrG5h" value="type" />
+                    <node concept="2jxLKc" id="1GAclsBCxjH" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="1GAclsBC8Qm" role="1B3o_S" />
+        <node concept="A3Dl8" id="1GAclsBC_1f" role="3clF45">
+          <node concept="3Tqbb2" id="1GAclsBC_1g" role="A3Ik2">
+            <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+          </node>
+        </node>
+      </node>
       <node concept="2tJIrI" id="29sKO70zLk0" role="jymVt" />
       <node concept="3clFb_" id="29sKO70zPFy" role="jymVt">
         <property role="TrG5h" value="getAllSubtypePaths" />
@@ -9316,7 +9465,7 @@
                 </node>
               </node>
               <node concept="1rXfSq" id="29sKO70ykl_" role="33vP2m">
-                <ref role="37wK5l" node="3jyhf9JqOgi" resolve="getTypeVarSubstMap" />
+                <ref role="37wK5l" node="3XUOzowC97v" resolve="getTypeVarSubstMap" />
                 <node concept="37vLTw" id="29sKO70yklA" role="37wK5m">
                   <ref role="3cqZAo" node="29sKO70ykkF" resolve="root" />
                 </node>
@@ -9399,25 +9548,64 @@
                 </node>
                 <node concept="9aQIb" id="29sKO70zaw7" role="9aQIa">
                   <node concept="3clFbS" id="29sKO70zaw8" role="9aQI4">
-                    <node concept="3clFbF" id="29sKO70zbFk" role="3cqZAp">
-                      <node concept="37vLTI" id="29sKO70zbVz" role="3clFbG">
-                        <node concept="37vLTw" id="29sKO70zbFi" role="37vLTJ">
-                          <ref role="3cqZAo" node="29sKO70yklK" resolve="tcopy" />
-                        </node>
-                        <node concept="1PxgMI" id="6UxFjlrV_A1" role="37vLTx">
-                          <node concept="chp4Y" id="6UxFjlrV_Tq" role="3oSUPX">
-                            <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
-                          </node>
-                          <node concept="1rXfSq" id="6UxFjlrV$uM" role="1m5AlR">
-                            <ref role="37wK5l" node="dabFeLR2sX" resolve="substitute" />
-                            <node concept="37vLTw" id="6UxFjlrV$Lt" role="37wK5m">
-                              <ref role="3cqZAo" node="29sKO70yklx" resolve="subs" />
-                            </node>
-                            <node concept="2OqwBi" id="29sKO70zccn" role="37wK5m">
-                              <node concept="2GrUjf" id="29sKO70zbZA" role="2Oq$k0">
-                                <ref role="2Gs0qQ" node="29sKO70yklD" resolve="directSuper" />
+                    <node concept="3clFbJ" id="3XUOzowIO9Q" role="3cqZAp">
+                      <node concept="3clFbS" id="3XUOzowIO9S" role="3clFbx">
+                        <node concept="3clFbF" id="3XUOzowIS26" role="3cqZAp">
+                          <node concept="37vLTI" id="3XUOzowISyA" role="3clFbG">
+                            <node concept="1rXfSq" id="3XUOzowISWK" role="37vLTx">
+                              <ref role="37wK5l" node="3XUOzowHKCd" resolve="eraseClsType" />
+                              <node concept="2OqwBi" id="7l$juG4ENT6" role="37wK5m">
+                                <node concept="2GrUjf" id="3XUOzowITFm" role="2Oq$k0">
+                                  <ref role="2Gs0qQ" node="29sKO70yklD" resolve="directSuper" />
+                                </node>
+                                <node concept="3TrEf2" id="7l$juG4EOvX" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="3XUOzowIS24" role="37vLTJ">
+                              <ref role="3cqZAo" node="29sKO70yklK" resolve="tcopy" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="1Wc70l" id="3XUOzowIQ6G" role="3clFbw">
+                        <node concept="1rXfSq" id="3XUOzowIQUZ" role="3uHU7w">
+                          <ref role="37wK5l" node="3XUOzowC0ny" resolve="isErased" />
+                          <node concept="2GrUjf" id="3XUOzowIRDB" role="37wK5m">
+                            <ref role="2Gs0qQ" node="29sKO70yklD" resolve="directSuper" />
+                          </node>
+                        </node>
+                        <node concept="3fqX7Q" id="3XUOzowIOHl" role="3uHU7B">
+                          <node concept="37vLTw" id="3XUOzowIP87" role="3fr31v">
+                            <ref role="3cqZAo" node="3XUOzowA6d$" resolve="ignoreErasedTypes" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="9aQIb" id="3XUOzowIUn9" role="9aQIa">
+                        <node concept="3clFbS" id="3XUOzowIUna" role="9aQI4">
+                          <node concept="3clFbF" id="29sKO70zbFk" role="3cqZAp">
+                            <node concept="37vLTI" id="29sKO70zbVz" role="3clFbG">
+                              <node concept="37vLTw" id="29sKO70zbFi" role="37vLTJ">
+                                <ref role="3cqZAo" node="29sKO70yklK" resolve="tcopy" />
+                              </node>
+                              <node concept="1PxgMI" id="6UxFjlrV_A1" role="37vLTx">
+                                <node concept="chp4Y" id="6UxFjlrV_Tq" role="3oSUPX">
+                                  <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
+                                </node>
+                                <node concept="1rXfSq" id="6UxFjlrV$uM" role="1m5AlR">
+                                  <ref role="37wK5l" node="dabFeLR2sX" resolve="substitute" />
+                                  <node concept="37vLTw" id="6UxFjlrV$Lt" role="37wK5m">
+                                    <ref role="3cqZAo" node="29sKO70yklx" resolve="subs" />
+                                  </node>
+                                  <node concept="2OqwBi" id="29sKO70zccn" role="37wK5m">
+                                    <node concept="2GrUjf" id="29sKO70zbZA" role="2Oq$k0">
+                                      <ref role="2Gs0qQ" node="29sKO70yklD" resolve="directSuper" />
+                                    </node>
+                                    <node concept="1$rogu" id="29sKO70zcIM" role="2OqNvi" />
+                                  </node>
+                                </node>
                               </node>
-                              <node concept="1$rogu" id="29sKO70zcIM" role="2OqNvi" />
                             </node>
                           </node>
                         </node>
@@ -9481,7 +9669,7 @@
               <node concept="3clFbF" id="29sKO70ykm$" role="3cqZAp">
                 <node concept="37vLTI" id="29sKO70ykm_" role="3clFbG">
                   <node concept="1rXfSq" id="29sKO70ykmA" role="37vLTx">
-                    <ref role="37wK5l" node="3jyhf9JqOgi" resolve="getTypeVarSubstMap" />
+                    <ref role="37wK5l" node="3XUOzowC97v" resolve="getTypeVarSubstMap" />
                     <node concept="37vLTw" id="29sKO70ykmB" role="37wK5m">
                       <ref role="3cqZAo" node="29sKO70yklK" resolve="tcopy" />
                     </node>
@@ -9520,7 +9708,7 @@
         </node>
         <node concept="3Tm6S6" id="29sKO70ykmF" role="1B3o_S" />
       </node>
-      <node concept="2tJIrI" id="dabFeLR0n4" role="jymVt" />
+      <node concept="2tJIrI" id="3XUOzowAc44" role="jymVt" />
       <node concept="2YIFZL" id="dabFeLR2sX" role="jymVt">
         <property role="TrG5h" value="substitute" />
         <node concept="37vLTG" id="dabFeLR42X" role="3clF46">
@@ -9747,105 +9935,349 @@
         </node>
       </node>
       <node concept="2tJIrI" id="29sKO70zydx" role="jymVt" />
-      <node concept="2YIFZL" id="3jyhf9JqOgi" role="jymVt">
+      <node concept="3clFb_" id="3XUOzowC97v" role="jymVt">
         <property role="TrG5h" value="getTypeVarSubstMap" />
-        <node concept="37vLTG" id="3jyhf9JqOLr" role="3clF46">
-          <property role="TrG5h" value="clsType" />
-          <node concept="3Tqbb2" id="3jyhf9JqOR$" role="1tU5fm">
-            <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="3jyhf9JqOgl" role="3clF47">
-          <node concept="3clFbH" id="4Ca87cuYCIM" role="3cqZAp" />
-          <node concept="3cpWs8" id="3jyhf9JqQmr" role="3cqZAp">
-            <node concept="3cpWsn" id="3jyhf9JqQms" role="3cpWs9">
+        <node concept="3clFbS" id="3XUOzowC97z" role="3clF47">
+          <node concept="3clFbH" id="3XUOzowC97$" role="3cqZAp" />
+          <node concept="3cpWs8" id="3XUOzowC97_" role="3cqZAp">
+            <node concept="3cpWsn" id="3XUOzowC97A" role="3cpWs9">
               <property role="TrG5h" value="subs" />
-              <node concept="3rvAFt" id="3jyhf9JqQmt" role="1tU5fm">
-                <node concept="3Tqbb2" id="3ca5Bh2ZDOc" role="3rvQeY">
+              <node concept="3rvAFt" id="3XUOzowC97B" role="1tU5fm">
+                <node concept="3Tqbb2" id="3XUOzowC97C" role="3rvQeY">
                   <ref role="ehGHo" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
                 </node>
-                <node concept="3Tqbb2" id="3jyhf9JqQmv" role="3rvSg0">
+                <node concept="3Tqbb2" id="3XUOzowC97D" role="3rvSg0">
                   <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
                 </node>
               </node>
-              <node concept="2ShNRf" id="3jyhf9JqQmw" role="33vP2m">
-                <node concept="3rGOSV" id="3jyhf9JqQmx" role="2ShVmc">
-                  <node concept="3Tqbb2" id="3ca5Bh2ZE6d" role="3rHrn6">
+              <node concept="2ShNRf" id="3XUOzowC97E" role="33vP2m">
+                <node concept="3rGOSV" id="3XUOzowC97F" role="2ShVmc">
+                  <node concept="3Tqbb2" id="3XUOzowC97G" role="3rHrn6">
                     <ref role="ehGHo" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
                   </node>
-                  <node concept="3Tqbb2" id="3jyhf9JqQmz" role="3rHtpV">
+                  <node concept="3Tqbb2" id="3XUOzowC97H" role="3rHtpV">
                     <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="1_o_46" id="3jyhf9JqQm$" role="3cqZAp">
-            <node concept="3clFbS" id="3jyhf9JqQm_" role="2LFqv$">
-              <node concept="3clFbF" id="3jyhf9JqQmA" role="3cqZAp">
-                <node concept="37vLTI" id="3jyhf9JqQmB" role="3clFbG">
-                  <node concept="3M$PaV" id="3jyhf9JqQmC" role="37vLTx">
-                    <ref role="3M$S_o" node="3jyhf9JqQmM" resolve="sub" />
+          <node concept="3clFbH" id="3XUOzowCcEs" role="3cqZAp" />
+          <node concept="3clFbJ" id="3XUOzowC97I" role="3cqZAp">
+            <node concept="3clFbS" id="3XUOzowC97J" role="3clFbx">
+              <node concept="2Gpval" id="3XUOzowCq6o" role="3cqZAp">
+                <node concept="3clFbS" id="3XUOzowCq6q" role="2LFqv$">
+                  <node concept="3clFbF" id="3XUOzowCq6r" role="3cqZAp">
+                    <node concept="37vLTI" id="3XUOzowCq6s" role="3clFbG">
+                      <node concept="3EllGN" id="3XUOzowCq6t" role="37vLTJ">
+                        <node concept="2GrUjf" id="3XUOzowCq6E" role="3ElVtu">
+                          <ref role="2Gs0qQ" node="3XUOzowCq6D" resolve="tvd" />
+                        </node>
+                        <node concept="37vLTw" id="3XUOzowCq6v" role="3ElQJh">
+                          <ref role="3cqZAo" node="3XUOzowC97A" resolve="subs" />
+                        </node>
+                      </node>
+                      <node concept="1rXfSq" id="3XUOzowCq6w" role="37vLTx">
+                        <ref role="37wK5l" node="3XUOzowC2Da" resolve="eraseTypeVar" />
+                        <node concept="2GrUjf" id="3XUOzowCq6F" role="37wK5m">
+                          <ref role="2Gs0qQ" node="3XUOzowCq6D" resolve="tvd" />
+                        </node>
+                      </node>
+                    </node>
                   </node>
-                  <node concept="3EllGN" id="3jyhf9JqQmD" role="37vLTJ">
-                    <node concept="3M$PaV" id="3jyhf9JqQmF" role="3ElVtu">
-                      <ref role="3M$S_o" node="3jyhf9JqQmO" resolve="tvd" />
+                </node>
+                <node concept="2OqwBi" id="3XUOzowCq6$" role="2GsD0m">
+                  <node concept="2OqwBi" id="3XUOzowCq6_" role="2Oq$k0">
+                    <node concept="37vLTw" id="3XUOzowCq6A" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3XUOzowC97x" resolve="clsType" />
                     </node>
-                    <node concept="37vLTw" id="3jyhf9JqQmH" role="3ElQJh">
-                      <ref role="3cqZAo" node="3jyhf9JqQms" resolve="subs" />
+                    <node concept="3TrEf2" id="3XUOzowCq6B" role="2OqNvi">
+                      <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
                     </node>
                   </node>
+                  <node concept="3Tsc0h" id="3XUOzowCq6C" role="2OqNvi">
+                    <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
+                  </node>
+                </node>
+                <node concept="2GrKxI" id="3XUOzowCq6D" role="2Gsz3X">
+                  <property role="TrG5h" value="tvd" />
+                </node>
+              </node>
+              <node concept="3clFbH" id="3XUOzowC97K" role="3cqZAp" />
+            </node>
+            <node concept="1Wc70l" id="3XUOzowC97L" role="3clFbw">
+              <node concept="1rXfSq" id="3XUOzowCbof" role="3uHU7w">
+                <ref role="37wK5l" node="3XUOzowC0ny" resolve="isErased" />
+                <node concept="37vLTw" id="3XUOzowCc4d" role="37wK5m">
+                  <ref role="3cqZAo" node="3XUOzowC97x" resolve="clsType" />
+                </node>
+              </node>
+              <node concept="3fqX7Q" id="3XUOzowC97N" role="3uHU7B">
+                <node concept="2OqwBi" id="3XUOzowC97O" role="3fr31v">
+                  <node concept="Xjq3P" id="3XUOzowC97P" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="3XUOzowC97Q" role="2OqNvi">
+                    <ref role="2Oxat5" node="3XUOzowA6d$" resolve="ignoreErasedTypes" />
+                  </node>
                 </node>
               </node>
             </node>
-            <node concept="1_o_bx" id="3jyhf9JqQmI" role="1_o_by">
-              <node concept="2OqwBi" id="3jyhf9JqQmJ" role="1_o_bz">
-                <node concept="37vLTw" id="3jyhf9JqQmK" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3jyhf9JqOLr" resolve="clsType" />
-                </node>
-                <node concept="3Tsc0h" id="3jyhf9JqQmL" role="2OqNvi">
-                  <ref role="3TtcxE" to="tpee:g91_B6F" resolve="parameter" />
-                </node>
-              </node>
-              <node concept="1_o_bG" id="3jyhf9JqQmM" role="1_o_aQ">
-                <property role="TrG5h" value="sub" />
-              </node>
-            </node>
-            <node concept="1_o_bx" id="3jyhf9JqQmN" role="1_o_by">
-              <node concept="1_o_bG" id="3jyhf9JqQmO" role="1_o_aQ">
-                <property role="TrG5h" value="tvd" />
-              </node>
-              <node concept="2OqwBi" id="3jyhf9JqQmP" role="1_o_bz">
-                <node concept="2OqwBi" id="3jyhf9JqQmQ" role="2Oq$k0">
-                  <node concept="37vLTw" id="3jyhf9JqQmR" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3jyhf9JqOLr" resolve="clsType" />
+            <node concept="9aQIb" id="3XUOzowCeP$" role="9aQIa">
+              <node concept="3clFbS" id="3XUOzowCeP_" role="9aQI4">
+                <node concept="1_o_46" id="3XUOzowC97R" role="3cqZAp">
+                  <node concept="3clFbS" id="3XUOzowC97S" role="2LFqv$">
+                    <node concept="3clFbF" id="3XUOzowC97T" role="3cqZAp">
+                      <node concept="37vLTI" id="3XUOzowC97U" role="3clFbG">
+                        <node concept="3M$PaV" id="3XUOzowC97V" role="37vLTx">
+                          <ref role="3M$S_o" node="3XUOzowC983" resolve="sub" />
+                        </node>
+                        <node concept="3EllGN" id="3XUOzowC97W" role="37vLTJ">
+                          <node concept="3M$PaV" id="3XUOzowC97X" role="3ElVtu">
+                            <ref role="3M$S_o" node="3XUOzowC985" resolve="tvd" />
+                          </node>
+                          <node concept="37vLTw" id="3XUOzowC97Y" role="3ElQJh">
+                            <ref role="3cqZAo" node="3XUOzowC97A" resolve="subs" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
-                  <node concept="3TrEf2" id="3jyhf9JqQmS" role="2OqNvi">
-                    <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+                  <node concept="1_o_bx" id="3XUOzowC97Z" role="1_o_by">
+                    <node concept="2OqwBi" id="3XUOzowC980" role="1_o_bz">
+                      <node concept="37vLTw" id="3XUOzowC981" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3XUOzowC97x" resolve="clsType" />
+                      </node>
+                      <node concept="3Tsc0h" id="3XUOzowC982" role="2OqNvi">
+                        <ref role="3TtcxE" to="tpee:g91_B6F" resolve="parameter" />
+                      </node>
+                    </node>
+                    <node concept="1_o_bG" id="3XUOzowC983" role="1_o_aQ">
+                      <property role="TrG5h" value="sub" />
+                    </node>
+                  </node>
+                  <node concept="1_o_bx" id="3XUOzowC984" role="1_o_by">
+                    <node concept="1_o_bG" id="3XUOzowC985" role="1_o_aQ">
+                      <property role="TrG5h" value="tvd" />
+                    </node>
+                    <node concept="2OqwBi" id="3XUOzowC986" role="1_o_bz">
+                      <node concept="2OqwBi" id="3XUOzowC987" role="2Oq$k0">
+                        <node concept="37vLTw" id="3XUOzowC988" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3XUOzowC97x" resolve="clsType" />
+                        </node>
+                        <node concept="3TrEf2" id="3XUOzowC989" role="2OqNvi">
+                          <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+                        </node>
+                      </node>
+                      <node concept="3Tsc0h" id="3XUOzowC98a" role="2OqNvi">
+                        <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
+                      </node>
+                    </node>
                   </node>
-                </node>
-                <node concept="3Tsc0h" id="3jyhf9JqQmT" role="2OqNvi">
-                  <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3cpWs6" id="3jyhf9JqR2A" role="3cqZAp">
-            <node concept="37vLTw" id="3jyhf9JqRbI" role="3cqZAk">
-              <ref role="3cqZAo" node="3jyhf9JqQms" resolve="subs" />
+          <node concept="3cpWs6" id="3XUOzowC98b" role="3cqZAp">
+            <node concept="37vLTw" id="3XUOzowC98c" role="3cqZAk">
+              <ref role="3cqZAo" node="3XUOzowC97A" resolve="subs" />
             </node>
           </node>
         </node>
-        <node concept="3Tm6S6" id="3jyhf9JqLF4" role="1B3o_S" />
-        <node concept="3rvAFt" id="3jyhf9JqOuo" role="3clF45">
-          <node concept="3Tqbb2" id="3ca5Bh2ZD7b" role="3rvQeY">
+        <node concept="3rvAFt" id="3XUOzowC98e" role="3clF45">
+          <node concept="3Tqbb2" id="3XUOzowC98f" role="3rvQeY">
             <ref role="ehGHo" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
           </node>
-          <node concept="3Tqbb2" id="3jyhf9JqOuq" role="3rvSg0">
+          <node concept="3Tqbb2" id="3XUOzowC98g" role="3rvSg0">
             <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
           </node>
         </node>
+        <node concept="37vLTG" id="3XUOzowC97x" role="3clF46">
+          <property role="TrG5h" value="clsType" />
+          <node concept="3Tqbb2" id="3XUOzowC97y" role="1tU5fm">
+            <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+          </node>
+        </node>
+        <node concept="3Tm6S6" id="3XUOzowC98d" role="1B3o_S" />
       </node>
+      <node concept="2tJIrI" id="3XUOzowBoeg" role="jymVt" />
+      <node concept="2YIFZL" id="3XUOzowC0ny" role="jymVt">
+        <property role="TrG5h" value="isErased" />
+        <node concept="3clFbS" id="3XUOzowC0n$" role="3clF47">
+          <node concept="3cpWs6" id="3XUOzowC0n_" role="3cqZAp">
+            <node concept="1Wc70l" id="3XUOzowC0nA" role="3cqZAk">
+              <node concept="2OqwBi" id="3XUOzowC0nB" role="3uHU7B">
+                <node concept="2OqwBi" id="3XUOzowC0nC" role="2Oq$k0">
+                  <node concept="37vLTw" id="3XUOzowC0nD" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3XUOzowC0nP" resolve="clsTy" />
+                  </node>
+                  <node concept="3Tsc0h" id="3XUOzowC0nE" role="2OqNvi">
+                    <ref role="3TtcxE" to="tpee:g91_B6F" resolve="parameter" />
+                  </node>
+                </node>
+                <node concept="1v1jN8" id="3XUOzowC0nF" role="2OqNvi" />
+              </node>
+              <node concept="2OqwBi" id="3XUOzowC0nG" role="3uHU7w">
+                <node concept="2OqwBi" id="3XUOzowC0nH" role="2Oq$k0">
+                  <node concept="2OqwBi" id="3XUOzowC0nI" role="2Oq$k0">
+                    <node concept="37vLTw" id="3XUOzowC0nJ" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3XUOzowC0nP" resolve="clsTy" />
+                    </node>
+                    <node concept="3TrEf2" id="3XUOzowC0nK" role="2OqNvi">
+                      <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+                    </node>
+                  </node>
+                  <node concept="3Tsc0h" id="3XUOzowC0nL" role="2OqNvi">
+                    <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
+                  </node>
+                </node>
+                <node concept="3GX2aA" id="3XUOzowC0nM" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="10P_77" id="3XUOzowC0nO" role="3clF45" />
+        <node concept="37vLTG" id="3XUOzowC0nP" role="3clF46">
+          <property role="TrG5h" value="clsTy" />
+          <node concept="3Tqbb2" id="3XUOzowC0nQ" role="1tU5fm">
+            <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+          </node>
+        </node>
+        <node concept="3Tm6S6" id="3XUOzowC0nN" role="1B3o_S" />
+      </node>
+      <node concept="2tJIrI" id="3XUOzowHzW8" role="jymVt" />
+      <node concept="2YIFZL" id="3XUOzowHKCd" role="jymVt">
+        <property role="TrG5h" value="eraseClsType" />
+        <node concept="3clFbS" id="3XUOzowHKCg" role="3clF47">
+          <node concept="3cpWs8" id="7l$juG4Eyj3" role="3cqZAp">
+            <node concept="3cpWsn" id="7l$juG4Eyj6" role="3cpWs9">
+              <property role="TrG5h" value="tyArgs" />
+              <node concept="2I9FWS" id="7l$juG4Eyj1" role="1tU5fm">
+                <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
+              <node concept="2ShNRf" id="7l$juG4E$us" role="33vP2m">
+                <node concept="2T8Vx0" id="7l$juG4E_aD" role="2ShVmc">
+                  <node concept="2I9FWS" id="7l$juG4E_aF" role="2T96Bj">
+                    <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2Gpval" id="3XUOzowHUCK" role="3cqZAp">
+            <node concept="2GrKxI" id="3XUOzowHUCM" role="2Gsz3X">
+              <property role="TrG5h" value="tvd" />
+            </node>
+            <node concept="2OqwBi" id="3XUOzowI3q0" role="2GsD0m">
+              <node concept="3Tsc0h" id="3XUOzowI4nD" role="2OqNvi">
+                <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
+              </node>
+              <node concept="37vLTw" id="7l$juG4EMCG" role="2Oq$k0">
+                <ref role="3cqZAo" node="3XUOzowHN8s" resolve="cls" />
+              </node>
+            </node>
+            <node concept="3clFbS" id="3XUOzowHUCQ" role="2LFqv$">
+              <node concept="3clFbF" id="7l$juG4EEsE" role="3cqZAp">
+                <node concept="2OqwBi" id="7l$juG4EGhI" role="3clFbG">
+                  <node concept="37vLTw" id="7l$juG4EEsD" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7l$juG4Eyj6" resolve="tyArgs" />
+                  </node>
+                  <node concept="TSZUe" id="7l$juG4EIhB" role="2OqNvi">
+                    <node concept="1rXfSq" id="7l$juG4EIQK" role="25WWJ7">
+                      <ref role="37wK5l" node="3XUOzowC2Da" resolve="eraseTypeVar" />
+                      <node concept="2GrUjf" id="7l$juG4EJ_p" role="37wK5m">
+                        <ref role="2Gs0qQ" node="3XUOzowHUCM" resolve="tvd" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs6" id="3XUOzowIwA$" role="3cqZAp">
+            <node concept="2pJPEk" id="7l$juG4ErrD" role="3cqZAk">
+              <node concept="2pJPED" id="7l$juG4EsuO" role="2pJPEn">
+                <ref role="2pJxaS" to="tpee:g7uibYu" resolve="ClassifierType" />
+                <node concept="2pIpSj" id="7l$juG4Et5G" role="2pJxcM">
+                  <ref role="2pIpSl" to="tpee:g7uigIF" resolve="classifier" />
+                  <node concept="36biLy" id="7l$juG4Ev7Q" role="28nt2d">
+                    <node concept="37vLTw" id="7l$juG4EvRh" role="36biLW">
+                      <ref role="3cqZAo" node="3XUOzowHN8s" resolve="cls" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2pIpSj" id="7l$juG4EBdm" role="2pJxcM">
+                  <ref role="2pIpSl" to="tpee:g91_B6F" resolve="parameter" />
+                  <node concept="36biLy" id="7l$juG4EBxL" role="28nt2d">
+                    <node concept="37vLTw" id="7l$juG4EBS7" role="36biLW">
+                      <ref role="3cqZAo" node="7l$juG4Eyj6" resolve="tyArgs" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm6S6" id="3XUOzowHBGp" role="1B3o_S" />
+        <node concept="3Tqbb2" id="3XUOzowHJ6I" role="3clF45">
+          <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+        </node>
+        <node concept="37vLTG" id="3XUOzowHN8s" role="3clF46">
+          <property role="TrG5h" value="cls" />
+          <node concept="3Tqbb2" id="3XUOzowHN8r" role="1tU5fm">
+            <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="3XUOzowBq7J" role="jymVt" />
+      <node concept="2YIFZL" id="3XUOzowC2Da" role="jymVt">
+        <property role="TrG5h" value="eraseTypeVar" />
+        <node concept="3clFbS" id="3XUOzowC2Dc" role="3clF47">
+          <node concept="3cpWs6" id="3XUOzowC2Dd" role="3cqZAp">
+            <node concept="3K4zz7" id="3XUOzowC2De" role="3cqZAk">
+              <node concept="2OqwBi" id="3XUOzowC2Df" role="3K4E3e">
+                <node concept="37vLTw" id="3XUOzowC2Dg" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3XUOzowC2Dt" resolve="tv" />
+                </node>
+                <node concept="3TrEf2" id="3XUOzowC2Dh" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:hFztrQw" resolve="bound" />
+                </node>
+              </node>
+              <node concept="2pJPEk" id="3XUOzowC2Di" role="3K4GZi">
+                <node concept="2pJPED" id="3XUOzowC2Dj" role="2pJPEn">
+                  <ref role="2pJxaS" to="tpee:g7uibYu" resolve="ClassifierType" />
+                  <node concept="2pIpSj" id="3XUOzowC2Dk" role="2pJxcM">
+                    <ref role="2pIpSl" to="tpee:g7uigIF" resolve="classifier" />
+                    <node concept="36bGnv" id="3XUOzowC2Dl" role="28nt2d">
+                      <ref role="36bGnp" to="wyt6:~Object" resolve="Object" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="3XUOzowC2Dm" role="3K4Cdx">
+                <node concept="2OqwBi" id="3XUOzowC2Dn" role="2Oq$k0">
+                  <node concept="37vLTw" id="3XUOzowC2Do" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3XUOzowC2Dt" resolve="tv" />
+                  </node>
+                  <node concept="3TrEf2" id="3XUOzowC2Dp" role="2OqNvi">
+                    <ref role="3Tt5mk" to="tpee:hFztrQw" resolve="bound" />
+                  </node>
+                </node>
+                <node concept="3x8VRR" id="3XUOzowC2Dq" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Tqbb2" id="3XUOzowC2Ds" role="3clF45">
+          <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+        </node>
+        <node concept="37vLTG" id="3XUOzowC2Dt" role="3clF46">
+          <property role="TrG5h" value="tv" />
+          <node concept="3Tqbb2" id="3XUOzowC2Du" role="1tU5fm">
+            <ref role="ehGHo" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
+          </node>
+        </node>
+        <node concept="3Tm6S6" id="3XUOzowC2Dr" role="1B3o_S" />
+      </node>
+      <node concept="2tJIrI" id="3XUOzowBlcz" role="jymVt" />
       <node concept="2tJIrI" id="29sKO70xL7a" role="jymVt" />
       <node concept="312cEg" id="29sKO70zF6Z" role="jymVt">
         <property role="TrG5h" value="subtypePaths" />
@@ -9889,6 +10321,12 @@
           <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
         </node>
       </node>
+      <node concept="2tJIrI" id="3XUOzow_ZpZ" role="jymVt" />
+      <node concept="312cEg" id="3XUOzowA6d$" role="jymVt">
+        <property role="TrG5h" value="ignoreErasedTypes" />
+        <node concept="3Tm6S6" id="3XUOzowA1gm" role="1B3o_S" />
+        <node concept="10P_77" id="3XUOzowA2be" role="1tU5fm" />
+      </node>
       <node concept="3Tm1VV" id="29sKO70xGve" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="tIwzd2cJHR" role="jymVt" />
@@ -9896,13 +10334,18 @@
       <property role="TrG5h" value="getResolver" />
       <node concept="3clFbS" id="21fnip9BiFH" role="3clF47">
         <node concept="3clFbF" id="21fnip9Bk5z" role="3cqZAp">
-          <node concept="2ShNRf" id="21fnip9Bk5x" role="3clFbG">
-            <node concept="1pGfFk" id="21fnip9BlV8" role="2ShVmc">
-              <ref role="37wK5l" node="29sKO70xJDa" resolve="SubclassingUtil.SupertypesResolver" />
-              <node concept="37vLTw" id="21fnip9Bm2X" role="37wK5m">
-                <ref role="3cqZAo" node="21fnip9BjJn" resolve="cls" />
+          <node concept="2OqwBi" id="3XUOzowNXny" role="3clFbG">
+            <node concept="2ShNRf" id="21fnip9Bk5x" role="2Oq$k0">
+              <node concept="1pGfFk" id="21fnip9BlV8" role="2ShVmc">
+                <ref role="37wK5l" node="3XUOzowME62" resolve="SubclassingUtil.SupertypesResolver" />
+                <node concept="37vLTw" id="21fnip9Bm2X" role="37wK5m">
+                  <ref role="3cqZAo" node="21fnip9BjJn" resolve="cls" />
+                </node>
               </node>
             </node>
+            <node concept="liA8E" id="3XUOzowOauQ" role="2OqNvi">
+              <ref role="37wK5l" node="3XUOzowNww8" resolve="resolveAll" />
+            </node>
           </node>
         </node>
       </node>
@@ -9917,6 +10360,54 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="3XUOzowO0j6" role="jymVt" />
+    <node concept="2YIFZL" id="3XUOzowNYTB" role="jymVt">
+      <property role="TrG5h" value="getRawResolver" />
+      <node concept="3clFbS" id="3XUOzowNYTC" role="3clF47">
+        <node concept="3clFbF" id="3XUOzowNYTD" role="3cqZAp">
+          <node concept="2OqwBi" id="3XUOzowNYTE" role="3clFbG">
+            <node concept="2OqwBi" id="3XUOzowR9Rm" role="2Oq$k0">
+              <node concept="2ShNRf" id="3XUOzowNYTF" role="2Oq$k0">
+                <node concept="1pGfFk" id="3XUOzowNYTG" role="2ShVmc">
+                  <ref role="37wK5l" node="3XUOzowME62" resolve="SubclassingUtil.SupertypesResolver" />
+                  <node concept="37vLTw" id="3XUOzowNYTH" role="37wK5m">
+                    <ref role="3cqZAo" node="3XUOzowNYTL" resolve="cls" />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="3XUOzowRay7" role="2OqNvi">
+                <ref role="37wK5l" node="3XUOzowNOMT" resolve="withRaw" />
+              </node>
+            </node>
+            <node concept="liA8E" id="3XUOzowRb7A" role="2OqNvi">
+              <ref role="37wK5l" node="3XUOzowNww8" resolve="resolveAll" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3XUOzowNYTJ" role="1B3o_S" />
+      <node concept="3uibUv" id="3XUOzowNYTK" role="3clF45">
+        <ref role="3uigEE" node="29sKO70xIRu" resolve="SubclassingUtil.SupertypesResolver" />
+      </node>
+      <node concept="37vLTG" id="3XUOzowNYTL" role="3clF46">
+        <property role="TrG5h" value="cls" />
+        <node concept="3Tqbb2" id="3XUOzowNYTM" role="1tU5fm">
+          <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+        </node>
+      </node>
+      <node concept="P$JXv" id="3XUOzowOj2N" role="lGtFl">
+        <node concept="TZ5HA" id="3XUOzowOj2O" role="TZ5H$">
+          <node concept="1dT_AC" id="3XUOzowOj2P" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns resolver which returns raw Classifier types without erasing their type variables." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="3XUOzowP4Kx" role="TZ5H$">
+          <node concept="1dT_AC" id="3XUOzowP4Ky" role="1dT_Ay">
+            <property role="1dT_AB" value="Type variable is by definition erased to its leftmost bound." />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="21fnip9BdeB" role="jymVt" />
     <node concept="2YIFZL" id="5H6hZahiCgu" role="jymVt">
       <property role="DiZV1" value="false" />
@@ -10036,7 +10527,7 @@
         <node concept="3clFbF" id="29sKO70zK7D" role="3cqZAp">
           <node concept="2OqwBi" id="29sKO70zUne" role="3clFbG">
             <node concept="1rXfSq" id="dabFeLEP5Z" role="2Oq$k0">
-              <ref role="37wK5l" node="21fnip9BiFE" resolve="getResolver" />
+              <ref role="37wK5l" node="3XUOzowNYTB" resolve="getRawResolver" />
               <node concept="37vLTw" id="dabFeLEPb_" role="37wK5m">
                 <ref role="3cqZAo" node="3jyhf9JmEv7" resolve="cls" />
               </node>
@@ -16861,20 +17352,6 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3I6s7M" id="2yxaISahpKx" role="3I6sU7">
-                  <node concept="2aM9Np" id="2yxaISahpKy" role="3I6s78">
-                    <node concept="a7P8L" id="1GnJ2STYyaK" role="2aLmnP">
-                      <ref role="a7OzE" node="2yxaISahpK3" resolve="T" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="2yxaISahpK$" role="3I6sU7">
-                  <node concept="2aM9Np" id="2yxaISahpK_" role="3I6s78">
-                    <node concept="a7P8L" id="1GnJ2STYybd" role="2aLmnP">
-                      <ref role="a7OzE" node="2yxaISahpK2" resolve="S" />
-                    </node>
-                  </node>
-                </node>
               </node>
             </node>
             <node concept="3NuqgR" id="2yxaISahpK1" role="0Rg$4">
@@ -17047,24 +17524,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3Aq9_M" id="4pwDyRBNdkZ" role="1nLNMa">
-              <node concept="3I6sU6" id="4pwDyRBNdl0" role="3Ip0Jz">
-                <node concept="3I6s7M" id="4pwDyRBNdl4" role="3I6sU7">
-                  <node concept="2aM9Np" id="4pwDyRBNdl5" role="3I6s78">
-                    <node concept="a7P8L" id="4pwDyRBNdl6" role="2aLmnP">
-                      <ref role="a7OzE" node="4pwDyRBNdk_" resolve="S" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="4pwDyRBNdl7" role="3I6sU7">
-                  <node concept="2aM9Np" id="4pwDyRBNdl8" role="3I6s78">
-                    <node concept="a7P8L" id="4pwDyRBNdl9" role="2aLmnP">
-                      <ref role="a7OzE" node="4pwDyRBNdkA" resolve="T" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
             <node concept="3NuqgR" id="4pwDyRBNdk$" role="0Rg$4">
               <node concept="aZer4" id="4pwDyRBNdk_" role="3XD1gS">
                 <property role="TrG5h" value="S" />
@@ -17175,24 +17634,6 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3Aq9_M" id="5310cdpKraw" role="1nLNMa">
-                  <node concept="3I6sU6" id="5310cdpKrax" role="3Ip0Jz">
-                    <node concept="3I6s7M" id="5310cdpKray" role="3I6sU7">
-                      <node concept="2aM9Np" id="5310cdpKraz" role="3I6s78">
-                        <node concept="a7P8L" id="5310cdpKra$" role="2aLmnP">
-                          <ref role="a7OzE" node="5310cdpKraE" resolve="S" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3I6s7M" id="5310cdpKra_" role="3I6sU7">
-                      <node concept="2aM9Np" id="5310cdpKraA" role="3I6s78">
-                        <node concept="a7P8L" id="5310cdpKraB" role="2aLmnP">
-                          <ref role="a7OzE" node="5310cdpKraF" resolve="T" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
                 <node concept="3NuqgR" id="5310cdpKr9a" role="0Rg$4">
                   <node concept="aZer4" id="5310cdpKraE" role="3XD1gS">
                     <property role="TrG5h" value="S" />
@@ -17205,13 +17646,9 @@
                   </node>
                   <node concept="32pEOW" id="24ciDNzxNDe" role="3vLBG7" />
                 </node>
-                <node concept="3xSepi" id="6E2cNicdij0" role="3xSepv">
-                  <node concept="3Aq9E8" id="5310cdpKr99" role="3xSepj">
-                    <node concept="3I6sU6" id="5310cdpKr9r" role="3Ip0Jz" />
-                  </node>
-                </node>
               </node>
             </node>
+            <node concept="3clFbH" id="3XUOzowvy7z" role="3cqZAp" />
           </node>
         </node>
       </node>
@@ -17309,24 +17746,6 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3Aq9_M" id="2rIdnPwrAhf" role="1nLNMa">
-                  <node concept="3I6sU6" id="2rIdnPwrAhg" role="3Ip0Jz">
-                    <node concept="3I6s7M" id="2rIdnPwrAhh" role="3I6sU7">
-                      <node concept="2aM9Np" id="2rIdnPwrAhi" role="3I6s78">
-                        <node concept="a7P8L" id="2rIdnPwrAhj" role="2aLmnP">
-                          <ref role="a7OzE" node="2rIdnPwrAgF" resolve="S" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3I6s7M" id="2rIdnPwrAhk" role="3I6sU7">
-                      <node concept="2aM9Np" id="2rIdnPwrAhl" role="3I6s78">
-                        <node concept="a7P8L" id="2rIdnPwrAhm" role="2aLmnP">
-                          <ref role="a7OzE" node="2rIdnPwrAgK" resolve="T" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
                 <node concept="3NuqgR" id="2rIdnPwrAgE" role="0Rg$4">
                   <node concept="aZer4" id="2rIdnPwrAgF" role="3XD1gS">
                     <property role="TrG5h" value="S" />
@@ -17505,24 +17924,6 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3Aq9_M" id="24yJnOJhgO9" role="1nLNMa">
-                  <node concept="3I6sU6" id="24yJnOJhgOa" role="3Ip0Jz">
-                    <node concept="3I6s7M" id="24yJnOJhgOb" role="3I6sU7">
-                      <node concept="2aM9Np" id="24yJnOJhgOc" role="3I6s78">
-                        <node concept="a7P8L" id="24yJnOJhgOd" role="2aLmnP">
-                          <ref role="a7OzE" node="24yJnOJhgMP" resolve="S" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3I6s7M" id="24yJnOJhgOe" role="3I6sU7">
-                      <node concept="2aM9Np" id="24yJnOJhgOf" role="3I6s78">
-                        <node concept="a7P8L" id="24yJnOJhgOg" role="2aLmnP">
-                          <ref role="a7OzE" node="24yJnOJhgMU" resolve="T" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
                 <node concept="3NuqgR" id="24yJnOJhgMO" role="0Rg$4">
                   <node concept="aZer4" id="24yJnOJhgMP" role="3XD1gS">
                     <property role="TrG5h" value="S" />
@@ -29777,6 +30178,14 @@
                             <node concept="iZEcu" id="5Oz70LKjwBK" role="2OqNvi" />
                           </node>
                         </node>
+                        <node concept="nsMwS" id="3XUOzowxE16" role="ns1xD">
+                          <ref role="nsMwP" node="JOGAOsVt2d" resolve="kind" />
+                          <node concept="1nq8_$" id="3XUOzowxFYL" role="nsMwV">
+                            <node concept="a7P8L" id="3XUOzowxFYK" role="1nq8_t">
+                              <ref role="a7OzE" node="3XUOzowxE$F" resolve="Kind" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                       <node concept="a7P8L" id="3wxtToEiJII" role="1uarlU">
                         <ref role="a7OzE" node="3wxtToEiJIx" resolve="ClsType" />
@@ -29811,6 +30220,9 @@
               <node concept="aZer4" id="3wxtToEiJIx" role="3XD1gS">
                 <property role="TrG5h" value="ClsType" />
               </node>
+              <node concept="aZer4" id="3XUOzowxE$F" role="3XD1gS">
+                <property role="TrG5h" value="Kind" />
+              </node>
               <node concept="aZer4" id="3wxtToEiJIy" role="3XD1gS">
                 <property role="TrG5h" value="Args" />
                 <node concept="2OqwBi" id="3wxtToEiJI$" role="3gj$pD">
@@ -29970,6 +30382,14 @@
                                 <node concept="iZEcu" id="5Oz70LKjy4u" role="2OqNvi" />
                               </node>
                             </node>
+                            <node concept="nsMwS" id="3XUOzowxGgF" role="ns1xD">
+                              <ref role="nsMwP" node="JOGAOsVt2d" resolve="kind" />
+                              <node concept="1nq8_$" id="3XUOzowxGOh" role="nsMwV">
+                                <node concept="a7P8L" id="3XUOzowxGOg" role="1nq8_t">
+                                  <ref role="a7OzE" node="3XUOzowxE$F" resolve="Kind" />
+                                </node>
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -43726,10 +44146,10 @@
               <node concept="1bVj0M" id="dabFeLIji4" role="37wK5m">
                 <node concept="3clFbS" id="dabFeLIji5" role="1bW5cS">
                   <node concept="3clFbF" id="dabFeLIji6" role="3cqZAp">
-                    <node concept="2YIFZM" id="dabFeLIji7" role="3clFbG">
+                    <node concept="2YIFZM" id="1GAclsBzE1N" role="3clFbG">
                       <ref role="37wK5l" node="21fnip9BiFE" resolve="getResolver" />
                       <ref role="1Pybhc" node="tIwzd2cJHD" resolve="SubclassingUtil" />
-                      <node concept="3A2sRY" id="dabFeLIjC_" role="37wK5m">
+                      <node concept="3A2sRY" id="1GAclsBzE1O" role="37wK5m">
                         <ref role="3A2yKK" node="29sKO70xfxm" resolve="cls" />
                       </node>
                     </node>
@@ -43968,6 +44388,20 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3cpWs8" id="1GAclsBJ8zq" role="3cqZAp">
+                  <node concept="3cpWsn" id="1GAclsBJ8zt" role="3cpWs9">
+                    <property role="TrG5h" value="baseMethodId" />
+                    <node concept="17QB3L" id="1GAclsBJ8zo" role="1tU5fm" />
+                    <node concept="2OqwBi" id="1GAclsBJeHL" role="33vP2m">
+                      <node concept="2GrUjf" id="1GAclsBJelc" role="2Oq$k0">
+                        <ref role="2Gs0qQ" node="dabFeLIk5p" resolve="baseMethod" />
+                      </node>
+                      <node concept="3TrcHB" id="1GAclsBLc8p" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
                 <node concept="3clFbH" id="dabFeLJrl6" role="3cqZAp" />
                 <node concept="3cpWs8" id="dabFeLJbif" role="3cqZAp">
                   <node concept="3cpWsn" id="dabFeLJbii" role="3cpWs9">
@@ -43996,6 +44430,100 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3cpWs8" id="1GAclsBBP8L" role="3cqZAp">
+                  <node concept="3cpWsn" id="1GAclsBBP8O" role="3cpWs9">
+                    <property role="TrG5h" value="baseArgTypes" />
+                    <node concept="A3Dl8" id="1GAclsBBP8I" role="1tU5fm">
+                      <node concept="3Tqbb2" id="1GAclsBBPIS" role="A3Ik2">
+                        <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="1GAclsBDWGl" role="33vP2m">
+                      <node concept="2OqwBi" id="1GAclsBCSUt" role="2Oq$k0">
+                        <node concept="37vLTw" id="1GAclsBCSUu" role="2Oq$k0">
+                          <ref role="3cqZAo" node="dabFeLIji0" resolve="clsTypesResolver" />
+                        </node>
+                        <node concept="liA8E" id="1GAclsBCSUv" role="2OqNvi">
+                          <ref role="37wK5l" node="1GAclsBC8Q7" resolve="withResolvedTypeVars" />
+                          <node concept="37vLTw" id="1GAclsBCSUw" role="37wK5m">
+                            <ref role="3cqZAo" node="dabFeLIkk0" resolve="baseCls" />
+                          </node>
+                          <node concept="2OqwBi" id="1GAclsBD1ck" role="37wK5m">
+                            <node concept="2OqwBi" id="1GAclsBCSUx" role="2Oq$k0">
+                              <node concept="2GrUjf" id="1GAclsBCSUy" role="2Oq$k0">
+                                <ref role="2Gs0qQ" node="dabFeLIk5p" resolve="baseMethod" />
+                              </node>
+                              <node concept="3Tsc0h" id="1GAclsBCUKb" role="2OqNvi">
+                                <ref role="3TtcxE" to="tpee:fzclF7Y" resolve="parameter" />
+                              </node>
+                            </node>
+                            <node concept="3$u5V9" id="1GAclsBD5Oq" role="2OqNvi">
+                              <node concept="1bVj0M" id="1GAclsBD5Os" role="23t8la">
+                                <node concept="3clFbS" id="1GAclsBD5Ot" role="1bW5cS">
+                                  <node concept="3clFbF" id="1GAclsBD6Eo" role="3cqZAp">
+                                    <node concept="2OqwBi" id="1GAclsBD6YL" role="3clFbG">
+                                      <node concept="37vLTw" id="1GAclsBD6En" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="1GAclsBD5Ou" resolve="it" />
+                                      </node>
+                                      <node concept="3TrEf2" id="1GAclsBD8sw" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="Rh6nW" id="1GAclsBD5Ou" role="1bW2Oz">
+                                  <property role="TrG5h" value="it" />
+                                  <node concept="2jxLKc" id="1GAclsBD5Ov" role="1tU5fm" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="ANE8D" id="1GAclsBDYdT" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs8" id="1GAclsBEe7j" role="3cqZAp">
+                  <node concept="3cpWsn" id="1GAclsBEe7m" role="3cpWs9">
+                    <property role="TrG5h" value="argTypes" />
+                    <node concept="A3Dl8" id="1GAclsBEe7g" role="1tU5fm">
+                      <node concept="3Tqbb2" id="1GAclsBEf76" role="A3Ik2">
+                        <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="1GAclsBEojO" role="33vP2m">
+                      <node concept="2OqwBi" id="1GAclsBEidr" role="2Oq$k0">
+                        <node concept="2GrUjf" id="1GAclsBEi35" role="2Oq$k0">
+                          <ref role="2Gs0qQ" node="29sKO70xzlx" resolve="overridingMethod" />
+                        </node>
+                        <node concept="3Tsc0h" id="1GAclsBEjNy" role="2OqNvi">
+                          <ref role="3TtcxE" to="tpee:fzclF7Y" resolve="parameter" />
+                        </node>
+                      </node>
+                      <node concept="3$u5V9" id="1GAclsBEwEt" role="2OqNvi">
+                        <node concept="1bVj0M" id="1GAclsBEwEv" role="23t8la">
+                          <node concept="3clFbS" id="1GAclsBEwEw" role="1bW5cS">
+                            <node concept="3clFbF" id="1GAclsBExjE" role="3cqZAp">
+                              <node concept="2OqwBi" id="1GAclsBExNz" role="3clFbG">
+                                <node concept="37vLTw" id="1GAclsBExjD" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="1GAclsBEwEx" resolve="it" />
+                                </node>
+                                <node concept="3TrEf2" id="1GAclsBEyRE" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="Rh6nW" id="1GAclsBEwEx" role="1bW2Oz">
+                            <property role="TrG5h" value="it" />
+                            <node concept="2jxLKc" id="1GAclsBEwEy" role="1tU5fm" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
                 <node concept="3clFbH" id="dabFeLJbUI" role="3cqZAp" />
                 <node concept="3Hbl2A" id="dabFeLLfoc" role="3cqZAp">
                   <node concept="3clFbS" id="dabFeLLfoe" role="9aQI4">
@@ -44006,6 +44534,22 @@
                             <node concept="3I6sU6" id="dabFeLJqh7" role="3Ip0Jz">
                               <node concept="3IrJb3" id="dabFeLJpEv" role="3I6sU7">
                                 <node concept="3clFbS" id="dabFeLJpEw" role="3IrJb0">
+                                  <node concept="3SKdUt" id="1GAclsBD9mp" role="3cqZAp">
+                                    <node concept="1PaTwC" id="1GAclsBD9mq" role="3ndbpf">
+                                      <node concept="3oM_SD" id="1GAclsBD9ms" role="1PaTwD">
+                                        <property role="3oM_SC" value="Check" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1GAclsBDauM" role="1PaTwD">
+                                        <property role="3oM_SC" value="return" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1GAclsBDbAN" role="1PaTwD">
+                                        <property role="3oM_SC" value="type" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1GAclsBDcIP" role="1PaTwD">
+                                        <property role="3oM_SC" value="covariance" />
+                                      </node>
+                                    </node>
+                                  </node>
                                   <node concept="3Aqczg" id="dabFeLJpEx" role="3cqZAp">
                                     <node concept="1imXTs" id="dabFeLJnAw" role="3Aqpz8">
                                       <node concept="a7P8L" id="dabFeLJnAD" role="1imXu6">
@@ -44097,7 +44641,247 @@
                     <ref role="2Gs0qQ" node="29sKO70xzlx" resolve="overridingMethod" />
                   </node>
                 </node>
-                <node concept="3zACq4" id="dabFeLNqey" role="3cqZAp" />
+                <node concept="3clFbH" id="1GAclsBNlvy" role="3cqZAp" />
+                <node concept="3clFbJ" id="1GAclsBNogh" role="3cqZAp">
+                  <node concept="3clFbS" id="1GAclsBNogj" role="3clFbx">
+                    <node concept="3Hbl2A" id="1GAclsBNgRc" role="3cqZAp">
+                      <node concept="3clFbS" id="1GAclsBNgRd" role="9aQI4">
+                        <node concept="1nLNNL" id="1GAclsBNgRW" role="3cqZAp">
+                          <node concept="1nLNMm" id="1GAclsBNgRX" role="1nLNNK">
+                            <node concept="3xSepi" id="1GAclsBNgRY" role="3xSepv">
+                              <node concept="3Aq9E8" id="1GAclsBNgRZ" role="3xSepj">
+                                <node concept="3I6sU6" id="1GAclsBNgS0" role="3Ip0Jz">
+                                  <node concept="3IrJb3" id="1GAclsBNgS1" role="3I6sU7">
+                                    <node concept="3clFbS" id="1GAclsBNgS2" role="3IrJb0">
+                                      <node concept="3SKdUt" id="1GAclsBNgS3" role="3cqZAp">
+                                        <node concept="1PaTwC" id="1GAclsBNgS4" role="3ndbpf">
+                                          <node concept="3oM_SD" id="1GAclsBNgS5" role="1PaTwD">
+                                            <property role="3oM_SC" value="Check" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgS6" role="1PaTwD">
+                                            <property role="3oM_SC" value="compatability" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgS7" role="1PaTwD">
+                                            <property role="3oM_SC" value="of" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgS8" role="1PaTwD">
+                                            <property role="3oM_SC" value="argument" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgS9" role="1PaTwD">
+                                            <property role="3oM_SC" value="types:" />
+                                          </node>
+                                        </node>
+                                        <node concept="1PaTwC" id="1GAclsBNgSa" role="3ndbpf">
+                                          <node concept="3oM_SD" id="1GAclsBNgSb" role="1PaTwD">
+                                            <property role="3oM_SC" value="overriding" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSc" role="1PaTwD">
+                                            <property role="3oM_SC" value="method's" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSd" role="1PaTwD">
+                                            <property role="3oM_SC" value="signature" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSe" role="1PaTwD">
+                                            <property role="3oM_SC" value="must" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSf" role="1PaTwD">
+                                            <property role="3oM_SC" value="be" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSg" role="1PaTwD">
+                                            <property role="3oM_SC" value="a" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSh" role="1PaTwD">
+                                            <property role="3oM_SC" value="subsignature" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSi" role="1PaTwD">
+                                            <property role="3oM_SC" value="of" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSj" role="1PaTwD">
+                                            <property role="3oM_SC" value="base" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSk" role="1PaTwD">
+                                            <property role="3oM_SC" value="method," />
+                                          </node>
+                                        </node>
+                                        <node concept="1PaTwC" id="1GAclsBNgSl" role="3ndbpf">
+                                          <node concept="3oM_SD" id="1GAclsBNgSm" role="1PaTwD">
+                                            <property role="3oM_SC" value="if" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSn" role="1PaTwD">
+                                            <property role="3oM_SC" value="not" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSo" role="1PaTwD">
+                                            <property role="3oM_SC" value="and" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSp" role="1PaTwD">
+                                            <property role="3oM_SC" value="it" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSq" role="1PaTwD">
+                                            <property role="3oM_SC" value="has" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSr" role="1PaTwD">
+                                            <property role="3oM_SC" value="same" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSs" role="1PaTwD">
+                                            <property role="3oM_SC" value="type" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSt" role="1PaTwD">
+                                            <property role="3oM_SC" value="erasure" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSu" role="1PaTwD">
+                                            <property role="3oM_SC" value="--" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSv" role="1PaTwD">
+                                            <property role="3oM_SC" value="it's" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSw" role="1PaTwD">
+                                            <property role="3oM_SC" value="a" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSx" role="1PaTwD">
+                                            <property role="3oM_SC" value="name" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSy" role="1PaTwD">
+                                            <property role="3oM_SC" value="clash" />
+                                          </node>
+                                          <node concept="3oM_SD" id="1GAclsBNgSz" role="1PaTwD">
+                                            <property role="3oM_SC" value="error" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="1_o_46" id="1GAclsBNgS$" role="3cqZAp">
+                                        <node concept="1_o_bx" id="1GAclsBNgS_" role="1_o_by">
+                                          <node concept="1_o_bG" id="1GAclsBNgSA" role="1_o_aQ">
+                                            <property role="TrG5h" value="argTy" />
+                                          </node>
+                                          <node concept="37vLTw" id="1GAclsBNgSB" role="1_o_bz">
+                                            <ref role="3cqZAo" node="1GAclsBEe7m" resolve="argTypes" />
+                                          </node>
+                                        </node>
+                                        <node concept="1_o_bx" id="1GAclsBNgSC" role="1_o_by">
+                                          <node concept="1_o_bG" id="1GAclsBNgSD" role="1_o_aQ">
+                                            <property role="TrG5h" value="baseArgTy" />
+                                          </node>
+                                          <node concept="37vLTw" id="1GAclsBNgSE" role="1_o_bz">
+                                            <ref role="3cqZAo" node="1GAclsBBP8O" resolve="baseArgTypes" />
+                                          </node>
+                                        </node>
+                                        <node concept="3clFbS" id="1GAclsBNgSF" role="2LFqv$">
+                                          <node concept="3X$Joe" id="1GAclsBNgSG" role="3cqZAp">
+                                            <node concept="aZer4" id="1GAclsBNgSH" role="3XD1gS">
+                                              <property role="TrG5h" value="ArgTy" />
+                                            </node>
+                                            <node concept="aZer4" id="1GAclsBNgSI" role="3XD1gS">
+                                              <property role="TrG5h" value="BaseArgTy" />
+                                            </node>
+                                            <node concept="32pEOW" id="1GAclsBNgSJ" role="3vLBG7" />
+                                          </node>
+                                          <node concept="3clFbH" id="1GAclsBNgSK" role="3cqZAp" />
+                                          <node concept="3Aqczg" id="1GAclsBNgSL" role="3cqZAp">
+                                            <node concept="1imXTs" id="1GAclsBNgSM" role="3Aqpz8">
+                                              <node concept="a7P8L" id="1GAclsBNgSN" role="1imXu6">
+                                                <ref role="a7OzE" node="1GAclsBNgSH" resolve="ArgTy" />
+                                              </node>
+                                              <node concept="3M$PaV" id="1GAclsBNgSO" role="1imXSf">
+                                                <ref role="3M$S_o" node="1GAclsBNgSA" resolve="argTy" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="3Aqczg" id="1GAclsBNgSP" role="3cqZAp">
+                                            <node concept="1imXTs" id="1GAclsBNgSQ" role="3Aqpz8">
+                                              <node concept="a7P8L" id="1GAclsBNgSR" role="1imXu6">
+                                                <ref role="a7OzE" node="1GAclsBNgSI" resolve="BaseArgTy" />
+                                              </node>
+                                              <node concept="3M$PaV" id="1GAclsBNgSS" role="1imXSf">
+                                                <ref role="3M$S_o" node="1GAclsBNgSD" resolve="baseArgTy" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="3Aqczg" id="1GAclsBNgST" role="3cqZAp">
+                                            <node concept="3A8Hvi" id="1GAclsBNgSU" role="3Aqpz8">
+                                              <node concept="a7P8L" id="1GAclsBNgSV" role="3A8wtg">
+                                                <ref role="a7OzE" node="1GAclsBNgSH" resolve="ArgTy" />
+                                              </node>
+                                              <node concept="a7P8L" id="1GAclsBNgSW" role="3A8w4Q">
+                                                <ref role="a7OzE" node="1GAclsBNgSI" resolve="BaseArgTy" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3Aq93q" id="1GAclsBNgSX" role="1nLNMb">
+                              <property role="3ArMco" value="true" />
+                              <node concept="3I6sU6" id="1GAclsBNgSY" role="3Ip0Jz">
+                                <node concept="3I6s7M" id="1GAclsBNgSZ" role="3I6sU7">
+                                  <node concept="3Aqt3T" id="1GAclsBNgT0" role="3I6s78">
+                                    <ref role="3AqCNq" node="4btN1w5Ki4T" resolve="checkDecls" />
+                                    <node concept="37jhX" id="1GAclsBNgT1" role="3AunhB">
+                                      <node concept="37vLTw" id="1GAclsBNgT2" role="37jj2">
+                                        <ref role="3cqZAo" node="36PPzUCy4k1" resolve="scope" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3NuqgR" id="1GAclsBNgT3" role="0Rg$4">
+                              <node concept="aZer4" id="1GAclsBNgT4" role="3XD1gS">
+                                <property role="TrG5h" value="RetTy" />
+                              </node>
+                              <node concept="aZer4" id="1GAclsBNgT5" role="3XD1gS">
+                                <property role="TrG5h" value="BaseRetTy" />
+                              </node>
+                              <node concept="32pEOW" id="1GAclsBNgT6" role="3vLBG7" />
+                            </node>
+                            <node concept="3xSepi" id="1GAclsBNgT7" role="3xSepv">
+                              <node concept="3Aq9E8" id="1GAclsBNgT8" role="3xSepj">
+                                <node concept="3I6sU6" id="1GAclsBNgT9" role="3Ip0Jz">
+                                  <node concept="3I6s7M" id="1GAclsBNgTa" role="3I6sU7">
+                                    <node concept="1lHd6T" id="1GAclsBNgTb" role="3I6s78">
+                                      <property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
+                                      <node concept="3cpWs3" id="1GAclsBNgTc" role="1ljv2e">
+                                        <node concept="37vLTw" id="1GAclsBNgTd" role="3uHU7w">
+                                          <ref role="3cqZAo" node="dabFeLJr4E" resolve="baseClsId" />
+                                        </node>
+                                        <node concept="3cpWs3" id="1GAclsBNgTe" role="3uHU7B">
+                                          <node concept="Xl_RD" id="1GAclsBNgTf" role="3uHU7w">
+                                            <property role="Xl_RC" value=" in " />
+                                          </node>
+                                          <node concept="3cpWs3" id="1GAclsBNgTg" role="3uHU7B">
+                                            <node concept="Xl_RD" id="1GAclsBNgTh" role="3uHU7B">
+                                              <property role="Xl_RC" value="name clash with base method " />
+                                            </node>
+                                            <node concept="37vLTw" id="1GAclsBNgTi" role="3uHU7w">
+                                              <ref role="3cqZAo" node="1GAclsBJ8zt" resolve="baseMethodId" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2GrUjf" id="1GAclsBNgTk" role="3Hbm9W">
+                        <ref role="2Gs0qQ" node="29sKO70xzlx" resolve="overridingMethod" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="1GAclsBNq2x" role="3clFbw">
+                    <node concept="37vLTw" id="1GAclsBNpl3" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1GAclsBBP8O" resolve="baseArgTypes" />
+                    </node>
+                    <node concept="3GX2aA" id="1GAclsBNsVd" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="3clFbH" id="1GAclsBNfME" role="3cqZAp" />
               </node>
             </node>
           </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps
index 6d148c90..80a6d577 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps
@@ -12111,5 +12111,451 @@
     <node concept="2tJIrI" id="6EK6UBPoVFl" role="jymVt" />
     <node concept="3Tm1VV" id="6EK6UBPoUU$" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="3XUOzowrzqi">
+    <property role="TrG5h" value="RawConversions" />
+    <node concept="2tJIrI" id="3XUOzowrzGH" role="jymVt" />
+    <node concept="312cEu" id="3XUOzowrzH6" role="jymVt">
+      <property role="TrG5h" value="Cell" />
+      <node concept="3clFbW" id="3XUOzowrDY7" role="jymVt">
+        <node concept="3cqZAl" id="3XUOzowrDY8" role="3clF45" />
+        <node concept="3clFbS" id="3XUOzowrDYa" role="3clF47">
+          <node concept="3clFbF" id="3XUOzowrFI1" role="3cqZAp">
+            <node concept="37vLTI" id="3XUOzowrHF6" role="3clFbG">
+              <node concept="37vLTw" id="3XUOzowrHGv" role="37vLTx">
+                <ref role="3cqZAo" node="3XUOzowrE0b" resolve="e" />
+              </node>
+              <node concept="37vLTw" id="3XUOzowrFI0" role="37vLTJ">
+                <ref role="3cqZAo" node="3XUOzowrzJG" resolve="value" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="3XUOzowrDWc" role="1B3o_S" />
+        <node concept="37vLTG" id="3XUOzowrE0b" role="3clF46">
+          <property role="TrG5h" value="e" />
+          <node concept="16syzq" id="3XUOzowrE0a" role="1tU5fm">
+            <ref role="16sUi3" node="3XUOzowrzI0" resolve="E" />
+          </node>
+        </node>
+      </node>
+      <node concept="312cEg" id="3XUOzowrzJG" role="jymVt">
+        <property role="TrG5h" value="value" />
+        <node concept="16syzq" id="3XUOzowrzJa" role="1tU5fm">
+          <ref role="16sUi3" node="3XUOzowrzI0" resolve="E" />
+        </node>
+        <node concept="3Tm1VV" id="3XUOzowrDMk" role="1B3o_S" />
+      </node>
+      <node concept="3clFb_" id="3XUOzowrzLl" role="jymVt">
+        <property role="TrG5h" value="get" />
+        <node concept="3clFbS" id="3XUOzowrzLo" role="3clF47">
+          <node concept="3cpWs6" id="3XUOzowrzNf" role="3cqZAp">
+            <node concept="37vLTw" id="3XUOzowrDSN" role="3cqZAk">
+              <ref role="3cqZAo" node="3XUOzowrzJG" resolve="value" />
+            </node>
+          </node>
+        </node>
+        <node concept="16syzq" id="3XUOzowrzKL" role="3clF45">
+          <ref role="16sUi3" node="3XUOzowrzI0" resolve="E" />
+        </node>
+        <node concept="3Tm1VV" id="3XUOzowrDNh" role="1B3o_S" />
+      </node>
+      <node concept="3clFb_" id="3XUOzowrzQh" role="jymVt">
+        <property role="TrG5h" value="set" />
+        <node concept="3clFbS" id="3XUOzowrzQk" role="3clF47">
+          <node concept="3clFbF" id="3XUOzowrzS8" role="3cqZAp">
+            <node concept="37vLTI" id="3XUOzowrCCi" role="3clFbG">
+              <node concept="37vLTw" id="3XUOzowrCDF" role="37vLTx">
+                <ref role="3cqZAo" node="3XUOzowrzR7" resolve="e" />
+              </node>
+              <node concept="2OqwBi" id="3XUOzowr$I7" role="37vLTJ">
+                <node concept="Xjq3P" id="3XUOzowrzS7" role="2Oq$k0" />
+                <node concept="2OwXpG" id="3XUOzowr_$2" role="2OqNvi">
+                  <ref role="2Oxat5" node="3XUOzowrzJG" resolve="value" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cqZAl" id="3XUOzowrzPA" role="3clF45" />
+        <node concept="37vLTG" id="3XUOzowrzR7" role="3clF46">
+          <property role="TrG5h" value="e" />
+          <node concept="16syzq" id="3XUOzowrzR6" role="1tU5fm">
+            <ref role="16sUi3" node="3XUOzowrzI0" resolve="E" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="3XUOzowrDO_" role="1B3o_S" />
+      </node>
+      <node concept="3Tm1VV" id="3XUOzowrzH7" role="1B3o_S" />
+      <node concept="16euLQ" id="3XUOzowrzI0" role="16eVyc">
+        <property role="TrG5h" value="E" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3XUOzows2ya" role="jymVt" />
+    <node concept="2YIFZL" id="3XUOzowrI$P" role="jymVt">
+      <property role="TrG5h" value="main" />
+      <node concept="3clFbS" id="3XUOzowrI$S" role="3clF47">
+        <node concept="3clFbH" id="3XUOzowrL8G" role="3cqZAp" />
+        <node concept="3cpWs8" id="3XUOzowrLHC" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowrLHD" role="3cpWs9">
+            <property role="TrG5h" value="x" />
+            <node concept="3uibUv" id="3XUOzowrLHE" role="1tU5fm">
+              <ref role="3uigEE" node="3XUOzowrzH6" resolve="RawConversions.Cell" />
+            </node>
+            <node concept="2ShNRf" id="3XUOzowrM$6" role="33vP2m">
+              <node concept="1pGfFk" id="3XUOzowrOcv" role="2ShVmc">
+                <ref role="37wK5l" node="3XUOzowrDY7" resolve="RawConversions.Cell" />
+                <node concept="3uibUv" id="3XUOzowrOOk" role="1pMfVU">
+                  <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+                </node>
+                <node concept="Xl_RD" id="3XUOzowrP88" role="37wK5m">
+                  <property role="Xl_RC" value="abc" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3XUOzowv7vH" role="3cqZAp" />
+        <node concept="3SKdUt" id="3XUOzowsn7R" role="3cqZAp">
+          <node concept="1PaTwC" id="3XUOzowsn7S" role="3ndbpf">
+            <node concept="3oM_SD" id="3XUOzowsn7U" role="1PaTwD">
+              <property role="3oM_SC" value="ok," />
+            </node>
+            <node concept="3oM_SD" id="3XUOzowsqO5" role="1PaTwD">
+              <property role="3oM_SC" value="accepted" />
+            </node>
+            <node concept="3oM_SD" id="3XUOzowsoRG" role="1PaTwD">
+              <property role="3oM_SC" value="type" />
+            </node>
+            <node concept="3oM_SD" id="3XUOzowsp9s" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="3XUOzowspGU" role="1PaTwD">
+              <property role="3oM_SC" value="Object" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3XUOzowrPZW" role="3cqZAp">
+          <node concept="2OqwBi" id="3XUOzowrPZT" role="3clFbG">
+            <node concept="10M0yZ" id="3XUOzowrPZU" role="2Oq$k0">
+              <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+              <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
+            </node>
+            <node concept="liA8E" id="3XUOzowrPZV" role="2OqNvi">
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object)" resolve="println" />
+              <node concept="2OqwBi" id="3XUOzowrSZj" role="37wK5m">
+                <node concept="37vLTw" id="3XUOzowrQEs" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3XUOzowrLHD" resolve="x" />
+                </node>
+                <node concept="2OwXpG" id="3XUOzowrTPa" role="2OqNvi">
+                  <ref role="2Oxat5" node="3XUOzowrzJG" resolve="value" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3XUOzowrW82" role="3cqZAp">
+          <node concept="2OqwBi" id="3XUOzowrW7Z" role="3clFbG">
+            <node concept="10M0yZ" id="3XUOzowrW80" role="2Oq$k0">
+              <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+              <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
+            </node>
+            <node concept="liA8E" id="3XUOzowrW81" role="2OqNvi">
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object)" resolve="println" />
+              <node concept="2OqwBi" id="3XUOzowrZUa" role="37wK5m">
+                <node concept="37vLTw" id="3XUOzowrX_j" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3XUOzowrLHD" resolve="x" />
+                </node>
+                <node concept="liA8E" id="3XUOzowsa6h" role="2OqNvi">
+                  <ref role="37wK5l" node="3XUOzowrzLl" resolve="get" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="3XUOzowst7$" role="3cqZAp">
+          <node concept="1PaTwC" id="3XUOzowst7_" role="3ndbpf">
+            <node concept="3oM_SD" id="3XUOzowst7B" role="1PaTwD">
+              <property role="3oM_SC" value="unchecked" />
+            </node>
+            <node concept="3oM_SD" id="3XUOzowsyMB" role="1PaTwD">
+              <property role="3oM_SC" value="warning" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3XUOzowsgvv" role="3cqZAp">
+          <node concept="2OqwBi" id="3XUOzowsiwI" role="3clFbG">
+            <node concept="37vLTw" id="3XUOzowsgvt" role="2Oq$k0">
+              <ref role="3cqZAo" node="3XUOzowrLHD" resolve="x" />
+            </node>
+            <node concept="liA8E" id="3XUOzowsjCh" role="2OqNvi">
+              <ref role="37wK5l" node="3XUOzowrzQh" resolve="set" />
+              <node concept="Xl_RD" id="3XUOzowsz4D" role="37wK5m">
+                <property role="Xl_RC" value="blah" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3XUOzows$wm" role="3cqZAp" />
+        <node concept="3cpWs8" id="3XUOzowsCVI" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowsCVJ" role="3cpWs9">
+            <property role="TrG5h" value="x0" />
+            <node concept="3uibUv" id="3XUOzowsCVK" role="1tU5fm">
+              <ref role="3uigEE" node="3XUOzowrzH6" resolve="RawConversions.Cell" />
+            </node>
+            <node concept="37vLTw" id="3XUOzowsGGm" role="33vP2m">
+              <ref role="3cqZAo" node="3XUOzowrLHD" resolve="x" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3XUOzowtYx3" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowtYx4" role="3cpWs9">
+            <property role="TrG5h" value="c00" />
+            <node concept="3uibUv" id="3XUOzowu10m" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+            <node concept="2OqwBi" id="3XUOzowtYx6" role="33vP2m">
+              <node concept="37vLTw" id="3XUOzowu7wZ" role="2Oq$k0">
+                <ref role="3cqZAo" node="3XUOzowsCVJ" resolve="x0" />
+              </node>
+              <node concept="liA8E" id="3XUOzowtYx8" role="2OqNvi">
+                <ref role="37wK5l" node="3XUOzowrzLl" resolve="get" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3XUOzowtPQM" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowtPQN" role="3cpWs9">
+            <property role="TrG5h" value="c0a" />
+            <node concept="3uibUv" id="3XUOzowtPQO" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+            </node>
+            <node concept="2OqwBi" id="3XUOzowtPQP" role="33vP2m">
+              <node concept="37vLTw" id="3XUOzowu6Wk" role="2Oq$k0">
+                <ref role="3cqZAo" node="3XUOzowsCVJ" resolve="x0" />
+              </node>
+              <node concept="liA8E" id="3XUOzowtPQR" role="2OqNvi">
+                <ref role="37wK5l" node="3XUOzowrzLl" resolve="get" />
+              </node>
+            </node>
+            <node concept="1U20sH" id="3XUOzowu6nF" role="lGtFl">
+              <property role="1U20sK" value="error" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3XUOzowtTaZ" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowtTb0" role="3cpWs9">
+            <property role="TrG5h" value="c0b" />
+            <node concept="3uibUv" id="3XUOzowtWe1" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+            </node>
+            <node concept="2OqwBi" id="3XUOzowtTb2" role="33vP2m">
+              <node concept="37vLTw" id="3XUOzowu85E" role="2Oq$k0">
+                <ref role="3cqZAo" node="3XUOzowsCVJ" resolve="x0" />
+              </node>
+              <node concept="liA8E" id="3XUOzowtTb4" role="2OqNvi">
+                <ref role="37wK5l" node="3XUOzowrzLl" resolve="get" />
+              </node>
+            </node>
+            <node concept="1U20sH" id="3XUOzowu8Ec" role="lGtFl">
+              <property role="1U20sK" value="error" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3XUOzowu3TV" role="3cqZAp" />
+        <node concept="3SKdUt" id="3XUOzowu9er" role="3cqZAp">
+          <node concept="1PaTwC" id="3XUOzowu9es" role="3ndbpf">
+            <node concept="3oM_SD" id="3XUOzowu9et" role="1PaTwD">
+              <property role="3oM_SC" value="unchecked" />
+            </node>
+            <node concept="3oM_SD" id="1GAclsBkzjN" role="1PaTwD">
+              <property role="3oM_SC" value="conversion" />
+            </node>
+            <node concept="3oM_SD" id="3XUOzowu9eu" role="1PaTwD">
+              <property role="3oM_SC" value="warning" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3XUOzowsIJt" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowsIJz" role="3cpWs9">
+            <property role="TrG5h" value="x1" />
+            <node concept="3uibUv" id="3XUOzowsIJ_" role="1tU5fm">
+              <ref role="3uigEE" node="3XUOzowrzH6" resolve="RawConversions.Cell" />
+              <node concept="3uibUv" id="3XUOzowsKxj" role="11_B2D">
+                <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="3XUOzowsMND" role="33vP2m">
+              <ref role="3cqZAo" node="3XUOzowsCVJ" resolve="x0" />
+            </node>
+            <node concept="1U20sH" id="1GAclsBkC6e" role="lGtFl">
+              <property role="1U20sK" value="error" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1GAclsBkP1I" role="3cqZAp" />
+        <node concept="3cpWs8" id="3XUOzowvnbU" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowvnbV" role="3cpWs9">
+            <property role="TrG5h" value="x0b" />
+            <node concept="3uibUv" id="3XUOzowvnbW" role="1tU5fm">
+              <ref role="3uigEE" node="3XUOzowrzH6" resolve="RawConversions.Cell" />
+            </node>
+            <node concept="37vLTw" id="3XUOzowvsq$" role="33vP2m">
+              <ref role="3cqZAo" node="3XUOzowsIJz" resolve="x1" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3XUOzowuc7n" role="3cqZAp" />
+        <node concept="3cpWs8" id="3XUOzowtJ9R" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowtJ9S" role="3cpWs9">
+            <property role="TrG5h" value="c1" />
+            <node concept="3uibUv" id="3XUOzowtLz6" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+            </node>
+            <node concept="2OqwBi" id="3XUOzowtJ9U" role="33vP2m">
+              <node concept="37vLTw" id="3XUOzowtPia" role="2Oq$k0">
+                <ref role="3cqZAo" node="3XUOzowsIJz" resolve="x1" />
+              </node>
+              <node concept="liA8E" id="3XUOzowtJ9W" role="2OqNvi">
+                <ref role="37wK5l" node="3XUOzowrzLl" resolve="get" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3XUOzowsXBv" role="3cqZAp">
+          <node concept="2OqwBi" id="3XUOzowsYud" role="3clFbG">
+            <node concept="37vLTw" id="3XUOzowsXBt" role="2Oq$k0">
+              <ref role="3cqZAo" node="3XUOzowsIJz" resolve="x1" />
+            </node>
+            <node concept="liA8E" id="3XUOzowt1mb" role="2OqNvi">
+              <ref role="37wK5l" node="3XUOzowrzQh" resolve="set" />
+              <node concept="Xl_RD" id="3XUOzowt2cQ" role="37wK5m">
+                <property role="Xl_RC" value="blah-blah" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3XUOzowt6MU" role="3cqZAp">
+          <node concept="2OqwBi" id="3XUOzowt7DH" role="3clFbG">
+            <node concept="37vLTw" id="3XUOzowt6MS" role="2Oq$k0">
+              <ref role="3cqZAo" node="3XUOzowsIJz" resolve="x1" />
+            </node>
+            <node concept="liA8E" id="3XUOzowt8v_" role="2OqNvi">
+              <ref role="37wK5l" node="3XUOzowrzQh" resolve="set" />
+              <node concept="3cmrfG" id="3XUOzowtazm" role="37wK5m">
+                <property role="3cmrfH" value="42" />
+                <node concept="1U20sH" id="7l$juG4$Avw" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3XUOzowuZwo" role="3cqZAp" />
+        <node concept="3SKdUt" id="3XUOzowtAGt" role="3cqZAp">
+          <node concept="1PaTwC" id="3XUOzowtAGu" role="3ndbpf">
+            <node concept="3oM_SD" id="3XUOzowtAGw" role="1PaTwD">
+              <property role="3oM_SC" value="unchecked" />
+            </node>
+            <node concept="3oM_SD" id="1GAclsBkApZ" role="1PaTwD">
+              <property role="3oM_SC" value="conversion" />
+            </node>
+            <node concept="3oM_SD" id="3XUOzowtDBp" role="1PaTwD">
+              <property role="3oM_SC" value="warning" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3XUOzowsOQW" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowsOR2" role="3cpWs9">
+            <property role="TrG5h" value="x2" />
+            <node concept="3uibUv" id="3XUOzowsOR4" role="1tU5fm">
+              <ref role="3uigEE" node="3XUOzowrzH6" resolve="RawConversions.Cell" />
+              <node concept="3uibUv" id="3XUOzowsQCP" role="11_B2D">
+                <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="3XUOzowsSV1" role="33vP2m">
+              <ref role="3cqZAo" node="3XUOzowsCVJ" resolve="x0" />
+            </node>
+            <node concept="1U20sH" id="1GAclsBkD0C" role="lGtFl">
+              <property role="1U20sK" value="error" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1GAclsBkDX6" role="3cqZAp" />
+        <node concept="3cpWs8" id="3XUOzowsTde" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowsTdf" role="3cpWs9">
+            <property role="TrG5h" value="x2a" />
+            <node concept="3uibUv" id="3XUOzowsTdg" role="1tU5fm">
+              <ref role="3uigEE" node="3XUOzowrzH6" resolve="RawConversions.Cell" />
+              <node concept="3uibUv" id="3XUOzowsTdh" role="11_B2D">
+                <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="3XUOzowsVzD" role="33vP2m">
+              <ref role="3cqZAo" node="3XUOzowsIJz" resolve="x1" />
+            </node>
+            <node concept="1U20sH" id="3XUOzowsVhm" role="lGtFl">
+              <property role="1U20sK" value="error" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3XUOzowv4Pz" role="3cqZAp" />
+        <node concept="3cpWs8" id="3XUOzowtsMm" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowtsMn" role="3cpWs9">
+            <property role="TrG5h" value="c2" />
+            <node concept="3uibUv" id="3XUOzowtsMo" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+            </node>
+            <node concept="2OqwBi" id="3XUOzowtx6v" role="33vP2m">
+              <node concept="37vLTw" id="3XUOzowtwgR" role="2Oq$k0">
+                <ref role="3cqZAo" node="3XUOzowsOR2" resolve="x2" />
+              </node>
+              <node concept="liA8E" id="3XUOzowtyes" role="2OqNvi">
+                <ref role="37wK5l" node="3XUOzowrzLl" resolve="get" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3XUOzowtFic" role="3cqZAp">
+          <node concept="2OqwBi" id="3XUOzowtFid" role="3clFbG">
+            <node concept="37vLTw" id="3XUOzowtHF1" role="2Oq$k0">
+              <ref role="3cqZAo" node="3XUOzowsOR2" resolve="x2" />
+            </node>
+            <node concept="liA8E" id="3XUOzowtFif" role="2OqNvi">
+              <ref role="37wK5l" node="3XUOzowrzQh" resolve="set" />
+              <node concept="Xl_RD" id="3XUOzowtFig" role="37wK5m">
+                <property role="Xl_RC" value="blah-blah" />
+                <node concept="1U20sH" id="7l$juG4$Cby" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3XUOzowtiST" role="3cqZAp">
+          <node concept="2OqwBi" id="3XUOzowtjIw" role="3clFbG">
+            <node concept="37vLTw" id="3XUOzowtiSR" role="2Oq$k0">
+              <ref role="3cqZAo" node="3XUOzowsOR2" resolve="x2" />
+            </node>
+            <node concept="liA8E" id="3XUOzowtm58" role="2OqNvi">
+              <ref role="37wK5l" node="3XUOzowrzQh" resolve="set" />
+              <node concept="3cmrfG" id="3XUOzowtndO" role="37wK5m">
+                <property role="3cmrfH" value="42" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3XUOzowrIy7" role="1B3o_S" />
+      <node concept="3cqZAl" id="3XUOzowrI$E" role="3clF45" />
+      <node concept="37vLTG" id="3XUOzowrIBr" role="3clF46">
+        <property role="TrG5h" value="args" />
+        <node concept="10Q1$e" id="3XUOzowrJbg" role="1tU5fm">
+          <node concept="17QB3L" id="3XUOzowvfKJ" role="10Q1$1" />
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="3XUOzowrzqj" role="1B3o_S" />
+  </node>
 </model>
 
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 ee8b559f..3e025253 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
@@ -7062,7 +7062,7 @@
     <node concept="3Tm1VV" id="7lCg3YbuczY" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="6_5E9TNDqeq">
-    <property role="TrG5h" value="OverridingAndErasure" />
+    <property role="TrG5h" value="MethodOverridingAndErasure" />
     <node concept="2tJIrI" id="6_5E9TNDzG8" role="jymVt" />
     <node concept="312cEu" id="6_5E9TND_19" role="jymVt">
       <property role="2bfB8j" value="true" />
@@ -7073,8 +7073,8 @@
           <property role="TrG5h" value="col" />
           <node concept="3uibUv" id="6_5E9TNDHcn" role="1tU5fm">
             <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-            <node concept="16syzq" id="6_5E9TNDHE6" role="11_B2D">
-              <ref role="16sUi3" node="6_5E9TNDFii" resolve="T" />
+            <node concept="16syzq" id="1GAclsBt5AD" role="11_B2D">
+              <ref role="16sUi3" node="6_5E9TNDAUX" resolve="T" />
             </node>
           </node>
         </node>
@@ -7090,13 +7090,10 @@
           </node>
         </node>
         <node concept="3Tm1VV" id="6_5E9TNDDWt" role="1B3o_S" />
-        <node concept="16euLQ" id="6_5E9TNDFii" role="16eVyc">
-          <property role="TrG5h" value="T" />
-        </node>
         <node concept="3uibUv" id="6_5E9TNDGai" role="3clF45">
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="16syzq" id="6_5E9TNDGen" role="11_B2D">
-            <ref role="16sUi3" node="6_5E9TNDFii" resolve="T" />
+          <node concept="16syzq" id="1GAclsBt4kI" role="11_B2D">
+            <ref role="16sUi3" node="6_5E9TNDAUX" resolve="T" />
           </node>
         </node>
       </node>
@@ -7105,60 +7102,278 @@
         <property role="TrG5h" value="T" />
       </node>
     </node>
-    <node concept="2tJIrI" id="6_5E9TNDW04" role="jymVt" />
-    <node concept="2tJIrI" id="6_5E9TNDW0m" role="jymVt" />
-    <node concept="312cEu" id="6_5E9TNDWWw" role="jymVt">
+    <node concept="2tJIrI" id="1GAclsBysZv" role="jymVt" />
+    <node concept="2tJIrI" id="1GAclsBGqeU" role="jymVt" />
+    <node concept="2tJIrI" id="1GAclsBGqk1" role="jymVt" />
+    <node concept="312cEu" id="1GAclsBypAG" role="jymVt">
       <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="OverriderRaw" />
-      <node concept="3clFb_" id="6_5E9TNE3PE" role="jymVt">
+      <property role="TrG5h" value="OverriderString1" />
+      <node concept="3clFb_" id="1GAclsBypAH" role="jymVt">
         <property role="TrG5h" value="toList" />
-        <node concept="3clFbS" id="6_5E9TNE3PH" role="3clF47">
-          <node concept="3SKdUt" id="72cCUitZmAx" role="3cqZAp">
-            <node concept="1PaTwC" id="72cCUitZmAy" role="3ndbpf">
-              <node concept="3oM_SD" id="72cCUitZmAz" role="1PaTwD">
-                <property role="3oM_SC" value="NB:" />
+        <node concept="3clFbS" id="1GAclsBypAI" role="3clF47">
+          <node concept="3cpWs6" id="1GAclsBypAZ" role="3cqZAp">
+            <node concept="10Nm6u" id="1GAclsBypB0" role="3cqZAk" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="1GAclsBypB1" role="3clF45">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+          <node concept="3uibUv" id="1GAclsBypB2" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="1GAclsBypB3" role="3clF46">
+          <property role="TrG5h" value="col" />
+          <node concept="3uibUv" id="1GAclsBypB4" role="1tU5fm">
+            <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+            <node concept="3uibUv" id="1GAclsBy$AS" role="11_B2D">
+              <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="1GAclsBypB6" role="1B3o_S" />
+      </node>
+      <node concept="3Tm1VV" id="1GAclsBypB7" role="1B3o_S" />
+      <node concept="3uibUv" id="1GAclsBypB8" role="1zkMxy">
+        <ref role="3uigEE" node="6_5E9TND_19" resolve="MethodOverridingAndErasure.CollectionConverter" />
+        <node concept="3uibUv" id="1GAclsBypB9" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+        </node>
+      </node>
+    </node>
+    <node concept="312cEu" id="1GAclsBxBK2" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="OverriderString1Arg" />
+      <node concept="3clFb_" id="1GAclsBxBK3" role="jymVt">
+        <property role="TrG5h" value="toList" />
+        <node concept="3clFbS" id="1GAclsBxBK4" role="3clF47">
+          <node concept="3cpWs6" id="1GAclsBxBKl" role="3cqZAp">
+            <node concept="10Nm6u" id="1GAclsBxBKm" role="3cqZAk" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="1GAclsBxBKn" role="3clF45">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+          <node concept="3uibUv" id="1GAclsBxWWo" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="1GAclsBxBKo" role="3clF46">
+          <property role="TrG5h" value="col" />
+          <node concept="3uibUv" id="1GAclsBxBKp" role="1tU5fm">
+            <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+            <node concept="17QB3L" id="1GAclsBxBKq" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="1GAclsBxBKr" role="1B3o_S" />
+        <node concept="1U20sH" id="1GAclsBL9p0" role="lGtFl">
+          <property role="1U20sK" value="error" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="1GAclsBxBKs" role="1B3o_S" />
+      <node concept="3uibUv" id="1GAclsBxBKt" role="1zkMxy">
+        <ref role="3uigEE" node="6_5E9TND_19" resolve="MethodOverridingAndErasure.CollectionConverter" />
+        <node concept="3uibUv" id="1GAclsBxJvl" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+        </node>
+      </node>
+    </node>
+    <node concept="312cEu" id="1GAclsBxBKv" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="OverriderString1RetArg" />
+      <node concept="3clFb_" id="1GAclsBxBKw" role="jymVt">
+        <property role="TrG5h" value="toList" />
+        <node concept="3clFbS" id="1GAclsBxBKx" role="3clF47">
+          <node concept="3cpWs6" id="1GAclsBxBKM" role="3cqZAp">
+            <node concept="10Nm6u" id="1GAclsBxBKN" role="3cqZAk" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="1GAclsBxBKO" role="3clF45">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+          <node concept="17QB3L" id="1GAclsBxBKP" role="11_B2D" />
+        </node>
+        <node concept="37vLTG" id="1GAclsBxBKQ" role="3clF46">
+          <property role="TrG5h" value="col" />
+          <node concept="3uibUv" id="1GAclsBxBKR" role="1tU5fm">
+            <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+            <node concept="17QB3L" id="1GAclsBxBKS" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="1GAclsBxBKT" role="1B3o_S" />
+        <node concept="1U20sH" id="1GAclsByoC6" role="lGtFl">
+          <property role="1U20sK" value="error" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="1GAclsBxBKU" role="1B3o_S" />
+      <node concept="3uibUv" id="1GAclsBxBKV" role="1zkMxy">
+        <ref role="3uigEE" node="6_5E9TND_19" resolve="MethodOverridingAndErasure.CollectionConverter" />
+        <node concept="3uibUv" id="1GAclsBxN3M" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+        </node>
+      </node>
+    </node>
+    <node concept="312cEu" id="1GAclsBxBKX" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="OverriderString1Ret" />
+      <node concept="3clFb_" id="1GAclsBxBKY" role="jymVt">
+        <property role="TrG5h" value="toList" />
+        <node concept="3clFbS" id="1GAclsBxBKZ" role="3clF47">
+          <node concept="3SKdUt" id="1GAclsByfXX" role="3cqZAp">
+            <node concept="1PaTwC" id="1GAclsByfXY" role="3ndbpf">
+              <node concept="3oM_SD" id="1GAclsByfY0" role="1PaTwD">
+                <property role="3oM_SC" value="return" />
               </node>
-              <node concept="3oM_SD" id="72cCUitZmA$" role="1PaTwD">
-                <property role="3oM_SC" value="note" />
-              </node>
-              <node concept="3oM_SD" id="72cCUitZmA_" role="1PaTwD">
-                <property role="3oM_SC" value="inheritance" />
-              </node>
-              <node concept="3oM_SD" id="72cCUitZmAA" role="1PaTwD">
-                <property role="3oM_SC" value="from" />
-              </node>
-              <node concept="3oM_SD" id="72cCUitZmAB" role="1PaTwD">
-                <property role="3oM_SC" value="raw" />
-              </node>
-              <node concept="3oM_SD" id="72cCUitZmAC" role="1PaTwD">
+              <node concept="3oM_SD" id="1GAclsByhug" role="1PaTwD">
                 <property role="3oM_SC" value="type" />
               </node>
+              <node concept="3oM_SD" id="1GAclsByiAp" role="1PaTwD">
+                <property role="3oM_SC" value="is" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsByjas" role="1PaTwD">
+                <property role="3oM_SC" value="not" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsByjIw" role="1PaTwD">
+                <property role="3oM_SC" value="compatible" />
+              </node>
             </node>
           </node>
-          <node concept="3cpWs6" id="6_5E9TNFcdx" role="3cqZAp">
-            <node concept="10Nm6u" id="6_5E9TNFcdy" role="3cqZAk" />
+          <node concept="3cpWs6" id="1GAclsBxBL0" role="3cqZAp">
+            <node concept="10Nm6u" id="1GAclsBxBL1" role="3cqZAk" />
           </node>
         </node>
-        <node concept="3uibUv" id="6_5E9TNE3m2" role="3clF45">
+        <node concept="3uibUv" id="1GAclsBxBL2" role="3clF45">
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
+          <node concept="17QB3L" id="1GAclsBxBL3" role="11_B2D" />
         </node>
-        <node concept="37vLTG" id="6_5E9TNE4JD" role="3clF46">
+        <node concept="37vLTG" id="1GAclsBxBL4" role="3clF46">
           <property role="TrG5h" value="col" />
-          <node concept="3uibUv" id="6_5E9TNE4JC" role="1tU5fm">
+          <node concept="3uibUv" id="1GAclsBxBL5" role="1tU5fm">
             <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+            <node concept="3uibUv" id="1GAclsBy0Y0" role="11_B2D">
+              <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+            </node>
           </node>
         </node>
-        <node concept="3Tm1VV" id="6_5E9TNE6gV" role="1B3o_S" />
+        <node concept="3Tm1VV" id="1GAclsBxBL6" role="1B3o_S" />
+        <node concept="1U20sH" id="1GAclsBynFe" role="lGtFl">
+          <property role="1U20sK" value="error" />
+        </node>
       </node>
-      <node concept="3Tm1VV" id="6_5E9TNDWu$" role="1B3o_S" />
-      <node concept="3uibUv" id="6_5E9TNE0hj" role="1zkMxy">
-        <ref role="3uigEE" node="6_5E9TND_19" resolve="OverridingAndErasure.CollectionConverter" />
+      <node concept="3Tm1VV" id="1GAclsBxBL7" role="1B3o_S" />
+      <node concept="3uibUv" id="1GAclsBxBL8" role="1zkMxy">
+        <ref role="3uigEE" node="6_5E9TND_19" resolve="MethodOverridingAndErasure.CollectionConverter" />
+        <node concept="3uibUv" id="1GAclsBxQXL" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1GAclsBxBkU" role="jymVt" />
+    <node concept="2tJIrI" id="1GAclsBGjPn" role="jymVt" />
+    <node concept="2tJIrI" id="1GAclsBGjUr" role="jymVt" />
+    <node concept="312cEu" id="1GAclsBF2Ka" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="OverriderContravariantArgOverload" />
+      <node concept="3clFb_" id="1GAclsBF2Kb" role="jymVt">
+        <property role="TrG5h" value="toList" />
+        <node concept="3clFbS" id="1GAclsBF2Kc" role="3clF47">
+          <node concept="3cpWs6" id="1GAclsBF2Kt" role="3cqZAp">
+            <node concept="10Nm6u" id="1GAclsBF2Ku" role="3cqZAk" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="1GAclsBF2Kv" role="3clF45">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+          <node concept="3uibUv" id="1GAclsBF2Kw" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="1GAclsBF2Kx" role="3clF46">
+          <property role="TrG5h" value="col" />
+          <node concept="3uibUv" id="1GAclsBF_RI" role="1tU5fm">
+            <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
+            <node concept="3uibUv" id="1GAclsBFD_O" role="11_B2D">
+              <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="1GAclsBF2K$" role="1B3o_S" />
+      </node>
+      <node concept="3Tm1VV" id="1GAclsBF2K_" role="1B3o_S" />
+      <node concept="3uibUv" id="1GAclsBF2KA" role="1zkMxy">
+        <ref role="3uigEE" node="6_5E9TND_19" resolve="MethodOverridingAndErasure.CollectionConverter" />
+        <node concept="3uibUv" id="1GAclsBF2KB" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+        </node>
+      </node>
+    </node>
+    <node concept="312cEu" id="1GAclsBFR3b" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="OverriderCovariantArgOverload" />
+      <node concept="3clFb_" id="1GAclsBFR3c" role="jymVt">
+        <property role="TrG5h" value="toList" />
+        <node concept="3clFbS" id="1GAclsBFR3d" role="3clF47">
+          <node concept="3cpWs6" id="1GAclsBFR3r" role="3cqZAp">
+            <node concept="10Nm6u" id="1GAclsBFR3s" role="3cqZAk" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="1GAclsBFR3t" role="3clF45">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+          <node concept="3uibUv" id="1GAclsBFR3u" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="1GAclsBFR3v" role="3clF46">
+          <property role="TrG5h" value="col" />
+          <node concept="3uibUv" id="1GAclsBFR3w" role="1tU5fm">
+            <ref role="3uigEE" to="33ny:~List" resolve="List" />
+            <node concept="3uibUv" id="1GAclsBFR3x" role="11_B2D">
+              <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="1GAclsBFR3y" role="1B3o_S" />
+      </node>
+      <node concept="3Tm1VV" id="1GAclsBFR3$" role="1B3o_S" />
+      <node concept="3uibUv" id="1GAclsBFR3_" role="1zkMxy">
+        <ref role="3uigEE" node="6_5E9TND_19" resolve="MethodOverridingAndErasure.CollectionConverter" />
+        <node concept="3uibUv" id="1GAclsBFR3A" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6_5E9TNDW04" role="jymVt" />
+    <node concept="2tJIrI" id="1GAclsBwJxw" role="jymVt" />
+    <node concept="2tJIrI" id="1GAclsBGn4E" role="jymVt" />
+    <node concept="312cEu" id="1GAclsBwIbS" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="OverriderRawString1Arg" />
+      <node concept="3clFb_" id="1GAclsBwIbT" role="jymVt">
+        <property role="TrG5h" value="toList" />
+        <node concept="3clFbS" id="1GAclsBwIbU" role="3clF47">
+          <node concept="3cpWs6" id="1GAclsBwIcb" role="3cqZAp">
+            <node concept="10Nm6u" id="1GAclsBwIcc" role="3cqZAk" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="1GAclsBwIcd" role="3clF45">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+        </node>
+        <node concept="37vLTG" id="1GAclsBwIcf" role="3clF46">
+          <property role="TrG5h" value="col" />
+          <node concept="3uibUv" id="1GAclsBwIcg" role="1tU5fm">
+            <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+            <node concept="17QB3L" id="1GAclsBwIch" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="1GAclsBwIci" role="1B3o_S" />
+        <node concept="1U20sH" id="1GAclsBLcO7" role="lGtFl">
+          <property role="1U20sK" value="error" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="1GAclsBwIcj" role="1B3o_S" />
+      <node concept="3uibUv" id="1GAclsBwIck" role="1zkMxy">
+        <ref role="3uigEE" node="6_5E9TND_19" resolve="MethodOverridingAndErasure.CollectionConverter" />
       </node>
     </node>
-    <node concept="2tJIrI" id="72cCUitZk$P" role="jymVt" />
     <node concept="312cEu" id="72cCUitZkcr" role="jymVt">
       <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="OverriderString1" />
+      <property role="TrG5h" value="OverriderRawString1RetArg" />
       <node concept="3clFb_" id="72cCUitZkcs" role="jymVt">
         <property role="TrG5h" value="toList" />
         <node concept="3clFbS" id="72cCUitZkct" role="3clF47">
@@ -7178,22 +7393,167 @@
           </node>
         </node>
         <node concept="3Tm1VV" id="72cCUitZkcz" role="1B3o_S" />
-        <node concept="1U20sH" id="72cCUitZmx4" role="lGtFl">
+        <node concept="1U20sH" id="1GAclsByI23" role="lGtFl">
           <property role="1U20sK" value="error" />
         </node>
       </node>
       <node concept="3Tm1VV" id="72cCUitZkc$" role="1B3o_S" />
       <node concept="3uibUv" id="72cCUitZkc_" role="1zkMxy">
-        <ref role="3uigEE" node="6_5E9TND_19" resolve="OverridingAndErasure.CollectionConverter" />
+        <ref role="3uigEE" node="6_5E9TND_19" resolve="MethodOverridingAndErasure.CollectionConverter" />
+      </node>
+    </node>
+    <node concept="312cEu" id="1GAclsBwWRQ" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="OverriderRawString1Ret" />
+      <node concept="3clFb_" id="1GAclsBwWRR" role="jymVt">
+        <property role="TrG5h" value="toList" />
+        <node concept="3clFbS" id="1GAclsBwWRS" role="3clF47">
+          <node concept="3cpWs6" id="1GAclsBwWS9" role="3cqZAp">
+            <node concept="10Nm6u" id="1GAclsBwWSa" role="3cqZAk" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="1GAclsBwWSb" role="3clF45">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+          <node concept="17QB3L" id="1GAclsBxfk9" role="11_B2D" />
+        </node>
+        <node concept="37vLTG" id="1GAclsBwWSc" role="3clF46">
+          <property role="TrG5h" value="col" />
+          <node concept="3uibUv" id="1GAclsBwWSd" role="1tU5fm">
+            <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="1GAclsBwWSf" role="1B3o_S" />
+        <node concept="1U20sH" id="1GAclsByJZL" role="lGtFl">
+          <property role="1U20sK" value="error" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="1GAclsBwWSg" role="1B3o_S" />
+      <node concept="3uibUv" id="1GAclsBwWSh" role="1zkMxy">
+        <ref role="3uigEE" node="6_5E9TND_19" resolve="MethodOverridingAndErasure.CollectionConverter" />
       </node>
     </node>
     <node concept="2tJIrI" id="6_5E9TNF19M" role="jymVt" />
+    <node concept="2tJIrI" id="1GAclsByP81" role="jymVt" />
+    <node concept="312cEu" id="6_5E9TNDWWw" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="OverriderRaw" />
+      <node concept="3clFb_" id="6_5E9TNE3PE" role="jymVt">
+        <property role="TrG5h" value="toList" />
+        <node concept="3clFbS" id="6_5E9TNE3PH" role="3clF47">
+          <node concept="3cpWs6" id="6_5E9TNFcdx" role="3cqZAp">
+            <node concept="10Nm6u" id="6_5E9TNFcdy" role="3cqZAk" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="6_5E9TNE3m2" role="3clF45">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+        </node>
+        <node concept="37vLTG" id="6_5E9TNE4JD" role="3clF46">
+          <property role="TrG5h" value="col" />
+          <node concept="3uibUv" id="6_5E9TNE4JC" role="1tU5fm">
+            <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="6_5E9TNE6gV" role="1B3o_S" />
+      </node>
+      <node concept="3Tm1VV" id="6_5E9TNDWu$" role="1B3o_S" />
+      <node concept="3uibUv" id="6_5E9TNE0hj" role="1zkMxy">
+        <ref role="3uigEE" node="6_5E9TND_19" resolve="MethodOverridingAndErasure.CollectionConverter" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1GAclsBxkfK" role="jymVt" />
+    <node concept="2tJIrI" id="1GAclsBGtvD" role="jymVt" />
+    <node concept="2tJIrI" id="1GAclsBySgx" role="jymVt" />
     <node concept="312cEu" id="6_5E9TNF1$Z" role="jymVt">
       <property role="2bfB8j" value="true" />
       <property role="TrG5h" value="OverriderString2" />
       <node concept="3clFb_" id="6_5E9TNF1_0" role="jymVt">
         <property role="TrG5h" value="toList" />
         <node concept="3clFbS" id="6_5E9TNF1_1" role="3clF47">
+          <node concept="3SKdUt" id="1GAclsByXo1" role="3cqZAp">
+            <node concept="1PaTwC" id="1GAclsByXo2" role="3ndbpf">
+              <node concept="3oM_SD" id="1GAclsByXo4" role="1PaTwD">
+                <property role="3oM_SC" value="fixme:" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsByZSc" role="1PaTwD">
+                <property role="3oM_SC" value="must" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBz10l" role="1PaTwD">
+                <property role="3oM_SC" value="somehow" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBz2Gu" role="1PaTwD">
+                <property role="3oM_SC" value="specify" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBz4oK" role="1PaTwD">
+                <property role="3oM_SC" value="here" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBz6Dd" role="1PaTwD">
+                <property role="3oM_SC" value="in" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBz7Ly" role="1PaTwD">
+                <property role="3oM_SC" value="typesystem" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBza_P" role="1PaTwD">
+                <property role="3oM_SC" value="that" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBzb9X" role="1PaTwD">
+                <property role="3oM_SC" value="can't" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBzci5" role="1PaTwD">
+                <property role="3oM_SC" value="convert" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBzdYl" role="1PaTwD">
+                <property role="3oM_SC" value="to" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBzeyw" role="1PaTwD">
+                <property role="3oM_SC" value="Raw" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBzgf2" role="1PaTwD">
+                <property role="3oM_SC" value="type" />
+              </node>
+            </node>
+            <node concept="1PaTwC" id="1GAclsBzhnr" role="3ndbpf">
+              <node concept="3oM_SD" id="1GAclsBzhnq" role="1PaTwD">
+                <property role="3oM_SC" value="most" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBzhVS" role="1PaTwD">
+                <property role="3oM_SC" value="of" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBzivU" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBzjC4" role="1PaTwD">
+                <property role="3oM_SC" value="times" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBzkc8" role="1PaTwD">
+                <property role="3oM_SC" value="can." />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBzo8u" role="1PaTwD">
+                <property role="3oM_SC" value="here" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBzoGG" role="1PaTwD">
+                <property role="3oM_SC" value="can't." />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBzqoL" role="1PaTwD">
+                <property role="3oM_SC" value="see" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBzqX5" role="1PaTwD">
+                <property role="3oM_SC" value="promote_reflexive_raw" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBzw_L" role="1PaTwD">
+                <property role="3oM_SC" value="rule" />
+              </node>
+            </node>
+          </node>
+          <node concept="3SKdUt" id="1GAclsBsIgh" role="3cqZAp">
+            <node concept="1PaTwC" id="1GAclsBsIgi" role="3ndbpf">
+              <node concept="3oM_SD" id="1GAclsBsN4f" role="1PaTwD">
+                <property role="3oM_SC" value="unchecked" />
+              </node>
+              <node concept="3oM_SD" id="1GAclsBsPKf" role="1PaTwD">
+                <property role="3oM_SC" value="warning" />
+              </node>
+            </node>
+          </node>
           <node concept="3cpWs6" id="6_5E9TNFaOL" role="3cqZAp">
             <node concept="10Nm6u" id="6_5E9TNFbke" role="3cqZAk" />
           </node>
@@ -7206,19 +7566,46 @@
           <property role="TrG5h" value="col" />
           <node concept="3uibUv" id="6_5E9TNF1_6" role="1tU5fm">
             <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-            <node concept="17QB3L" id="72cCUiu3V3P" role="11_B2D" />
           </node>
         </node>
         <node concept="3Tm1VV" id="6_5E9TNF1_7" role="1B3o_S" />
-        <node concept="1U20sH" id="6_5E9TNFg6A" role="lGtFl">
+      </node>
+      <node concept="3Tm1VV" id="6_5E9TNF1_8" role="1B3o_S" />
+      <node concept="3uibUv" id="1GAclsBxqSb" role="1zkMxy">
+        <ref role="3uigEE" node="6_5E9TNDWWw" resolve="MethodOverridingAndErasure.OverriderRaw" />
+      </node>
+    </node>
+    <node concept="312cEu" id="5riDsNZKOUA" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="OverriderString3" />
+      <node concept="3clFb_" id="5riDsNZKOUB" role="jymVt">
+        <property role="TrG5h" value="toList" />
+        <node concept="3clFbS" id="5riDsNZKOUC" role="3clF47">
+          <node concept="3cpWs6" id="5riDsNZKOUD" role="3cqZAp">
+            <node concept="10Nm6u" id="5riDsNZKOUE" role="3cqZAk" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="5riDsNZKOUH" role="3clF46">
+          <property role="TrG5h" value="col" />
+          <node concept="3uibUv" id="5riDsNZKOUI" role="1tU5fm">
+            <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+            <node concept="17QB3L" id="5riDsNZKOUJ" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="5riDsNZKOUK" role="1B3o_S" />
+        <node concept="3uibUv" id="5riDsNZL58J" role="3clF45">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+        </node>
+        <node concept="1U20sH" id="1GAclsBLebp" role="lGtFl">
           <property role="1U20sK" value="error" />
         </node>
       </node>
-      <node concept="3Tm1VV" id="6_5E9TNF1_8" role="1B3o_S" />
-      <node concept="3uibUv" id="6_5E9TNF4n5" role="1zkMxy">
-        <ref role="3uigEE" node="6_5E9TNDWWw" resolve="OverridingAndErasure.OverriderRaw" />
+      <node concept="3Tm1VV" id="5riDsNZKOUM" role="1B3o_S" />
+      <node concept="3uibUv" id="1GAclsBxsRC" role="1zkMxy">
+        <ref role="3uigEE" node="6_5E9TNDWWw" resolve="MethodOverridingAndErasure.OverriderRaw" />
       </node>
     </node>
+    <node concept="2tJIrI" id="5riDsNZKKYU" role="jymVt" />
     <node concept="2tJIrI" id="6_5E9TNF1aj" role="jymVt" />
     <node concept="2tJIrI" id="72cCUitYqXZ" role="jymVt" />
     <node concept="312cEu" id="72cCUitYoUH" role="jymVt">
@@ -7256,47 +7643,19 @@
       </node>
       <node concept="3Tm1VV" id="72cCUitYoUU" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="6_5E9TNEaWJ" role="jymVt" />
     <node concept="312cEu" id="72cCUitYpTO" role="jymVt">
       <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="SorterOverriderRaw" />
+      <property role="TrG5h" value="OverriderSorterRaw" />
       <node concept="3clFb_" id="72cCUitYpTP" role="jymVt">
         <property role="TrG5h" value="toList" />
         <node concept="3clFbS" id="72cCUitYpTQ" role="3clF47">
-          <node concept="3SKdUt" id="72cCUitYqRK" role="3cqZAp">
-            <node concept="1PaTwC" id="72cCUitYqRL" role="3ndbpf">
-              <node concept="3oM_SD" id="72cCUitYqRN" role="1PaTwD">
-                <property role="3oM_SC" value="NB:" />
+          <node concept="3SKdUt" id="1GAclsBnsI4" role="3cqZAp">
+            <node concept="1PaTwC" id="1GAclsBnsI5" role="3ndbpf">
+              <node concept="3oM_SD" id="1GAclsBnsI7" role="1PaTwD">
+                <property role="3oM_SC" value="unchecked" />
               </node>
-              <node concept="3oM_SD" id="72cCUitYqWX" role="1PaTwD">
-                <property role="3oM_SC" value="javac" />
-              </node>
-              <node concept="3oM_SD" id="72cCUitYqX0" role="1PaTwD">
-                <property role="3oM_SC" value="fires" />
-              </node>
-              <node concept="3oM_SD" id="72cCUitYqXc" role="1PaTwD">
-                <property role="3oM_SC" value="only" />
-              </node>
-              <node concept="3oM_SD" id="72cCUitYqXh" role="1PaTwD">
-                <property role="3oM_SC" value="warning" />
-              </node>
-              <node concept="3oM_SD" id="72cCUitYrd2" role="1PaTwD">
-                <property role="3oM_SC" value="about" />
-              </node>
-              <node concept="3oM_SD" id="72cCUitYrdc" role="1PaTwD">
-                <property role="3oM_SC" value="unchecked/unsafe" />
-              </node>
-              <node concept="3oM_SD" id="72cCUitYrdB" role="1PaTwD">
-                <property role="3oM_SC" value="operations" />
-              </node>
-              <node concept="3oM_SD" id="72cCUitYqXn" role="1PaTwD">
-                <property role="3oM_SC" value="in" />
-              </node>
-              <node concept="3oM_SD" id="72cCUitYqXA" role="1PaTwD">
-                <property role="3oM_SC" value="this" />
-              </node>
-              <node concept="3oM_SD" id="72cCUitYqXI" role="1PaTwD">
-                <property role="3oM_SC" value="case" />
+              <node concept="3oM_SD" id="1GAclsBnxr9" role="1PaTwD">
+                <property role="3oM_SC" value="conversion" />
               </node>
             </node>
           </node>
@@ -7311,13 +7670,19 @@
           <property role="TrG5h" value="col" />
           <node concept="3uibUv" id="72cCUitYpTV" role="1tU5fm">
             <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+            <node concept="3uibUv" id="1GAclsBLgwP" role="11_B2D">
+              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+            </node>
           </node>
         </node>
         <node concept="3Tm1VV" id="72cCUitYpTW" role="1B3o_S" />
+        <node concept="1U20sH" id="1GAclsBmOJA" role="lGtFl">
+          <property role="1U20sK" value="error" />
+        </node>
       </node>
       <node concept="3Tm1VV" id="72cCUitYpTX" role="1B3o_S" />
       <node concept="3uibUv" id="72cCUitYqiv" role="1zkMxy">
-        <ref role="3uigEE" node="72cCUitYoUH" resolve="OverridingAndErasure.StringSorter" />
+        <ref role="3uigEE" node="72cCUitYoUH" resolve="MethodOverridingAndErasure.StringSorter" />
       </node>
     </node>
     <node concept="2tJIrI" id="72cCUitYoJE" role="jymVt" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps
index a5c19550..074d52ce 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps
@@ -501,6 +501,35 @@
         </node>
       </node>
     </node>
+    <node concept="1LZb2c" id="3XUOzow_cBQ" role="1SL9yI">
+      <property role="TrG5h" value="RawConversions" />
+      <node concept="3cqZAl" id="3XUOzow_cBR" role="3clF45" />
+      <node concept="3clFbS" id="3XUOzow_cBS" role="3clF47">
+        <node concept="2Hmddi" id="3XUOzow_cBT" role="3cqZAp">
+          <node concept="2OqwBi" id="3XUOzow_cBU" role="2Hmdds">
+            <node concept="2YIFZM" id="3XUOzow_cBV" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+              <node concept="2OqwBi" id="3XUOzow_cBW" role="37wK5m">
+                <node concept="2WthIp" id="3XUOzow_cBX" role="2Oq$k0" />
+                <node concept="2XshWL" id="3XUOzow_cBY" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="3XUOzow_cBZ" role="2XxRq1">
+                    <node concept="ZC_QK" id="3XUOzow_eOE" role="2tJFKM">
+                      <ref role="2aWVGs" to="yg5v:3XUOzowrzqi" resolve="RawConversions" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1jxXqW" id="3XUOzow_cC1" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="3XUOzow_cC2" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1LZb2c" id="Or3zaY2HX" role="1SL9yI">
       <property role="TrG5h" value="arrayTypes" />
       <node concept="3cqZAl" id="Or3zaY2HY" role="3clF45" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps
index 6cb874d0..44bb9e2e 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps
@@ -642,83 +642,36 @@
         <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
       </node>
     </node>
-    <node concept="1X3_iC" id="72cCUiu6jGm" role="lGtFl">
-      <property role="3V$3am" value="testMethods" />
-      <property role="3V$3ak" value="8585453e-6bfb-4d80-98de-b16074f1d86c/1216913645126/1217501895093" />
-      <node concept="1LZb2c" id="6_5E9TNFq_Y" role="8Wnug">
-        <property role="TrG5h" value="OverridingAndErasure" />
-        <node concept="3cqZAl" id="6_5E9TNFq_Z" role="3clF45" />
-        <node concept="3clFbS" id="6_5E9TNFqA0" role="3clF47">
-          <node concept="3SKdUt" id="72cCUiu6jSh" role="3cqZAp">
-            <node concept="1PaTwC" id="72cCUiu6jSi" role="3ndbpf">
-              <node concept="3oM_SD" id="72cCUiu6jSk" role="1PaTwD">
-                <property role="3oM_SC" value="fixme:" />
-              </node>
-              <node concept="3oM_SD" id="72cCUiu6jS$" role="1PaTwD">
-                <property role="3oM_SC" value="understand" />
-              </node>
-              <node concept="3oM_SD" id="72cCUiu6jSB" role="1PaTwD">
-                <property role="3oM_SC" value="whether" />
-              </node>
-              <node concept="3oM_SD" id="72cCUiu6jSF" role="1PaTwD">
-                <property role="3oM_SC" value="it" />
-              </node>
-              <node concept="3oM_SD" id="72cCUiu6jSK" role="1PaTwD">
-                <property role="3oM_SC" value="should" />
-              </node>
-              <node concept="3oM_SD" id="72cCUiu6jSQ" role="1PaTwD">
-                <property role="3oM_SC" value="be" />
-              </node>
-              <node concept="3oM_SD" id="72cCUiu6jSX" role="1PaTwD">
-                <property role="3oM_SC" value="checked" />
-              </node>
-              <node concept="3oM_SD" id="72cCUiu6jT5" role="1PaTwD">
-                <property role="3oM_SC" value="by" />
-              </node>
-              <node concept="3oM_SD" id="72cCUiu6jTe" role="1PaTwD">
-                <property role="3oM_SC" value="checking" />
-              </node>
-              <node concept="3oM_SD" id="72cCUiu6jTo" role="1PaTwD">
-                <property role="3oM_SC" value="rules" />
-              </node>
-              <node concept="3oM_SD" id="72cCUiu6jTz" role="1PaTwD">
-                <property role="3oM_SC" value="or" />
-              </node>
-              <node concept="3oM_SD" id="72cCUiu6jTJ" role="1PaTwD">
-                <property role="3oM_SC" value="by" />
-              </node>
-              <node concept="3oM_SD" id="72cCUiu6jTW" role="1PaTwD">
-                <property role="3oM_SC" value="coderules" />
-              </node>
-            </node>
-          </node>
-          <node concept="2Hmddi" id="6_5E9TNFqA1" role="3cqZAp">
-            <node concept="2OqwBi" id="6_5E9TNFqA2" role="2Hmdds">
-              <node concept="2YIFZM" id="6_5E9TNFqA3" role="2Oq$k0">
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="6_5E9TNFqA4" role="37wK5m">
-                  <node concept="2WthIp" id="6_5E9TNFqA5" role="2Oq$k0" />
-                  <node concept="2XshWL" id="6_5E9TNFqA6" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="6_5E9TNFqA7" role="2XxRq1">
-                      <node concept="ZC_QK" id="6_5E9TNFtnf" role="2tJFKM">
-                        <ref role="2aWVGs" to="wqtl:6_5E9TNDqeq" resolve="OverridingAndErasure" />
-                      </node>
+    <node concept="1LZb2c" id="6_5E9TNFq_Y" role="1SL9yI">
+      <property role="TrG5h" value="OverridingAndErasure" />
+      <node concept="3cqZAl" id="6_5E9TNFq_Z" role="3clF45" />
+      <node concept="3clFbS" id="6_5E9TNFqA0" role="3clF47">
+        <node concept="2Hmddi" id="6_5E9TNFqA1" role="3cqZAp">
+          <node concept="2OqwBi" id="6_5E9TNFqA2" role="2Hmdds">
+            <node concept="2YIFZM" id="6_5E9TNFqA3" role="2Oq$k0">
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <node concept="2OqwBi" id="6_5E9TNFqA4" role="37wK5m">
+                <node concept="2WthIp" id="6_5E9TNFqA5" role="2Oq$k0" />
+                <node concept="2XshWL" id="6_5E9TNFqA6" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="6_5E9TNFqA7" role="2XxRq1">
+                    <node concept="ZC_QK" id="6_5E9TNFtnf" role="2tJFKM">
+                      <ref role="2aWVGs" to="wqtl:6_5E9TNDqeq" resolve="OverridingAndErasure" />
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="6_5E9TNFqA9" role="37wK5m" />
-              </node>
-              <node concept="liA8E" id="6_5E9TNFqAa" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
               </node>
+              <node concept="1jxXqW" id="6_5E9TNFqA9" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="6_5E9TNFqAa" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
         </node>
-        <node concept="3uibUv" id="6_5E9TNFqAb" role="Sfmx6">
-          <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
-        </node>
+      </node>
+      <node concept="3uibUv" id="6_5E9TNFqAb" role="Sfmx6">
+        <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
       </node>
     </node>
   </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
index 22d73e39..452aab61 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
@@ -117,7 +117,9 @@
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ" />
+      <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ">
+        <child id="1214996921760" name="bound" index="3ztrMU" />
+      </concept>
       <concept id="1109279851642" name="jetbrains.mps.baseLanguage.structure.GenericDeclaration" flags="ng" index="16eOlS">
         <child id="1109279881614" name="typeVariableDeclaration" index="16eVyc" />
       </concept>
@@ -1050,6 +1052,207 @@
         </node>
       </node>
     </node>
+    <node concept="1LZb2c" id="3XUOzowCKNX" role="1SL9yI">
+      <property role="TrG5h" value="subclassing_Raw" />
+      <node concept="3cqZAl" id="3XUOzowCKNY" role="3clF45" />
+      <node concept="3clFbS" id="3XUOzowCKNZ" role="3clF47">
+        <node concept="3cpWs8" id="3XUOzowMURR" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowMURS" role="3cpWs9">
+            <property role="TrG5h" value="resolver1" />
+            <node concept="3uibUv" id="3XUOzowMURT" role="1tU5fm">
+              <ref role="3uigEE" to="kqnc:29sKO70xIRu" resolve="SubclassingUtil.SupertypesResolver" />
+            </node>
+            <node concept="2YIFZM" id="3XUOzowMURU" role="33vP2m">
+              <ref role="1Pybhc" to="kqnc:tIwzd2cJHD" resolve="SubclassingUtil" />
+              <ref role="37wK5l" to="kqnc:21fnip9BiFE" resolve="getResolver" />
+              <node concept="3xONca" id="3XUOzowN0wP" role="37wK5m">
+                <ref role="3xOPvv" node="3XUOzowCPq2" resolve="Raw" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3XUOzowCKO0" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowCKO1" role="3cpWs9">
+            <property role="TrG5h" value="expected1" />
+            <node concept="_YKpA" id="3XUOzowCKO2" role="1tU5fm">
+              <node concept="_YKpA" id="3XUOzowCKO3" role="_ZDj9">
+                <node concept="3Tqbb2" id="3XUOzowCKO4" role="_ZDj9" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="3XUOzowCKO5" role="33vP2m">
+              <node concept="2OqwBi" id="3XUOzowCKO6" role="2Oq$k0">
+                <node concept="2OqwBi" id="3XUOzowCKO7" role="2Oq$k0">
+                  <node concept="3xONca" id="3XUOzowCOHq" role="2Oq$k0">
+                    <ref role="3xOPvv" node="3XUOzowCEb4" resolve="expected_Raw_targs_full" />
+                  </node>
+                  <node concept="3Tsc0h" id="3XUOzowCKO9" role="2OqNvi">
+                    <ref role="3TtcxE" to="tp68:hHp56YpiWP" resolve="actualArgument" />
+                  </node>
+                </node>
+                <node concept="3$u5V9" id="3XUOzowCKOa" role="2OqNvi">
+                  <node concept="1bVj0M" id="3XUOzowCKOb" role="23t8la">
+                    <node concept="3clFbS" id="3XUOzowCKOc" role="1bW5cS">
+                      <node concept="3clFbF" id="3XUOzowCKOd" role="3cqZAp">
+                        <node concept="2OqwBi" id="3XUOzowCKOe" role="3clFbG">
+                          <node concept="1PxgMI" id="3XUOzowCKOf" role="2Oq$k0">
+                            <node concept="37vLTw" id="3XUOzowCKOg" role="1m5AlR">
+                              <ref role="3cqZAo" node="3XUOzowCKOj" resolve="it" />
+                            </node>
+                            <node concept="chp4Y" id="3XUOzowCKOh" role="3oSUPX">
+                              <ref role="cht4Q" to="tp68:h5nCRdH" resolve="InternalNewExpression" />
+                            </node>
+                          </node>
+                          <node concept="3Tsc0h" id="3XUOzowCKOi" role="2OqNvi">
+                            <ref role="3TtcxE" to="tp68:i3HumyW" resolve="parameter" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="3XUOzowCKOj" role="1bW2Oz">
+                      <property role="TrG5h" value="it" />
+                      <node concept="2jxLKc" id="3XUOzowCKOk" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="ANE8D" id="3XUOzowCKOl" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3XUOzowCKOm" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowCKOn" role="3cpWs9">
+            <property role="TrG5h" value="found1" />
+            <node concept="_YKpA" id="3XUOzowCKOo" role="1tU5fm">
+              <node concept="_YKpA" id="3XUOzowCKOp" role="_ZDj9">
+                <node concept="3Tqbb2" id="3XUOzowCKOq" role="_ZDj9">
+                  <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="3XUOzowMWT_" role="33vP2m">
+              <node concept="37vLTw" id="3XUOzowMWMA" role="2Oq$k0">
+                <ref role="3cqZAo" node="3XUOzowMURS" resolve="resolver1" />
+              </node>
+              <node concept="liA8E" id="3XUOzowMXZL" role="2OqNvi">
+                <ref role="37wK5l" to="kqnc:29sKO70zPFy" resolve="getAllSubtypePaths" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3vwNmj" id="3XUOzowCKOA" role="3cqZAp">
+          <node concept="2OqwBi" id="3XUOzowCKOB" role="3vwVQn">
+            <node concept="2WthIp" id="3XUOzowCKOC" role="2Oq$k0" />
+            <node concept="2XshWL" id="3XUOzowCKOD" role="2OqNvi">
+              <ref role="2WH_rO" node="7t5VLKGS9tZ" resolve="same" />
+              <node concept="37vLTw" id="3XUOzowCKOE" role="2XxRq1">
+                <ref role="3cqZAo" node="3XUOzowCKO1" resolve="expected1" />
+              </node>
+              <node concept="37vLTw" id="3XUOzowCKOF" role="2XxRq1">
+                <ref role="3cqZAo" node="3XUOzowCKOn" resolve="found1" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3XUOzowN1Ed" role="3cqZAp" />
+        <node concept="3cpWs8" id="3XUOzowN1eW" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowN1eX" role="3cpWs9">
+            <property role="TrG5h" value="resolver2" />
+            <node concept="3uibUv" id="3XUOzowN1eY" role="1tU5fm">
+              <ref role="3uigEE" to="kqnc:29sKO70xIRu" resolve="SubclassingUtil.SupertypesResolver" />
+            </node>
+            <node concept="2YIFZM" id="3XUOzowOfXq" role="33vP2m">
+              <ref role="37wK5l" to="kqnc:3XUOzowNYTB" resolve="getRawResolver" />
+              <ref role="1Pybhc" to="kqnc:tIwzd2cJHD" resolve="SubclassingUtil" />
+              <node concept="3xONca" id="3XUOzowOfXr" role="37wK5m">
+                <ref role="3xOPvv" node="3XUOzowCPq2" resolve="Raw" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3XUOzowMTQS" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowMTQT" role="3cpWs9">
+            <property role="TrG5h" value="expected2" />
+            <node concept="_YKpA" id="3XUOzowMTQU" role="1tU5fm">
+              <node concept="_YKpA" id="3XUOzowMTQV" role="_ZDj9">
+                <node concept="3Tqbb2" id="3XUOzowMTQW" role="_ZDj9" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="3XUOzowMTQX" role="33vP2m">
+              <node concept="2OqwBi" id="3XUOzowMTQY" role="2Oq$k0">
+                <node concept="2OqwBi" id="3XUOzowMTQZ" role="2Oq$k0">
+                  <node concept="3xONca" id="3XUOzowN4Ss" role="2Oq$k0">
+                    <ref role="3xOPvv" node="3XUOzowMOU$" resolve="expected_Raw_targs_simple" />
+                  </node>
+                  <node concept="3Tsc0h" id="3XUOzowMTR1" role="2OqNvi">
+                    <ref role="3TtcxE" to="tp68:hHp56YpiWP" resolve="actualArgument" />
+                  </node>
+                </node>
+                <node concept="3$u5V9" id="3XUOzowMTR2" role="2OqNvi">
+                  <node concept="1bVj0M" id="3XUOzowMTR3" role="23t8la">
+                    <node concept="3clFbS" id="3XUOzowMTR4" role="1bW5cS">
+                      <node concept="3clFbF" id="3XUOzowMTR5" role="3cqZAp">
+                        <node concept="2OqwBi" id="3XUOzowMTR6" role="3clFbG">
+                          <node concept="1PxgMI" id="3XUOzowMTR7" role="2Oq$k0">
+                            <node concept="37vLTw" id="3XUOzowMTR8" role="1m5AlR">
+                              <ref role="3cqZAo" node="3XUOzowMTRb" resolve="it" />
+                            </node>
+                            <node concept="chp4Y" id="3XUOzowMTR9" role="3oSUPX">
+                              <ref role="cht4Q" to="tp68:h5nCRdH" resolve="InternalNewExpression" />
+                            </node>
+                          </node>
+                          <node concept="3Tsc0h" id="3XUOzowMTRa" role="2OqNvi">
+                            <ref role="3TtcxE" to="tp68:i3HumyW" resolve="parameter" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="3XUOzowMTRb" role="1bW2Oz">
+                      <property role="TrG5h" value="it" />
+                      <node concept="2jxLKc" id="3XUOzowMTRc" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="ANE8D" id="3XUOzowMTRd" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3XUOzowMTRe" role="3cqZAp">
+          <node concept="3cpWsn" id="3XUOzowMTRf" role="3cpWs9">
+            <property role="TrG5h" value="found2" />
+            <node concept="_YKpA" id="3XUOzowMTRg" role="1tU5fm">
+              <node concept="_YKpA" id="3XUOzowMTRh" role="_ZDj9">
+                <node concept="3Tqbb2" id="3XUOzowMTRi" role="_ZDj9">
+                  <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="3XUOzowN46Y" role="33vP2m">
+              <node concept="37vLTw" id="3XUOzowN3Y1" role="2Oq$k0">
+                <ref role="3cqZAo" node="3XUOzowN1eX" resolve="resolver2" />
+              </node>
+              <node concept="liA8E" id="3XUOzowN4xG" role="2OqNvi">
+                <ref role="37wK5l" to="kqnc:29sKO70zPFy" resolve="getAllSubtypePaths" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3vwNmj" id="3XUOzowMTRl" role="3cqZAp">
+          <node concept="2OqwBi" id="3XUOzowMTRm" role="3vwVQn">
+            <node concept="2WthIp" id="3XUOzowMTRn" role="2Oq$k0" />
+            <node concept="2XshWL" id="3XUOzowMTRo" role="2OqNvi">
+              <ref role="2WH_rO" node="7t5VLKGS9tZ" resolve="same" />
+              <node concept="37vLTw" id="3XUOzowMTRp" role="2XxRq1">
+                <ref role="3cqZAo" node="3XUOzowMTQT" resolve="expected2" />
+              </node>
+              <node concept="37vLTw" id="3XUOzowMTRq" role="2XxRq1">
+                <ref role="3cqZAo" node="3XUOzowMTRf" resolve="found2" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1LZb2c" id="6UxFjlrO25x" role="1SL9yI">
       <property role="TrG5h" value="typevarResolveClassifier" />
       <node concept="3cqZAl" id="6UxFjlrO25y" role="3clF45" />
@@ -1646,6 +1849,150 @@
           </node>
         </node>
         <node concept="2tJIrI" id="6_5E9TNxy_R" role="jymVt" />
+        <node concept="2tJIrI" id="3XUOzowCt9U" role="jymVt" />
+        <node concept="312cEu" id="3XUOzowCuBi" role="jymVt">
+          <property role="2bfB8j" value="true" />
+          <property role="TrG5h" value="Base" />
+          <node concept="3Tm1VV" id="3XUOzowCugg" role="1B3o_S" />
+          <node concept="16euLQ" id="3XUOzowCwDN" role="16eVyc">
+            <property role="TrG5h" value="T1a" />
+            <node concept="3uibUv" id="3XUOzowCy3d" role="3ztrMU">
+              <ref role="3uigEE" node="6_5E9TNxy_p" resolve="GContainer.A" />
+              <node concept="3uibUv" id="3XUOzowCzsH" role="11_B2D">
+                <ref role="3uigEE" to="guwi:~Serializable" resolve="Serializable" />
+              </node>
+            </node>
+          </node>
+          <node concept="16euLQ" id="3XUOzowF5GE" role="16eVyc">
+            <property role="TrG5h" value="T2a" />
+          </node>
+        </node>
+        <node concept="2tJIrI" id="3XUOzowCzIB" role="jymVt" />
+        <node concept="312cEu" id="3XUOzowC$vg" role="jymVt">
+          <property role="2bfB8j" value="true" />
+          <property role="TrG5h" value="Raw" />
+          <node concept="3clFb_" id="3XUOzowCEal" role="jymVt">
+            <property role="TrG5h" value="foo" />
+            <node concept="3clFbS" id="3XUOzowCEaB" role="3clF47">
+              <node concept="3clFbH" id="3XUOzowCEaC" role="3cqZAp" />
+              <node concept="3clFbF" id="3XUOzowCEaD" role="3cqZAp">
+                <node concept="1niqFM" id="3XUOzowCEaE" role="3clFbG">
+                  <property role="1npL6y" value="expect" />
+                  <property role="1npUBZ" value="_" />
+                  <node concept="1nCR9W" id="3XUOzowCEaF" role="2U24H$">
+                    <property role="1nD$Q0" value="_" />
+                    <node concept="3uibUv" id="3XUOzowCEaG" role="3HumAs">
+                      <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                    </node>
+                    <node concept="3uibUv" id="3XUOzowF54L" role="3HumAs">
+                      <ref role="3uigEE" node="3XUOzowCuBi" resolve="GContainer.Base" />
+                      <node concept="3uibUv" id="3XUOzowCEaH" role="11_B2D">
+                        <ref role="3uigEE" node="6_5E9TNxy_p" resolve="GContainer.A" />
+                        <node concept="3uibUv" id="3XUOzowCGcO" role="11_B2D">
+                          <ref role="3uigEE" to="guwi:~Serializable" resolve="Serializable" />
+                        </node>
+                      </node>
+                      <node concept="3uibUv" id="3XUOzowF76R" role="11_B2D">
+                        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                      </node>
+                    </node>
+                    <node concept="3uibUv" id="3XUOzowCEaQ" role="3HumAs">
+                      <ref role="3uigEE" node="3XUOzowC$vg" resolve="GContainer.Raw" />
+                      <node concept="16syzq" id="3XUOzowCGMd" role="11_B2D">
+                        <ref role="16sUi3" node="3XUOzowC_YH" resolve="Tr" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1nCR9W" id="3XUOzowCEaT" role="2U24H$">
+                    <property role="1nD$Q0" value="_" />
+                    <node concept="3uibUv" id="3XUOzowCEaU" role="3HumAs">
+                      <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                    </node>
+                    <node concept="3uibUv" id="3XUOzowCEaV" role="3HumAs">
+                      <ref role="3uigEE" node="6_5E9TNxL1y" resolve="GContainer.I" />
+                      <node concept="16syzq" id="3XUOzowCI5o" role="11_B2D">
+                        <ref role="16sUi3" node="3XUOzowC_YH" resolve="Tr" />
+                      </node>
+                    </node>
+                    <node concept="3uibUv" id="3XUOzowCJWX" role="3HumAs">
+                      <ref role="3uigEE" node="3XUOzowC$vg" resolve="GContainer.Raw" />
+                      <node concept="16syzq" id="3XUOzowCKxZ" role="11_B2D">
+                        <ref role="16sUi3" node="3XUOzowC_YH" resolve="Tr" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cqZAl" id="3XUOzowCEb3" role="32Mpfj" />
+                  <node concept="3xLA65" id="3XUOzowCEb4" role="lGtFl">
+                    <property role="TrG5h" value="expected_Raw_targs_full" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="3XUOzowMOTB" role="3cqZAp" />
+              <node concept="3clFbF" id="3XUOzowMOUi" role="3cqZAp">
+                <node concept="1niqFM" id="3XUOzowMOUk" role="3clFbG">
+                  <property role="1npL6y" value="expect" />
+                  <property role="1npUBZ" value="_" />
+                  <node concept="1nCR9W" id="3XUOzowMOUl" role="2U24H$">
+                    <property role="1nD$Q0" value="_" />
+                    <node concept="3uibUv" id="3XUOzowMOUm" role="3HumAs">
+                      <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                    </node>
+                    <node concept="3uibUv" id="3XUOzowMOUn" role="3HumAs">
+                      <ref role="3uigEE" node="3XUOzowCuBi" resolve="GContainer.Base" />
+                    </node>
+                    <node concept="3uibUv" id="3XUOzowMOUr" role="3HumAs">
+                      <ref role="3uigEE" node="3XUOzowC$vg" resolve="GContainer.Raw" />
+                      <node concept="16syzq" id="3XUOzowMOUs" role="11_B2D">
+                        <ref role="16sUi3" node="3XUOzowC_YH" resolve="Tr" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1nCR9W" id="3XUOzowMOUt" role="2U24H$">
+                    <property role="1nD$Q0" value="_" />
+                    <node concept="3uibUv" id="3XUOzowMOUu" role="3HumAs">
+                      <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                    </node>
+                    <node concept="3uibUv" id="3XUOzowMOUv" role="3HumAs">
+                      <ref role="3uigEE" node="6_5E9TNxL1y" resolve="GContainer.I" />
+                      <node concept="16syzq" id="3XUOzowMOUw" role="11_B2D">
+                        <ref role="16sUi3" node="3XUOzowC_YH" resolve="Tr" />
+                      </node>
+                    </node>
+                    <node concept="3uibUv" id="3XUOzowMOUx" role="3HumAs">
+                      <ref role="3uigEE" node="3XUOzowC$vg" resolve="GContainer.Raw" />
+                      <node concept="16syzq" id="3XUOzowMOUy" role="11_B2D">
+                        <ref role="16sUi3" node="3XUOzowC_YH" resolve="Tr" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cqZAl" id="3XUOzowMOUz" role="32Mpfj" />
+                  <node concept="3xLA65" id="3XUOzowMOU$" role="lGtFl">
+                    <property role="TrG5h" value="expected_Raw_targs_simple" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="3XUOzowMOTW" role="3cqZAp" />
+            </node>
+            <node concept="3cqZAl" id="3XUOzowCEb5" role="3clF45" />
+            <node concept="3Tm1VV" id="3XUOzowCEb6" role="1B3o_S" />
+          </node>
+          <node concept="3Tm1VV" id="3XUOzowC$81" role="1B3o_S" />
+          <node concept="3uibUv" id="3XUOzowC_Gu" role="1zkMxy">
+            <ref role="3uigEE" node="3XUOzowCuBi" resolve="GContainer.Base" />
+          </node>
+          <node concept="16euLQ" id="3XUOzowC_YH" role="16eVyc">
+            <property role="TrG5h" value="Tr" />
+          </node>
+          <node concept="3uibUv" id="3XUOzowCBzu" role="EKbjA">
+            <ref role="3uigEE" node="6_5E9TNxL1y" resolve="GContainer.I" />
+            <node concept="16syzq" id="3XUOzowCBSo" role="11_B2D">
+              <ref role="16sUi3" node="3XUOzowC_YH" resolve="Tr" />
+            </node>
+          </node>
+          <node concept="3xLA65" id="3XUOzowCPq2" role="lGtFl">
+            <property role="TrG5h" value="Raw" />
+          </node>
+        </node>
         <node concept="3Tm1VV" id="6_5E9TNxy_S" role="1B3o_S" />
       </node>
     </node>