From e2b3c21b2febd094e4e67d0ff8d9f2fa4df17be1 Mon Sep 17 00:00:00 2001
From: Grigorii Kirgizov <grigorii.kirgizov@jetbrains.com>
Date: Tue, 19 May 2020 19:14:48 +0300
Subject: [PATCH] Change semantics of implicit ListFeature: treat as wildcard,
 not as empty list

Motivation is that implicit (non-overriden) list features must unify
with list of any length. Consider an example:
`classifier(cls: node-ptr/A/) = classifier(cls: node-ptr/A/ param: [B,C])`
With previous approach it would fail, which seems counter-intuitive to me.
So, if empty list (e.g. of type parameters) is meant, then it must be
specified explicitly.

There's one thing to remember, though: such wildcard list features
won't match with MetaLogicalArrays in rule heads.
(e.g. see dpromote_* rules and consider what happens when
a classifier with unbound `parameter` feature comes in)
---
 .../generator/template/main@generator.mps     |  19 +-
 ...ins.mps.baseLanguage.closuresExt.types.mps | 436 +--------------
 .../jetbrains.mps.baseLanguageExt.types.mps   | 520 ++++++++----------
 ...ps.baseLanguageExt.test.features@tests.mps |   2 +-
 4 files changed, 252 insertions(+), 725 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 27e12a15..95f9c9ee 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -535,9 +535,6 @@
       <concept id="7571593955706137573" name="jetbrains.mps.logic.structure.Value" flags="ng" index="1oi5XN">
         <property id="7571593955706137638" name="value" index="1oi5yK" />
       </concept>
-      <concept id="1432138691741609740" name="jetbrains.mps.logic.structure.ConsListNode" flags="ng" index="1Pxxm1">
-        <child id="1432138691741609743" name="tail" index="1Pxxm2" />
-      </concept>
     </language>
     <language id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal">
       <concept id="1173996401517" name="jetbrains.mps.baseLanguageInternal.structure.InternalNewExpression" flags="nn" index="1nCR9W">
@@ -16067,7 +16064,17 @@
           <node concept="1oi1Uc" id="1fvYCPA6RdQ" role="gfFT$">
             <node concept="1oi5ST" id="1fvYCPA6RdR" role="1oi0x0">
               <property role="TrG5h" value="name" />
-              <node concept="KCUsM" id="1fvYCPA6RdS" role="1oi5TL" />
+              <node concept="1oi5UN" id="3qUnz9vhUyO" role="1oi5TL">
+                <node concept="22Ky0T" id="3qUnz9vhUyP" role="lGtFl">
+                  <node concept="2YIFZM" id="3qUnz9vhUyQ" role="22Ky0K">
+                    <ref role="1Pybhc" to="oy3s:7nPD14NOCSa" resolve="MetaLogicalFactory" />
+                    <ref role="37wK5l" to="oy3s:7nPD14NOHGU" resolve="wildcardMetaLogical" />
+                    <node concept="3VsKOn" id="3qUnz9vhUyR" role="37wK5m">
+                      <ref role="3VsUkX" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                    </node>
+                  </node>
+                </node>
+              </node>
               <node concept="17Uvod" id="1fvYCPA6Re2" role="lGtFl">
                 <property role="2qtEX9" value="name" />
                 <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -16183,6 +16190,7 @@
       <node concept="gft3U" id="1fvYCPA6RxW" role="1lVwrX">
         <node concept="1oi5ST" id="1fvYCPA6Ry2" role="gfFT$">
           <property role="TrG5h" value="name" />
+          <node concept="2IllgU" id="1fvYCPA6RLu" role="1oi5TL" />
           <node concept="17Uvod" id="1fvYCPA6Ry4" role="lGtFl">
             <property role="2qtEX9" value="name" />
             <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -16199,9 +16207,6 @@
               </node>
             </node>
           </node>
-          <node concept="1Pxxm1" id="7L5omgeruXd" role="1oi5TL">
-            <node concept="2IllgU" id="1fvYCPA6RLu" role="1Pxxm2" />
-          </node>
         </node>
       </node>
     </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
index 0332c6d8..dd0fc99e 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
@@ -275,13 +275,6 @@
         <property id="8575328350543493365" name="message" index="huDt6" />
         <property id="2423417345669755629" name="filter" index="1eyWvh" />
       </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
     </language>
     <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
       <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="ng" index="3oM_SD">
@@ -2104,19 +2097,14 @@
                   <node concept="3Aq9E8" id="5QlJgjTEhLP" role="3xSepj">
                     <node concept="3I6sU6" id="5QlJgjTEhLQ" role="3Ip0Jz">
                       <node concept="3I6s7M" id="5QlJgjTEhLV" role="3I6sU7">
-                        <node concept="3A8Hvi" id="5QlJgjTEhLW" role="3I6s78">
-                          <node concept="ns1u0" id="5QlJgjTEhLX" role="3A8w4Q">
-                            <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
-                            <node concept="nsMwS" id="5QlJgjTEhLY" role="ns1xD">
-                              <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                              <node concept="2tJFMh" id="5QlJgjTEhLZ" role="nsMwV">
-                                <node concept="ZC_QK" id="5QlJgjTEhM0" role="2tJFKM">
-                                  <ref role="2aWVGs" to="wyt6:~Object" resolve="Object" />
-                                </node>
-                              </node>
+                        <node concept="3jm4v3" id="3qUnz9vkVLH" role="3I6s78">
+                          <ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypePlain" />
+                          <node concept="2tJFMh" id="3qUnz9vkVLV" role="3jicU7">
+                            <node concept="ZC_QK" id="3qUnz9vkVM3" role="2tJFKM">
+                              <ref role="2aWVGs" to="wyt6:~Object" resolve="Object" />
                             </node>
                           </node>
-                          <node concept="a7P8L" id="5QlJgjTEhM1" role="3A8wtg">
+                          <node concept="a7P8L" id="3qUnz9vkVLM" role="3jm6SO">
                             <ref role="a7OzE" node="5QlJgjTEhLM" resolve="RetT" />
                           </node>
                         </node>
@@ -3943,418 +3931,6 @@
         </node>
       </node>
     </node>
-    <node concept="1X3_iC" id="554EtBHA0dz" role="lGtFl">
-      <property role="3V$3am" value="template" />
-      <property role="3V$3ak" value="c4803b19-6d89-4a3b-bf82-390769514add/8335224865066015764/3575255234175157601" />
-      <node concept="1nLNMY" id="4AYiKM_PFJW" role="8Wnug">
-        <property role="TrG5h" value="converts_function_classifier" />
-        <node concept="3clFbS" id="4AYiKM_PFJX" role="1nLNMH">
-          <node concept="3clFbH" id="4AYiKM_S1JU" role="3cqZAp" />
-          <node concept="3clFbJ" id="4AYiKM_RVNL" role="3cqZAp">
-            <node concept="3clFbS" id="4AYiKM_RVNN" role="3clFbx">
-              <node concept="3clFbH" id="4AYiKM_S0YV" role="3cqZAp" />
-              <node concept="3cpWs8" id="4AYiKM_RKgB" role="3cqZAp">
-                <node concept="3cpWsn" id="4AYiKM_RKgE" role="3cpWs9">
-                  <property role="TrG5h" value="meths" />
-                  <node concept="A3Dl8" id="4AYiKM_RKg$" role="1tU5fm">
-                    <node concept="3Tqbb2" id="4AYiKM_RKkK" role="A3Ik2">
-                      <ref role="ehGHo" to="tpee:fzclF8t" resolve="InstanceMethodDeclaration" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="4AYiKM_RKsD" role="33vP2m">
-                    <node concept="3A2sRY" id="4AYiKM_RKlj" role="2Oq$k0">
-                      <ref role="3A2yKK" node="4AYiKM_PVSd" resolve="cls" />
-                    </node>
-                    <node concept="2qgKlT" id="4AYiKM_RLej" role="2OqNvi">
-                      <ref role="37wK5l" to="tpek:4_LVZ3pBKCn" resolve="methods" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="4AYiKM_RLYx" role="3cqZAp">
-                <node concept="3cpWsn" id="4AYiKM_RLYy" role="3cpWs9">
-                  <property role="TrG5h" value="cands" />
-                  <node concept="A3Dl8" id="4AYiKM_RLYz" role="1tU5fm">
-                    <node concept="3Tqbb2" id="4AYiKM_RLY$" role="A3Ik2">
-                      <ref role="ehGHo" to="tpee:fzclF8t" resolve="InstanceMethodDeclaration" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="4AYiKM_RMZm" role="33vP2m">
-                    <node concept="37vLTw" id="4AYiKM_RMNI" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4AYiKM_RKgE" resolve="meths" />
-                    </node>
-                    <node concept="3zZkjj" id="4AYiKM_RN77" role="2OqNvi">
-                      <node concept="1bVj0M" id="4AYiKM_RN79" role="23t8la">
-                        <node concept="3clFbS" id="4AYiKM_RN7a" role="1bW5cS">
-                          <node concept="3clFbF" id="4AYiKM_RNeb" role="3cqZAp">
-                            <node concept="1Wc70l" id="4AYiKM_ROJ6" role="3clFbG">
-                              <node concept="2OqwBi" id="4AYiKM_RP5G" role="3uHU7w">
-                                <node concept="37vLTw" id="4AYiKM_ROSp" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4AYiKM_RN7b" resolve="m" />
-                                </node>
-                                <node concept="2qgKlT" id="4AYiKM_RPfW" role="2OqNvi">
-                                  <ref role="37wK5l" to="tpek:28P2dHxCoRl" resolve="isAnAbstractMethod" />
-                                </node>
-                              </node>
-                              <node concept="3fqX7Q" id="4AYiKM_RNe9" role="3uHU7B">
-                                <node concept="2OqwBi" id="4AYiKM_RNFU" role="3fr31v">
-                                  <node concept="Xl_RD" id="4AYiKM_RNjX" role="2Oq$k0">
-                                    <property role="Xl_RC" value="equals" />
-                                  </node>
-                                  <node concept="liA8E" id="4AYiKM_RNZH" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
-                                    <node concept="2OqwBi" id="4AYiKM_ROt2" role="37wK5m">
-                                      <node concept="37vLTw" id="4AYiKM_ROka" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4AYiKM_RN7b" resolve="m" />
-                                      </node>
-                                      <node concept="3TrcHB" id="4AYiKM_ROyu" role="2OqNvi">
-                                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="Rh6nW" id="4AYiKM_RN7b" role="1bW2Oz">
-                          <property role="TrG5h" value="m" />
-                          <node concept="2jxLKc" id="4AYiKM_RN7c" role="1tU5fm" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="4AYiKM_RRqX" role="3cqZAp">
-                <node concept="3cpWsn" id="4AYiKM_RRr0" role="3cpWs9">
-                  <property role="TrG5h" value="it" />
-                  <node concept="uOF1S" id="4AYiKM_RRqT" role="1tU5fm">
-                    <node concept="3Tqbb2" id="4AYiKM_RRyq" role="uOL27">
-                      <ref role="ehGHo" to="tpee:fzclF8t" resolve="InstanceMethodDeclaration" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="4AYiKM_RRKA" role="33vP2m">
-                    <node concept="37vLTw" id="4AYiKM_RRyO" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4AYiKM_RLYy" resolve="cands" />
-                    </node>
-                    <node concept="uNJiE" id="4AYiKM_RRVt" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="4AYiKM_RdDo" role="3cqZAp">
-                <node concept="3cpWsn" id="4AYiKM_RdDr" role="3cpWs9">
-                  <property role="TrG5h" value="mdecl" />
-                  <node concept="3Tqbb2" id="4AYiKM_RdDm" role="1tU5fm">
-                    <ref role="ehGHo" to="tpee:fzclF8t" resolve="InstanceMethodDeclaration" />
-                  </node>
-                  <node concept="3K4zz7" id="4AYiKM_RSSq" role="33vP2m">
-                    <node concept="2OqwBi" id="4AYiKM_RTf$" role="3K4E3e">
-                      <node concept="37vLTw" id="4AYiKM_RT3L" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4AYiKM_RRr0" resolve="it" />
-                      </node>
-                      <node concept="v1n4t" id="4AYiKM_RTm2" role="2OqNvi" />
-                    </node>
-                    <node concept="10Nm6u" id="4AYiKM_RTmq" role="3K4GZi" />
-                    <node concept="2OqwBi" id="4AYiKM_RSlu" role="3K4Cdx">
-                      <node concept="37vLTw" id="4AYiKM_RS7S" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4AYiKM_RRr0" resolve="it" />
-                      </node>
-                      <node concept="v0PNk" id="4AYiKM_RStC" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="4AYiKM_Sok5" role="3cqZAp" />
-              <node concept="3Hbl2A" id="4AYiKM_PVSS" role="3cqZAp">
-                <node concept="3clFbS" id="4AYiKM_PVSU" role="9aQI4">
-                  <node concept="3clFbJ" id="4AYiKM_Refz" role="3cqZAp">
-                    <node concept="3clFbS" id="4AYiKM_Ref_" role="3clFbx">
-                      <node concept="3cpWs8" id="bQfy1Sg9qx" role="3cqZAp">
-                        <node concept="3cpWsn" id="bQfy1Sg9q$" role="3cpWs9">
-                          <property role="TrG5h" value="paramTypes" />
-                          <node concept="_YKpA" id="5MG7an7VZ$S" role="1tU5fm">
-                            <node concept="3Tqbb2" id="5MG7an7VZ$U" role="_ZDj9">
-                              <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="5MG7an7VZMM" role="33vP2m">
-                            <node concept="2OqwBi" id="bQfy1Sgfn2" role="2Oq$k0">
-                              <node concept="2OqwBi" id="bQfy1Sg9U1" role="2Oq$k0">
-                                <node concept="37vLTw" id="bQfy1Sg9si" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4AYiKM_RdDr" resolve="mdecl" />
-                                </node>
-                                <node concept="3Tsc0h" id="bQfy1SgaAR" role="2OqNvi">
-                                  <ref role="3TtcxE" to="tpee:fzclF7Y" resolve="parameter" />
-                                </node>
-                              </node>
-                              <node concept="3$u5V9" id="bQfy1Sgj7s" role="2OqNvi">
-                                <node concept="1bVj0M" id="bQfy1Sgj7u" role="23t8la">
-                                  <node concept="3clFbS" id="bQfy1Sgj7v" role="1bW5cS">
-                                    <node concept="3clFbF" id="bQfy1SgjbO" role="3cqZAp">
-                                      <node concept="2OqwBi" id="bQfy1SgjFH" role="3clFbG">
-                                        <node concept="37vLTw" id="bQfy1SgjbN" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="bQfy1Sgj7w" resolve="it" />
-                                        </node>
-                                        <node concept="3TrEf2" id="bQfy1Sgk4R" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="Rh6nW" id="bQfy1Sgj7w" role="1bW2Oz">
-                                    <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="bQfy1Sgj7x" role="1tU5fm" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="ANE8D" id="5MG7an7W00a" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3cpWs8" id="554EtBHz$ZQ" role="3cqZAp">
-                        <node concept="3cpWsn" id="554EtBHz$ZT" role="3cpWs9">
-                          <property role="TrG5h" value="ctvds" />
-                          <node concept="2I9FWS" id="554EtBHz_1v" role="1tU5fm">
-                            <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
-                          </node>
-                          <node concept="2OqwBi" id="554EtBHzAsW" role="33vP2m">
-                            <node concept="3A2sRY" id="554EtBHz_sl" role="2Oq$k0">
-                              <ref role="3A2yKK" node="4AYiKM_PVSd" resolve="cls" />
-                            </node>
-                            <node concept="3Tsc0h" id="554EtBHzATW" role="2OqNvi">
-                              <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="4AYiKM_SvC1" role="3cqZAp" />
-                      <node concept="1nLNNL" id="4AYiKM_PFK0" role="3cqZAp">
-                        <node concept="1nLNMm" id="4AYiKM_PFK1" role="1nLNNK">
-                          <node concept="3Aq93q" id="4AYiKM_PFKH" role="1nLNMb">
-                            <node concept="3I6sU6" id="4AYiKM_PFKI" role="3Ip0Jz">
-                              <node concept="3I6s7M" id="4AYiKM_PFKM" role="3I6sU7">
-                                <node concept="3Aqt3T" id="4AYiKM_PFKL" role="3I6s78">
-                                  <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="convertsTo" />
-                                  <node concept="1HFMs5" id="4AYiKM_PFKT" role="3AunhB">
-                                    <node concept="a7P8L" id="4AYiKM_PFKR" role="1uarlU">
-                                      <ref role="a7OzE" node="4AYiKM_PFK6" resolve="FunT" />
-                                    </node>
-                                    <node concept="ns1u0" id="4AYiKM_PFL5" role="1uarlW">
-                                      <ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
-                                    </node>
-                                  </node>
-                                  <node concept="1HFMs5" id="4AYiKM_PFLe" role="3AunhB">
-                                    <node concept="a7P8L" id="4AYiKM_PFLc" role="1uarlU">
-                                      <ref role="a7OzE" node="4AYiKM_PFKs" resolve="ClsT" />
-                                    </node>
-                                    <node concept="ns1u0" id="4AYiKM_PFLt" role="1uarlW">
-                                      <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
-                                      <node concept="nsMwS" id="4AYiKM_RC0a" role="ns1xD">
-                                        <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                                        <node concept="2OqwBi" id="4AYiKM_RC3R" role="nsMwV">
-                                          <node concept="3A2sRY" id="4AYiKM_RC0e" role="2Oq$k0">
-                                            <ref role="3A2yKK" node="4AYiKM_PVSd" resolve="cls" />
-                                          </node>
-                                          <node concept="iZEcu" id="554EtBHzH9y" role="2OqNvi" />
-                                        </node>
-                                      </node>
-                                      <node concept="nsMwS" id="554EtBHzHIB" role="ns1xD">
-                                        <ref role="nsMwP" to="kqnc:JOGAOsVt2e" resolve="parameter" />
-                                        <node concept="1nq8_$" id="554EtBHzHIK" role="nsMwV">
-                                          <node concept="a7P8L" id="554EtBHzHIJ" role="1nq8_t">
-                                            <ref role="a7OzE" node="554EtBHz$WN" resolve="ClsTypeArgs" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3NuqgR" id="4AYiKM_PFK5" role="0Rg$4">
-                            <node concept="aZer4" id="4AYiKM_PFK6" role="3XD1gS">
-                              <property role="TrG5h" value="FunT" />
-                            </node>
-                            <node concept="aZer4" id="4AYiKM_PFKs" role="3XD1gS">
-                              <property role="TrG5h" value="ClsT" />
-                            </node>
-                            <node concept="aZer4" id="4AYiKM_REqz" role="3XD1gS">
-                              <property role="TrG5h" value="DeclFunT" />
-                            </node>
-                            <node concept="32pEOW" id="4AYiKM_PFKi" role="3vLBG7" />
-                          </node>
-                          <node concept="3NuqgR" id="554EtBHz$WM" role="0Rg$4">
-                            <node concept="aZer4" id="554EtBHz$WN" role="3XD1gS">
-                              <property role="TrG5h" value="ClsTypeArgs" />
-                              <node concept="2OqwBi" id="554EtBHzCZx" role="3gj$pD">
-                                <node concept="37vLTw" id="554EtBHzAY7" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="554EtBHz$ZT" resolve="ctvds" />
-                                </node>
-                                <node concept="34oBXx" id="554EtBHzGLl" role="2OqNvi" />
-                              </node>
-                            </node>
-                            <node concept="32pEOW" id="554EtBHz$X4" role="3vLBG7" />
-                          </node>
-                          <node concept="3xSepi" id="4AYiKM_RfSr" role="3xSepv">
-                            <node concept="3Aq9E8" id="4AYiKM_RfSs" role="3xSepj">
-                              <node concept="3I6sU6" id="4AYiKM_RfSt" role="3Ip0Jz">
-                                <node concept="3IrJb3" id="4AYiKM_RCNB" role="3I6sU7">
-                                  <node concept="3clFbS" id="4AYiKM_RCNC" role="3IrJb0">
-                                    <node concept="3cpWs8" id="554EtBHzHJR" role="3cqZAp">
-                                      <node concept="3cpWsn" id="554EtBHzHJS" role="3cpWs9">
-                                        <property role="TrG5h" value="subs" />
-                                        <node concept="3uibUv" id="554EtBHzHJT" role="1tU5fm">
-                                          <ref role="3uigEE" to="kqnc:6EY0p2w8VOq" resolve="TypeVarSubstitution" />
-                                        </node>
-                                        <node concept="2ShNRf" id="554EtBHzHKG" role="33vP2m">
-                                          <node concept="1pGfFk" id="554EtBHzHOj" role="2ShVmc">
-                                            <ref role="37wK5l" to="kqnc:6EY0p2wsoT6" resolve="TypeVarSubstitution" />
-                                            <node concept="37vLTw" id="554EtBHzHPk" role="37wK5m">
-                                              <ref role="3cqZAo" node="554EtBHz$ZT" resolve="ctvds" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="1DcWWT" id="554EtBHzQam" role="3cqZAp">
-                                      <node concept="3clFbS" id="554EtBHzQao" role="2LFqv$">
-                                        <node concept="3clFbF" id="554EtBHzT0S" role="3cqZAp">
-                                          <node concept="2OqwBi" id="554EtBHzT6t" role="3clFbG">
-                                            <node concept="37vLTw" id="554EtBHzT0Q" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="554EtBHzHJS" resolve="subs" />
-                                            </node>
-                                            <node concept="liA8E" id="554EtBHzTdQ" role="2OqNvi">
-                                              <ref role="37wK5l" to="kqnc:6EY0p2w8YaM" resolve="substitute" />
-                                              <node concept="37vLTw" id="554EtBHzTg8" role="37wK5m">
-                                                <ref role="3cqZAo" node="554EtBHzQap" resolve="tvd" />
-                                              </node>
-                                              <node concept="3IkZw_" id="554EtBHzTrd" role="37wK5m">
-                                                <node concept="a7P8L" id="554EtBHzT_l" role="3Ikct_">
-                                                  <ref role="a7OzE" node="554EtBHz$WN" resolve="ClsTypeArgs" />
-                                                  <node concept="2OqwBi" id="554EtBHzUHk" role="3gCZO6">
-                                                    <node concept="37vLTw" id="554EtBHzUsJ" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="554EtBHzQap" resolve="tvd" />
-                                                    </node>
-                                                    <node concept="2bSWHS" id="554EtBHzV14" role="2OqNvi" />
-                                                  </node>
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="3cpWsn" id="554EtBHzQap" role="1Duv9x">
-                                        <property role="TrG5h" value="tvd" />
-                                        <node concept="3Tqbb2" id="554EtBHzQjz" role="1tU5fm">
-                                          <ref role="ehGHo" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
-                                        </node>
-                                      </node>
-                                      <node concept="37vLTw" id="554EtBHzR50" role="1DdaDG">
-                                        <ref role="3cqZAo" node="554EtBHz$ZT" resolve="ctvds" />
-                                      </node>
-                                    </node>
-                                    <node concept="3Aqczg" id="4AYiKM_RCNH" role="3cqZAp">
-                                      <node concept="3jm4v3" id="4AYiKM_RCNF" role="3Aqpz8">
-                                        <ref role="3jm46O" to="fa4b:6$MmqWfmo8t" resolve="functionType" />
-                                        <node concept="37vLTw" id="bQfy1SgkiY" role="3jicU7">
-                                          <ref role="3cqZAo" node="bQfy1Sg9q$" resolve="paramTypes" />
-                                        </node>
-                                        <node concept="2OqwBi" id="4AYiKM_RDko" role="3jicU7">
-                                          <node concept="37vLTw" id="4AYiKM_RDf2" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="4AYiKM_RdDr" resolve="mdecl" />
-                                          </node>
-                                          <node concept="3TrEf2" id="4AYiKM_RDnh" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="tpee:fzclF7X" resolve="returnType" />
-                                          </node>
-                                        </node>
-                                        <node concept="37vLTw" id="554EtBHzVCw" role="3jicU7">
-                                          <ref role="3cqZAo" node="554EtBHzHJS" resolve="subs" />
-                                        </node>
-                                        <node concept="a7P8L" id="4AYiKM_RErd" role="3jm6SO">
-                                          <ref role="a7OzE" node="4AYiKM_REqz" resolve="DeclFunT" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="3Aqczg" id="4AYiKM_RErx" role="3cqZAp">
-                                      <node concept="3Aqt3T" id="4AYiKM_RErv" role="3Aqpz8">
-                                        <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="convertsTo" />
-                                        <node concept="a7P8L" id="4AYiKM_REsj" role="3AunhB">
-                                          <ref role="a7OzE" node="4AYiKM_PFK6" resolve="FunT" />
-                                        </node>
-                                        <node concept="a7P8L" id="4AYiKM_REs_" role="3AunhB">
-                                          <ref role="a7OzE" node="4AYiKM_REqz" resolve="DeclFunT" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="4AYiKM_SvB1" role="3cqZAp" />
-                    </node>
-                    <node concept="1Wc70l" id="4AYiKM_RUAV" role="3clFbw">
-                      <node concept="3y3z36" id="4AYiKM_RUM$" role="3uHU7w">
-                        <node concept="10Nm6u" id="4AYiKM_RV2o" role="3uHU7w" />
-                        <node concept="37vLTw" id="4AYiKM_RUBR" role="3uHU7B">
-                          <ref role="3cqZAo" node="4AYiKM_RdDr" resolve="mdecl" />
-                        </node>
-                      </node>
-                      <node concept="3fqX7Q" id="4AYiKM_RTNo" role="3uHU7B">
-                        <node concept="2OqwBi" id="4AYiKM_RUbX" role="3fr31v">
-                          <node concept="37vLTw" id="4AYiKM_RTYM" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4AYiKM_RRr0" resolve="it" />
-                          </node>
-                          <node concept="v0PNk" id="4AYiKM_RUjF" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="4AYiKM_RVNM" role="3cqZAp" />
-            </node>
-            <node concept="22lmx$" id="4AYiKM_RXiz" role="3clFbw">
-              <node concept="2OqwBi" id="4AYiKM_RZea" role="3uHU7w">
-                <node concept="1PxgMI" id="4AYiKM_RYz7" role="2Oq$k0">
-                  <property role="1BlNFB" value="true" />
-                  <node concept="chp4Y" id="4AYiKM_RYRf" role="3oSUPX">
-                    <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
-                  </node>
-                  <node concept="3A2sRY" id="4AYiKM_RXCg" role="1m5AlR">
-                    <ref role="3A2yKK" node="4AYiKM_PVSd" resolve="cls" />
-                  </node>
-                </node>
-                <node concept="3TrcHB" id="4AYiKM_RZYO" role="2OqNvi">
-                  <ref role="3TsBF5" to="tpee:fDsVARU" resolve="abstractClass" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="4AYiKM_RWIT" role="3uHU7B">
-                <node concept="3A2sRY" id="4AYiKM_RVWC" role="2Oq$k0">
-                  <ref role="3A2yKK" node="4AYiKM_PVSd" resolve="cls" />
-                </node>
-                <node concept="1mIQ4w" id="4AYiKM_RWRl" role="2OqNvi">
-                  <node concept="chp4Y" id="4AYiKM_RWRE" role="cj9EA">
-                    <ref role="cht4Q" to="tpee:g7HP654" resolve="Interface" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2t___k" id="4AYiKM_PVSc" role="1nLNMg">
-          <ref role="2t_S0q" to="tpee:g7pOWCK" resolve="Classifier" />
-          <node concept="3A20r5" id="4AYiKM_PVSd" role="2t_VXX">
-            <property role="TrG5h" value="cls" />
-          </node>
-        </node>
-      </node>
-    </node>
   </node>
   <node concept="AVZre" id="554EtBHza_r">
     <property role="3GE5qa" value="rule" />
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 93c16c7f..4770ae11 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
@@ -1065,39 +1065,25 @@
             <node concept="3NuqgR" id="2vhmmFsR$$A" role="0Rg$4">
               <node concept="aZer4" id="2vhmmFsR$$B" role="3XD1gS">
                 <property role="TrG5h" value="ClassP" />
-                <node concept="3cmrfG" id="2vhmmFsR$$T" role="3gj$pD">
-                  <property role="3cmrfH" value="1" />
-                </node>
               </node>
               <node concept="32pEOW" id="24ciDNzxNB7" role="3vLBG7" />
             </node>
             <node concept="3xSepi" id="6E2cNicdiht" role="3xSepv">
               <node concept="3Aq9E8" id="2vhmmFsFOgO" role="3xSepj">
                 <node concept="3I6sU6" id="2vhmmFsFOgP" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="2vhmmFsR$_S" role="3I6sU7">
-                    <node concept="3A8Hvi" id="2vhmmFsR$_M" role="3I6s78">
-                      <node concept="a7P8L" id="2vhmmFsR$Ac" role="3A8wtg">
-                        <ref role="a7OzE" node="2vhmmFsR$$B" resolve="ClassP" />
-                        <node concept="3cmrfG" id="2vhmmFsR$Au" role="3gCZO6">
-                          <property role="3cmrfH" value="0" />
+                  <node concept="3I6s7M" id="3qUnz9vksvO" role="3I6sU7">
+                    <node concept="3jm4v3" id="3qUnz9vksvM" role="3I6s78">
+                      <ref role="3jm46O" node="5itBwMaSqCk" resolve="classifierType" />
+                      <node concept="2OqwBi" id="3qUnz9vky80" role="3jicU7">
+                        <node concept="3A2sRY" id="3qUnz9vkxXA" role="2Oq$k0">
+                          <ref role="3A2yKK" node="2vhmmFsFMOu" resolve="cce" />
+                        </node>
+                        <node concept="3TrEf2" id="3qUnz9vkyky" role="2OqNvi">
+                          <ref role="3Tt5mk" to="tpee:gfVsUgY" resolve="classifier" />
                         </node>
                       </node>
-                      <node concept="ns1u0" id="2vhmmFsTU1R" role="3A8w4Q">
-                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="2vhmmFsTU1T" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2OqwBi" id="5OWkqP4APks" role="nsMwV">
-                            <node concept="2OqwBi" id="5OWkqP4AOOi" role="2Oq$k0">
-                              <node concept="3A2sRY" id="5OWkqP4AOGs" role="2Oq$k0">
-                                <ref role="3A2yKK" node="2vhmmFsFMOu" resolve="cce" />
-                              </node>
-                              <node concept="3TrEf2" id="5OWkqP4AP3o" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:gfVsUgY" resolve="classifier" />
-                              </node>
-                            </node>
-                            <node concept="iZEcu" id="5OWkqP4APTb" role="2OqNvi" />
-                          </node>
-                        </node>
+                      <node concept="a7P8L" id="3qUnz9vkxXt" role="3jm6SO">
+                        <ref role="a7OzE" node="2vhmmFsR$$B" resolve="ClassP" />
                       </node>
                     </node>
                   </node>
@@ -1121,9 +1107,13 @@
                         </node>
                         <node concept="nsMwS" id="2vhmmFsNmw_" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
-                          <node concept="1nq8_$" id="4U$Q3dLmQlE" role="nsMwV">
-                            <node concept="a7P8L" id="4U$Q3dLmQlD" role="1nq8_t">
-                              <ref role="a7OzE" node="2vhmmFsR$$B" resolve="ClassP" />
+                          <node concept="1oi1Uc" id="3qUnz9vksuP" role="nsMwV">
+                            <node concept="KCUsM" id="3qUnz9vksuU" role="1oi0x0">
+                              <node concept="3wAshV" id="3qUnz9vksve" role="KCVpo">
+                                <node concept="a7P8L" id="3qUnz9vksvd" role="3wAq21">
+                                  <ref role="a7OzE" node="2vhmmFsR$$B" resolve="ClassP" />
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -1636,21 +1626,11 @@
               <node concept="3Aq9E8" id="3Qp4N06bUDr" role="3xSepj">
                 <node concept="3I6sU6" id="4nIWweB_sRk" role="3Ip0Jz">
                   <node concept="3I6s7M" id="6P0_DTw26hr" role="3I6sU7">
-                    <node concept="3A8Hvi" id="6P0_DTw26hl" role="3I6s78">
-                      <node concept="a7P8L" id="6P0_DTw26hH" role="3A8wtg">
+                    <node concept="3jm4v3" id="3qUnz9vkcl2" role="3I6s78">
+                      <ref role="3jm46O" node="kHzC1TUgGn" resolve="stringType" />
+                      <node concept="a7P8L" id="3qUnz9vkcl7" role="3jm6SO">
                         <ref role="a7OzE" node="4nIWweB_rEq" resolve="S" />
                       </node>
-                      <node concept="ns1u0" id="6P0_DTw26hM" role="3A8w4Q">
-                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="6P0_DTw26hO" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2tJFMh" id="6P0_DTw26hS" role="nsMwV">
-                            <node concept="ZC_QK" id="6P0_DTw26i0" role="2tJFKM">
-                              <ref role="2aWVGs" to="wyt6:~String" resolve="String" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
                     </node>
                   </node>
                   <node concept="3I6s7M" id="4nIWweB_sRm" role="3I6sU7">
@@ -11222,7 +11202,7 @@
                     <node concept="3I6sU6" id="4OG7ssdkjk1" role="3Ip0Jz">
                       <node concept="3I6s7M" id="7WFMSEuKmjA" role="3I6sU7">
                         <node concept="3jm4v3" id="7WFMSEuKmj$" role="3I6s78">
-                          <ref role="3jm46O" node="7WFMSEuKm9_" resolve="stringType" />
+                          <ref role="3jm46O" node="kHzC1TUgGn" resolve="stringType" />
                           <node concept="a7P8L" id="7WFMSEuKmjR" role="3jm6SO">
                             <ref role="a7OzE" node="4OG7ssdkjYy" resolve="StringT" />
                           </node>
@@ -16315,7 +16295,7 @@
       <node concept="3clFbS" id="5itBwMau8xc" role="3iwQuN">
         <node concept="3Aqczg" id="7WFMSEuKmiB" role="3cqZAp">
           <node concept="3jm4v3" id="7WFMSEuKmi_" role="3Aqpz8">
-            <ref role="3jm46O" node="7WFMSEuKm9_" resolve="stringType" />
+            <ref role="3jm46O" node="kHzC1TUgGn" resolve="stringType" />
             <node concept="a7P8L" id="7WFMSEuKmiG" role="3jm6SO">
               <ref role="a7OzE" node="5itBwMau8xf" resolve="Type" />
             </node>
@@ -16335,66 +16315,72 @@
         </node>
       </node>
     </node>
-    <node concept="3hwh0R" id="7WFMSEuKm9_" role="0oKgB">
+    <node concept="3hwh0R" id="kHzC1TUgGn" role="0oKgB">
       <property role="TrG5h" value="stringType" />
-      <node concept="3clFbS" id="7WFMSEuKm9B" role="3hEL4E">
-        <node concept="3SKdUt" id="4vr5SApPb9r" role="3cqZAp">
-          <node concept="1PaTwC" id="4vr5SApPb9s" role="1aUNEU">
-            <node concept="3oM_SD" id="4vr5SApPb9u" role="1PaTwD">
+      <node concept="3clFbS" id="kHzC1TUgGo" role="3hEL4E">
+        <node concept="3SKdUt" id="kHzC1TUgGp" role="3cqZAp">
+          <node concept="1PaTwC" id="kHzC1TUgGq" role="1aUNEU">
+            <node concept="3oM_SD" id="kHzC1TUgGr" role="1PaTwD">
               <property role="3oM_SC" value="FIXME" />
             </node>
-            <node concept="3oM_SD" id="4vr5SApPb9G" role="1PaTwD">
+            <node concept="3oM_SD" id="kHzC1TUgGs" role="1PaTwD">
               <property role="3oM_SC" value="this" />
             </node>
-            <node concept="3oM_SD" id="4vr5SApPb9J" role="1PaTwD">
+            <node concept="3oM_SD" id="kHzC1TUgGt" role="1PaTwD">
               <property role="3oM_SC" value="must" />
             </node>
-            <node concept="3oM_SD" id="4vr5SApPb9N" role="1PaTwD">
+            <node concept="3oM_SD" id="kHzC1TUgGu" role="1PaTwD">
               <property role="3oM_SC" value="be" />
             </node>
-            <node concept="3oM_SD" id="4vr5SApPb9S" role="1PaTwD">
+            <node concept="3oM_SD" id="kHzC1TUgGv" role="1PaTwD">
               <property role="3oM_SC" value="the" />
             </node>
-            <node concept="3oM_SD" id="4vr5SApPb9Y" role="1PaTwD">
+            <node concept="3oM_SD" id="kHzC1TUgGw" role="1PaTwD">
               <property role="3oM_SC" value="string" />
             </node>
-            <node concept="3oM_SD" id="4vr5SApPba5" role="1PaTwD">
+            <node concept="3oM_SD" id="kHzC1TUgGx" role="1PaTwD">
               <property role="3oM_SC" value="type" />
             </node>
           </node>
         </node>
-        <node concept="3Aqczg" id="2HYHa0WV2Rc" role="3cqZAp">
-          <node concept="3A8Hvi" id="2HYHa0WV2R9" role="3Aqpz8">
-            <node concept="37jhX" id="5HLeEcf2UrF" role="3A8wtg">
-              <node concept="1nq8_$" id="5itBwMau8_1" role="37jj2">
-                <node concept="37jhX" id="7WFMSEuKmf0" role="1nq8_t">
-                  <node concept="1nq8_$" id="7WFMSEuKmeZ" role="37jj2">
-                    <node concept="a7P8L" id="7WFMSEuKmeY" role="1nq8_t">
-                      <ref role="a7OzE" node="7WFMSEuKmcW" resolve="Type" />
+        <node concept="3Aqczg" id="kHzC1TUgGy" role="3cqZAp">
+          <node concept="3A8Hvi" id="kHzC1TUgGz" role="3Aqpz8">
+            <node concept="37jhX" id="kHzC1TUgG$" role="3A8wtg">
+              <node concept="1nq8_$" id="kHzC1TUgG_" role="37jj2">
+                <node concept="37jhX" id="kHzC1TUgGA" role="1nq8_t">
+                  <node concept="1nq8_$" id="kHzC1TUgGB" role="37jj2">
+                    <node concept="a7P8L" id="kHzC1TUgGC" role="1nq8_t">
+                      <ref role="a7OzE" node="kHzC1TUgGL" resolve="Type" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="ns1u0" id="4vr5SApNsrv" role="3A8w4Q">
+            <node concept="ns1u0" id="kHzC1TUgGD" role="3A8w4Q">
               <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-              <node concept="nsMwS" id="4vr5SApNsrx" role="ns1xD">
+              <node concept="nsMwS" id="kHzC1TUgGE" role="ns1xD">
                 <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                <node concept="2tJFMh" id="4vr5SApNsr_" role="nsMwV">
-                  <node concept="ZC_QK" id="4vr5SApNsrH" role="2tJFKM">
+                <node concept="2tJFMh" id="kHzC1TUgGF" role="nsMwV">
+                  <node concept="ZC_QK" id="kHzC1TUgGG" role="2tJFKM">
                     <ref role="2aWVGs" to="wyt6:~String" resolve="String" />
                   </node>
                 </node>
               </node>
+              <node concept="nsMwS" id="kHzC1TUgGH" role="ns1xD">
+                <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
+                <node concept="1oi1Uc" id="kHzC1TUgGI" role="nsMwV">
+                  <node concept="KCUsM" id="kHzC1TUgGJ" role="1oi0x0" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="3uniRu" id="7WFMSEuKmcV" role="3h32gL">
-        <node concept="aZer4" id="7WFMSEuKmcW" role="3XD1gS">
+      <node concept="3uniRu" id="kHzC1TUgGK" role="3h32gL">
+        <node concept="aZer4" id="kHzC1TUgGL" role="3XD1gS">
           <property role="TrG5h" value="Type" />
         </node>
-        <node concept="32pEOW" id="7WFMSEuKmd8" role="3vLBG7" />
+        <node concept="32pEOW" id="kHzC1TUgGM" role="3vLBG7" />
       </node>
     </node>
     <node concept="3iyZe8" id="5itBwMau8FD" role="0oKgB">
@@ -23127,25 +23113,20 @@
               </node>
               <node concept="32pEOW" id="24ciDNzxNEx" role="3vLBG7" />
             </node>
-            <node concept="3xSepi" id="6E2cNicdijQ" role="3xSepv">
-              <node concept="3Aq9E8" id="5XJPBczwl_G" role="3xSepj">
-                <node concept="3I6sU6" id="5XJPBczwl_H" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="5XJPBczwl_S" role="3I6sU7">
-                    <node concept="3A8Hvi" id="5XJPBczwl_P" role="3I6s78">
-                      <node concept="a7P8L" id="5XJPBczwl_X" role="3A8wtg">
-                        <ref role="a7OzE" node="1Py6iKEYXo" resolve="Boxed" />
-                      </node>
-                      <node concept="ns1u0" id="5XJPBczwlA0" role="3A8w4Q">
-                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="5XJPBczwlA2" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2tJFMh" id="5XJPBczwlA6" role="nsMwV">
-                            <node concept="ZC_QK" id="5XJPBczwlAb" role="2tJFKM">
-                              <ref role="2aWVGs" to="wyt6:~Boolean" resolve="Boolean" />
-                            </node>
-                          </node>
+            <node concept="3xSepi" id="3qUnz9vk$ed" role="3xSepv">
+              <node concept="3Aq9E8" id="3qUnz9vk$ee" role="3xSepj">
+                <node concept="3I6sU6" id="3qUnz9vk$ef" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="3qUnz9vk$ey" role="3I6sU7">
+                    <node concept="3jm4v3" id="3qUnz9vk$ew" role="3I6s78">
+                      <ref role="3jm46O" node="3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
+                      <node concept="2tJFMh" id="3qUnz9vk$me" role="3jicU7">
+                        <node concept="ZC_QK" id="3qUnz9vk$mf" role="2tJFKM">
+                          <ref role="2aWVGs" to="wyt6:~Boolean" resolve="Boolean" />
                         </node>
                       </node>
+                      <node concept="a7P8L" id="3qUnz9vk$eB" role="3jm6SO">
+                        <ref role="a7OzE" node="1Py6iKEYXo" resolve="Boxed" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -23190,21 +23171,16 @@
               <node concept="3Aq9E8" id="5XJPBczwlAr" role="3xSepj">
                 <node concept="3I6sU6" id="5XJPBczwlAs" role="3Ip0Jz">
                   <node concept="3I6s7M" id="5XJPBczwlAt" role="3I6sU7">
-                    <node concept="3A8Hvi" id="5XJPBczwlAu" role="3I6s78">
-                      <node concept="a7P8L" id="5XJPBczwlCZ" role="3A8wtg">
-                        <ref role="a7OzE" node="5TXeSYSGpTY" resolve="Boxed" />
-                      </node>
-                      <node concept="ns1u0" id="5XJPBczwlAw" role="3A8w4Q">
-                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="5XJPBczwlAx" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2tJFMh" id="5XJPBczwlAy" role="nsMwV">
-                            <node concept="ZC_QK" id="5XJPBczwlD4" role="2tJFKM">
-                              <ref role="2aWVGs" to="wyt6:~Character" resolve="Character" />
-                            </node>
-                          </node>
+                    <node concept="3jm4v3" id="3qUnz9vk$mM" role="3I6s78">
+                      <ref role="3jm46O" node="3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
+                      <node concept="2tJFMh" id="3qUnz9vk$mN" role="3jicU7">
+                        <node concept="ZC_QK" id="3qUnz9vk$ne" role="2tJFKM">
+                          <ref role="2aWVGs" to="wyt6:~Character" resolve="Character" />
                         </node>
                       </node>
+                      <node concept="a7P8L" id="3qUnz9vk$mP" role="3jm6SO">
+                        <ref role="a7OzE" node="5TXeSYSGpTY" resolve="Boxed" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -23249,21 +23225,16 @@
               <node concept="3Aq9E8" id="5XJPBczwlDa" role="3xSepj">
                 <node concept="3I6sU6" id="5XJPBczwlDb" role="3Ip0Jz">
                   <node concept="3I6s7M" id="5XJPBczwlDc" role="3I6sU7">
-                    <node concept="3A8Hvi" id="5XJPBczwlDd" role="3I6s78">
-                      <node concept="a7P8L" id="5XJPBczwlDe" role="3A8wtg">
-                        <ref role="a7OzE" node="5TXeSYSGqix" resolve="Boxed" />
-                      </node>
-                      <node concept="ns1u0" id="5XJPBczwlDf" role="3A8w4Q">
-                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="5XJPBczwlDg" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2tJFMh" id="5XJPBczwlDh" role="nsMwV">
-                            <node concept="ZC_QK" id="5XJPBczwlEK" role="2tJFKM">
-                              <ref role="2aWVGs" to="wyt6:~Byte" resolve="Byte" />
-                            </node>
-                          </node>
+                    <node concept="3jm4v3" id="3qUnz9vk$nk" role="3I6s78">
+                      <ref role="3jm46O" node="3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
+                      <node concept="2tJFMh" id="3qUnz9vk$nl" role="3jicU7">
+                        <node concept="ZC_QK" id="3qUnz9vk$nK" role="2tJFKM">
+                          <ref role="2aWVGs" to="wyt6:~Byte" resolve="Byte" />
                         </node>
                       </node>
+                      <node concept="a7P8L" id="3qUnz9vk$nn" role="3jm6SO">
+                        <ref role="a7OzE" node="5TXeSYSGqix" resolve="Boxed" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -23308,21 +23279,16 @@
               <node concept="3Aq9E8" id="5XJPBczwlEQ" role="3xSepj">
                 <node concept="3I6sU6" id="5XJPBczwlER" role="3Ip0Jz">
                   <node concept="3I6s7M" id="5XJPBczwlES" role="3I6sU7">
-                    <node concept="3A8Hvi" id="5XJPBczwlET" role="3I6s78">
-                      <node concept="a7P8L" id="5XJPBczwlEU" role="3A8wtg">
-                        <ref role="a7OzE" node="5TXeSYSGqzH" resolve="Boxed" />
-                      </node>
-                      <node concept="ns1u0" id="5XJPBczwlEV" role="3A8w4Q">
-                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="5XJPBczwlEW" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2tJFMh" id="5XJPBczwlEX" role="nsMwV">
-                            <node concept="ZC_QK" id="7AyqXCdzcPw" role="2tJFKM">
-                              <ref role="2aWVGs" to="wyt6:~Short" resolve="Short" />
-                            </node>
-                          </node>
+                    <node concept="3jm4v3" id="3qUnz9vk$nQ" role="3I6s78">
+                      <ref role="3jm46O" node="3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
+                      <node concept="2tJFMh" id="3qUnz9vk$nR" role="3jicU7">
+                        <node concept="ZC_QK" id="3qUnz9vk$oi" role="2tJFKM">
+                          <ref role="2aWVGs" to="wyt6:~Short" resolve="Short" />
                         </node>
                       </node>
+                      <node concept="a7P8L" id="3qUnz9vk$nT" role="3jm6SO">
+                        <ref role="a7OzE" node="5TXeSYSGqzH" resolve="Boxed" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -23367,21 +23333,16 @@
               <node concept="3Aq9E8" id="5XJPBczwlGQ" role="3xSepj">
                 <node concept="3I6sU6" id="5XJPBczwlGR" role="3Ip0Jz">
                   <node concept="3I6s7M" id="5XJPBczwlGS" role="3I6sU7">
-                    <node concept="3A8Hvi" id="5XJPBczwlGT" role="3I6s78">
-                      <node concept="a7P8L" id="5XJPBczwlGU" role="3A8wtg">
-                        <ref role="a7OzE" node="5TXeSYSGqOT" resolve="Boxed" />
-                      </node>
-                      <node concept="ns1u0" id="5XJPBczwlGV" role="3A8w4Q">
-                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="5XJPBczwlGW" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2tJFMh" id="5XJPBczwlGX" role="nsMwV">
-                            <node concept="ZC_QK" id="5XJPBczwlJ8" role="2tJFKM">
-                              <ref role="2aWVGs" to="wyt6:~Integer" resolve="Integer" />
-                            </node>
-                          </node>
+                    <node concept="3jm4v3" id="3qUnz9vk$oo" role="3I6s78">
+                      <ref role="3jm46O" node="3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
+                      <node concept="2tJFMh" id="3qUnz9vk$op" role="3jicU7">
+                        <node concept="ZC_QK" id="3qUnz9vk$oO" role="2tJFKM">
+                          <ref role="2aWVGs" to="wyt6:~Integer" resolve="Integer" />
                         </node>
                       </node>
+                      <node concept="a7P8L" id="3qUnz9vk$or" role="3jm6SO">
+                        <ref role="a7OzE" node="5TXeSYSGqOT" resolve="Boxed" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -23426,21 +23387,16 @@
               <node concept="3Aq9E8" id="5XJPBczwlJe" role="3xSepj">
                 <node concept="3I6sU6" id="5XJPBczwlJf" role="3Ip0Jz">
                   <node concept="3I6s7M" id="5XJPBczwlJg" role="3I6sU7">
-                    <node concept="3A8Hvi" id="5XJPBczwlJh" role="3I6s78">
-                      <node concept="a7P8L" id="5XJPBczwlJi" role="3A8wtg">
-                        <ref role="a7OzE" node="5TXeSYSGr6b" resolve="Boxed" />
-                      </node>
-                      <node concept="ns1u0" id="5XJPBczwlJj" role="3A8w4Q">
-                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="5XJPBczwlJk" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2tJFMh" id="5XJPBczwlJl" role="nsMwV">
-                            <node concept="ZC_QK" id="5XJPBczwlLK" role="2tJFKM">
-                              <ref role="2aWVGs" to="wyt6:~Long" resolve="Long" />
-                            </node>
-                          </node>
+                    <node concept="3jm4v3" id="3qUnz9vk$oU" role="3I6s78">
+                      <ref role="3jm46O" node="3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
+                      <node concept="2tJFMh" id="3qUnz9vk$oV" role="3jicU7">
+                        <node concept="ZC_QK" id="3qUnz9vk$pm" role="2tJFKM">
+                          <ref role="2aWVGs" to="wyt6:~Long" resolve="Long" />
                         </node>
                       </node>
+                      <node concept="a7P8L" id="3qUnz9vk$oX" role="3jm6SO">
+                        <ref role="a7OzE" node="5TXeSYSGr6b" resolve="Boxed" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -23485,21 +23441,16 @@
               <node concept="3Aq9E8" id="5XJPBczwlLQ" role="3xSepj">
                 <node concept="3I6sU6" id="5XJPBczwlLR" role="3Ip0Jz">
                   <node concept="3I6s7M" id="5XJPBczwlLS" role="3I6sU7">
-                    <node concept="3A8Hvi" id="5XJPBczwlLT" role="3I6s78">
-                      <node concept="a7P8L" id="5XJPBczwlLU" role="3A8wtg">
-                        <ref role="a7OzE" node="5TXeSYSGrjN" resolve="Boxed" />
-                      </node>
-                      <node concept="ns1u0" id="5XJPBczwlLV" role="3A8w4Q">
-                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="5XJPBczwlLW" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2tJFMh" id="5XJPBczwlLX" role="nsMwV">
-                            <node concept="ZC_QK" id="5XJPBczwlOK" role="2tJFKM">
-                              <ref role="2aWVGs" to="wyt6:~Float" resolve="Float" />
-                            </node>
-                          </node>
+                    <node concept="3jm4v3" id="3qUnz9vk$ps" role="3I6s78">
+                      <ref role="3jm46O" node="3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
+                      <node concept="2tJFMh" id="3qUnz9vk$pt" role="3jicU7">
+                        <node concept="ZC_QK" id="3qUnz9vk$pS" role="2tJFKM">
+                          <ref role="2aWVGs" to="wyt6:~Float" resolve="Float" />
                         </node>
                       </node>
+                      <node concept="a7P8L" id="3qUnz9vk$pv" role="3jm6SO">
+                        <ref role="a7OzE" node="5TXeSYSGrjN" resolve="Boxed" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -23544,21 +23495,16 @@
               <node concept="3Aq9E8" id="5XJPBczwlOQ" role="3xSepj">
                 <node concept="3I6sU6" id="5XJPBczwlOR" role="3Ip0Jz">
                   <node concept="3I6s7M" id="5XJPBczwlOS" role="3I6sU7">
-                    <node concept="3A8Hvi" id="5XJPBczwlOT" role="3I6s78">
-                      <node concept="a7P8L" id="5XJPBczwlOU" role="3A8wtg">
-                        <ref role="a7OzE" node="5TXeSYSGr_h" resolve="Boxed" />
-                      </node>
-                      <node concept="ns1u0" id="5XJPBczwlOV" role="3A8w4Q">
-                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="5XJPBczwlOW" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2tJFMh" id="5XJPBczwlOX" role="nsMwV">
-                            <node concept="ZC_QK" id="5XJPBczwlS0" role="2tJFKM">
-                              <ref role="2aWVGs" to="wyt6:~Double" resolve="Double" />
-                            </node>
-                          </node>
+                    <node concept="3jm4v3" id="3qUnz9vk$pY" role="3I6s78">
+                      <ref role="3jm46O" node="3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
+                      <node concept="2tJFMh" id="3qUnz9vk$pZ" role="3jicU7">
+                        <node concept="ZC_QK" id="3qUnz9vk$qq" role="2tJFKM">
+                          <ref role="2aWVGs" to="wyt6:~Double" resolve="Double" />
                         </node>
                       </node>
+                      <node concept="a7P8L" id="3qUnz9vk$q1" role="3jm6SO">
+                        <ref role="a7OzE" node="5TXeSYSGr_h" resolve="Boxed" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -31842,16 +31788,8 @@
                       <node concept="a7P8L" id="6P0_DTw25Pq" role="3A8wtg">
                         <ref role="a7OzE" node="2HYHa0WD7Lp" resolve="Out" />
                       </node>
-                      <node concept="ns1u0" id="6P0_DTw25Pv" role="3A8w4Q">
-                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="6P0_DTw25PV" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2tJFMh" id="6P0_DTw25PZ" role="nsMwV">
-                            <node concept="ZC_QK" id="6P0_DTw25Q0" role="2tJFKM">
-                              <ref role="2aWVGs" to="wyt6:~String" resolve="String" />
-                            </node>
-                          </node>
-                        </node>
+                      <node concept="a7P8L" id="3qUnz9vkYW8" role="3A8w4Q">
+                        <ref role="a7OzE" node="2HYHa0WD7Ls" resolve="InS" />
                       </node>
                     </node>
                   </node>
@@ -31918,16 +31856,8 @@
                       <node concept="a7P8L" id="6P0_DTw25Tp" role="3A8wtg">
                         <ref role="a7OzE" node="5TXeSYSGjY_" resolve="Out" />
                       </node>
-                      <node concept="ns1u0" id="6P0_DTw25Tq" role="3A8w4Q">
-                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="6P0_DTw25Tr" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2tJFMh" id="6P0_DTw25Ts" role="nsMwV">
-                            <node concept="ZC_QK" id="6P0_DTw25Tt" role="2tJFKM">
-                              <ref role="2aWVGs" to="wyt6:~String" resolve="String" />
-                            </node>
-                          </node>
-                        </node>
+                      <node concept="a7P8L" id="3qUnz9vkYWh" role="3A8w4Q">
+                        <ref role="a7OzE" node="5TXeSYSGjYB" resolve="InT" />
                       </node>
                     </node>
                   </node>
@@ -34091,6 +34021,45 @@
         </node>
       </node>
     </node>
+    <node concept="3hwh0R" id="3qUnz9vk$1o" role="0oKgB">
+      <property role="TrG5h" value="classifierTypeNonGeneric" />
+      <node concept="3hPv5a" id="3qUnz9vk$cM" role="3hP23H">
+        <property role="TrG5h" value="clsPtr" />
+        <node concept="2sp9CU" id="3qUnz9vk$cQ" role="3hPmi9">
+          <ref role="2sp9C9" to="tpee:g7pOWCK" resolve="Classifier" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3qUnz9vk$1q" role="3hEL4E">
+        <node concept="3Aqczg" id="3qUnz9vk$dz" role="3cqZAp">
+          <node concept="3A8Hvi" id="3qUnz9vk$dw" role="3Aqpz8">
+            <node concept="a7P8L" id="3qUnz9vk$dC" role="3A8wtg">
+              <ref role="a7OzE" node="3qUnz9vk$cV" resolve="Type" />
+            </node>
+            <node concept="ns1u0" id="3qUnz9vk$dJ" role="3A8w4Q">
+              <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
+              <node concept="nsMwS" id="3qUnz9vk$dL" role="ns1xD">
+                <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
+                <node concept="3hN9Ij" id="3qUnz9vk$dP" role="nsMwV">
+                  <ref role="3hLkJx" node="3qUnz9vk$cM" resolve="clsPtr" />
+                </node>
+              </node>
+              <node concept="nsMwS" id="3qUnz9vk$e2" role="ns1xD">
+                <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
+                <node concept="1oi1Uc" id="3qUnz9vk$e3" role="nsMwV">
+                  <node concept="KCUsM" id="3qUnz9vk$e4" role="1oi0x0" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uniRu" id="3qUnz9vk$cU" role="3h32gL">
+        <node concept="aZer4" id="3qUnz9vk$cV" role="3XD1gS">
+          <property role="TrG5h" value="Type" />
+        </node>
+        <node concept="32pEOW" id="3qUnz9vk$d7" role="3vLBG7" />
+      </node>
+    </node>
     <node concept="3hwh0R" id="5itBwMaSqCk" role="0oKgB">
       <property role="TrG5h" value="classifierType" />
       <node concept="3hPv5a" id="5itBwMaSCVV" role="3hP23H">
@@ -34155,6 +34124,12 @@
                         <node concept="iZEcu" id="5Oz70LKcJCZ" role="2OqNvi" />
                       </node>
                     </node>
+                    <node concept="nsMwS" id="3qUnz9uNRCj" role="ns1xD">
+                      <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
+                      <node concept="1oi1Uc" id="3qUnz9uNRCt" role="nsMwV">
+                        <node concept="KCUsM" id="3qUnz9uNRCy" role="1oi0x0" />
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
@@ -34595,22 +34570,17 @@
                               </node>
                               <node concept="9aQIb" id="4Q8MVs_1EsU" role="9aQIa">
                                 <node concept="3clFbS" id="4Q8MVs_1EsV" role="9aQI4">
-                                  <node concept="3Aqczg" id="4Q8MVs_1E$w" role="3cqZAp">
-                                    <node concept="3A8Hvi" id="4Q8MVs_1E$x" role="3Aqpz8">
-                                      <node concept="a7P8L" id="4Q8MVs_1ECp" role="3A8wtg">
-                                        <ref role="a7OzE" node="4Q8MVs$ZJNp" resolve="Bound" />
-                                      </node>
-                                      <node concept="ns1u0" id="4Q8MVs_1E$z" role="3A8w4Q">
-                                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                                        <node concept="nsMwS" id="4Q8MVs_1E$$" role="ns1xD">
-                                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                                          <node concept="2tJFMh" id="4Q8MVs_1E$_" role="nsMwV">
-                                            <node concept="ZC_QK" id="4Q8MVs_1E$A" role="2tJFKM">
-                                              <ref role="2aWVGs" to="wyt6:~Object" resolve="Object" />
-                                            </node>
-                                          </node>
+                                  <node concept="3Aqczg" id="3qUnz9vkXjX" role="3cqZAp">
+                                    <node concept="3jm4v3" id="3qUnz9vkXjV" role="3Aqpz8">
+                                      <ref role="3jm46O" node="3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
+                                      <node concept="2tJFMh" id="3qUnz9vkXkb" role="3jicU7">
+                                        <node concept="ZC_QK" id="3qUnz9vkXw7" role="2tJFKM">
+                                          <ref role="2aWVGs" to="wyt6:~Object" resolve="Object" />
                                         </node>
                                       </node>
+                                      <node concept="a7P8L" id="3qUnz9vkXk2" role="3jm6SO">
+                                        <ref role="a7OzE" node="4Q8MVs$ZJNp" resolve="Bound" />
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
@@ -36775,21 +36745,16 @@
               <node concept="3Aq9E8" id="4$mmEcR8qXZ" role="3xSepj">
                 <node concept="3I6sU6" id="4$mmEcR8qY0" role="3Ip0Jz">
                   <node concept="3I6s7M" id="4$mmEcR8qY1" role="3I6sU7">
-                    <node concept="3A8Hvi" id="4$mmEcR8qY2" role="3I6s78">
-                      <node concept="a7P8L" id="4$mmEcR8qY4" role="3A8wtg">
-                        <ref role="a7OzE" node="4$mmEcR8qXV" resolve="Var" />
-                      </node>
-                      <node concept="ns1u0" id="4$mmEcR8r2D" role="3A8w4Q">
-                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="4$mmEcR8r2E" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2tJFMh" id="4$mmEcR8r2F" role="nsMwV">
-                            <node concept="ZC_QK" id="4$mmEcR8r2G" role="2tJFKM">
-                              <ref role="2aWVGs" to="wyt6:~Object" resolve="Object" />
-                            </node>
-                          </node>
+                    <node concept="3jm4v3" id="3qUnz9vkYXq" role="3I6s78">
+                      <ref role="3jm46O" node="3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
+                      <node concept="2tJFMh" id="3qUnz9vkYXr" role="3jicU7">
+                        <node concept="ZC_QK" id="3qUnz9vkYXs" role="2tJFKM">
+                          <ref role="2aWVGs" to="wyt6:~Object" resolve="Object" />
                         </node>
                       </node>
+                      <node concept="a7P8L" id="3qUnz9vkYZ0" role="3jm6SO">
+                        <ref role="a7OzE" node="4$mmEcR8qXV" resolve="Var" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -43078,6 +43043,7 @@
             </node>
             <node concept="2OqwBi" id="4ZxjFYHiCbX" role="33vP2m">
               <node concept="2OqwBi" id="4ZxjFYHiBER" role="2Oq$k0">
+                <node concept="1KnU$U" id="4ZxjFYHiC3x" role="2OqNvi" />
                 <node concept="2OqwBi" id="ZJPHcumEJg" role="2Oq$k0">
                   <node concept="2OqwBi" id="4ZxjFYHiwR8" role="2Oq$k0">
                     <node concept="37vLTw" id="7NX8kJ7gY_o" role="2Oq$k0">
@@ -43106,7 +43072,6 @@
                   </node>
                   <node concept="1VAtEI" id="ZJPHcumFbm" role="2OqNvi" />
                 </node>
-                <node concept="1KnU$U" id="4ZxjFYHiC3x" role="2OqNvi" />
               </node>
               <node concept="ANE8D" id="4ZxjFYHiC$x" role="2OqNvi" />
             </node>
@@ -46627,6 +46592,12 @@
                                 </node>
                               </node>
                             </node>
+                            <node concept="nsMwS" id="3qUnz9vkYC1" role="ns1xD">
+                              <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
+                              <node concept="1oi1Uc" id="3qUnz9vkYD8" role="nsMwV">
+                                <node concept="KCUsM" id="3qUnz9vkYDd" role="1oi0x0" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -47376,6 +47347,12 @@
         </node>
         <node concept="32pEOW" id="554EtBHVtR5" role="3vLBG7" />
       </node>
+      <node concept="3uniRu" id="3qUnz9vhT3m" role="3hEOkk">
+        <node concept="aZer4" id="3qUnz9vhT3n" role="3XD1gS">
+          <property role="TrG5h" value="CtxTyVars" />
+        </node>
+        <node concept="VbTHi" id="3qUnz9vhT3D" role="3vLBG7" />
+      </node>
     </node>
     <node concept="3hwh0R" id="554EtBI25Se" role="0oKgB">
       <property role="TrG5h" value="instCheckTyScheme" />
@@ -49175,14 +49152,14 @@
                   <node concept="3j8tct" id="ZJPHcupUwR" role="2Oq$k0">
                     <ref role="3j8tcu" node="ZJPHcupMTa" resolve="cls" />
                   </node>
-                  <node concept="iZEcu" id="ZJPHcupULz" role="2OqNvi" />
+                  <node concept="iZEcu" id="3qUnz9vfKAA" role="2OqNvi" />
                 </node>
               </node>
-              <node concept="nsMwS" id="ZJPHcuuQyO" role="ns1xD">
+              <node concept="nsMwS" id="3qUnz9vfKB3" role="ns1xD">
                 <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
-                <node concept="1nq8_$" id="ZJPHcuuQz4" role="nsMwV">
-                  <node concept="Hz6ka" id="ZJPHcuuQz3" role="1nq8_t">
-                    <node concept="2IllgU" id="ZJPHcuuQzb" role="Hz6kd" />
+                <node concept="1nq8_$" id="3qUnz9vfMUQ" role="nsMwV">
+                  <node concept="a7P8L" id="3qUnz9vfMUP" role="1nq8_t">
+                    <ref role="a7OzE" node="3qUnz9vfF_P" resolve="TVs" />
                   </node>
                 </node>
               </node>
@@ -49226,6 +49203,12 @@
         </node>
         <node concept="32pEOW" id="ZJPHcupUsO" role="3vLBG7" />
       </node>
+      <node concept="3uniRu" id="3qUnz9vfF_O" role="3iJhzY">
+        <node concept="aZer4" id="3qUnz9vfF_P" role="3XD1gS">
+          <property role="TrG5h" value="TVs" />
+        </node>
+        <node concept="VbTHi" id="3qUnz9vfIP2" role="3vLBG7" />
+      </node>
     </node>
     <node concept="3iyZe8" id="ZJPHcupm5H" role="0oKgB">
       <ref role="3iRiWT" node="ZJPHcupkoM" resolve="liftDecl" />
@@ -49243,46 +49226,6 @@
             </node>
           </node>
         </node>
-        <node concept="3SKdUt" id="ZJPHcusHaG" role="3cqZAp">
-          <node concept="1PaTwC" id="ZJPHcusHaH" role="1aUNEU">
-            <node concept="3oM_SD" id="ZJPHcusHaI" role="1PaTwD">
-              <property role="3oM_SC" value="fixme:" />
-            </node>
-            <node concept="3oM_SD" id="ZJPHcusHbG" role="1PaTwD">
-              <property role="3oM_SC" value="should" />
-            </node>
-            <node concept="3oM_SD" id="ZJPHcusHbJ" role="1PaTwD">
-              <property role="3oM_SC" value="non-overriden" />
-            </node>
-            <node concept="3oM_SD" id="ZJPHcusHbN" role="1PaTwD">
-              <property role="3oM_SC" value="list" />
-            </node>
-            <node concept="3oM_SD" id="ZJPHcusHbS" role="1PaTwD">
-              <property role="3oM_SC" value="features" />
-            </node>
-            <node concept="3oM_SD" id="ZJPHcusHdi" role="1PaTwD">
-              <property role="3oM_SC" value="generate" />
-            </node>
-            <node concept="3oM_SD" id="ZJPHcusHcd" role="1PaTwD">
-              <property role="3oM_SC" value="into" />
-            </node>
-            <node concept="3oM_SD" id="ZJPHcusHcm" role="1PaTwD">
-              <property role="3oM_SC" value="empty" />
-            </node>
-            <node concept="3oM_SD" id="ZJPHcusHcw" role="1PaTwD">
-              <property role="3oM_SC" value="lists?" />
-            </node>
-            <node concept="3oM_SD" id="ZJPHcusHcF" role="1PaTwD">
-              <property role="3oM_SC" value="maybe" />
-            </node>
-            <node concept="3oM_SD" id="ZJPHcusHcR" role="1PaTwD">
-              <property role="3oM_SC" value="into" />
-            </node>
-            <node concept="3oM_SD" id="ZJPHcusHd4" role="1PaTwD">
-              <property role="3oM_SC" value="wildcards?" />
-            </node>
-          </node>
-        </node>
         <node concept="3Aqczg" id="ZJPHcupGoZ" role="3cqZAp">
           <node concept="3A8Hvi" id="ZJPHcupGoT" role="3Aqpz8">
             <node concept="a7P8L" id="ZJPHcupGpB" role="3A8wtg">
@@ -49306,10 +49249,12 @@
                   </node>
                 </node>
               </node>
-              <node concept="nsMwS" id="ZJPHcusH8k" role="ns1xD">
+              <node concept="nsMwS" id="3qUnz9vfzh7" role="ns1xD">
                 <ref role="nsMwP" node="ZJPHcupkiC" resolve="typeParams" />
-                <node concept="1oi1Uc" id="ZJPHcusH8u" role="nsMwV">
-                  <node concept="2IllgU" id="ZJPHcusH8z" role="1oi0x0" />
+                <node concept="1nq8_$" id="3qUnz9vfEd1" role="nsMwV">
+                  <node concept="a7P8L" id="3qUnz9vfEd0" role="1nq8_t">
+                    <ref role="a7OzE" node="3qUnz9vfBSH" resolve="TVs" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -49442,6 +49387,12 @@
         </node>
         <node concept="32pEOW" id="ZJPHcuppO7" role="3vLBG7" />
       </node>
+      <node concept="3uniRu" id="3qUnz9vfBSG" role="3iJhzY">
+        <node concept="aZer4" id="3qUnz9vfBSH" role="3XD1gS">
+          <property role="TrG5h" value="TVs" />
+        </node>
+        <node concept="VbTHi" id="3qUnz9vfCO9" role="3vLBG7" />
+      </node>
     </node>
     <node concept="3hwh0R" id="5itBwMaKt1g" role="0oKgB">
       <property role="TrG5h" value="genericDeclaration" />
@@ -50139,22 +50090,17 @@
           </node>
           <node concept="9aQIb" id="4btN1w5LE8x" role="9aQIa">
             <node concept="3clFbS" id="4btN1w5LE8y" role="9aQI4">
-              <node concept="3Aqczg" id="4btN1w5LE8z" role="3cqZAp">
-                <node concept="3A8Hvi" id="4btN1w5LE8$" role="3Aqpz8">
-                  <node concept="a7P8L" id="4btN1w5LE8_" role="3A8wtg">
-                    <ref role="a7OzE" node="4btN1w5LDZc" resolve="Bound" />
-                  </node>
-                  <node concept="ns1u0" id="4btN1w5LE8A" role="3A8w4Q">
-                    <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                    <node concept="nsMwS" id="4btN1w5LE8B" role="ns1xD">
-                      <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                      <node concept="2tJFMh" id="4btN1w5LE8C" role="nsMwV">
-                        <node concept="ZC_QK" id="4btN1w5LE8D" role="2tJFKM">
-                          <ref role="2aWVGs" to="wyt6:~Object" resolve="Object" />
-                        </node>
-                      </node>
+              <node concept="3Aqczg" id="3qUnz9vkXy4" role="3cqZAp">
+                <node concept="3jm4v3" id="3qUnz9vkXy5" role="3Aqpz8">
+                  <ref role="3jm46O" node="3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
+                  <node concept="2tJFMh" id="3qUnz9vkXy6" role="3jicU7">
+                    <node concept="ZC_QK" id="3qUnz9vkXkj" role="2tJFKM">
+                      <ref role="2aWVGs" to="wyt6:~Object" resolve="Object" />
                     </node>
                   </node>
+                  <node concept="a7P8L" id="3qUnz9vkXy7" role="3jm6SO">
+                    <ref role="a7OzE" node="4btN1w5LDZc" resolve="Bound" />
+                  </node>
                 </node>
               </node>
             </node>
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 30f91cb3..ea7df0ec 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
@@ -560,7 +560,7 @@
       </node>
     </node>
     <node concept="1LZb2c" id="3XUOzow_cBQ" role="1SL9yI">
-      <property role="TrG5h" value="awConversions" />
+      <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">