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 4779a0f9..00bb834f 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
@@ -4092,22 +4092,6 @@
           </node>
         </node>
         <node concept="3clFbH" id="53tmmMsXx7g" role="3cqZAp" />
-        <node concept="3cpWs8" id="53tmmMsX89r" role="3cqZAp">
-          <node concept="3cpWsn" id="53tmmMsX89s" role="3cpWs9">
-            <property role="TrG5h" value="mdecl" />
-            <node concept="3Tqbb2" id="53tmmMsX89t" role="1tU5fm">
-              <ref role="ehGHo" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-            </node>
-            <node concept="2OqwBi" id="53tmmMsXaEW" role="33vP2m">
-              <node concept="3A2sRY" id="53tmmMsXa8v" role="2Oq$k0">
-                <ref role="3A2yKK" node="4xoHD1Gi1m8" resolve="anonCls" />
-              </node>
-              <node concept="3TrEf2" id="53tmmMsXfem" role="2OqNvi">
-                <ref role="3Tt5mk" to="tpee:2yoSzAaKW1s" resolve="constructorDeclaration" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3cpWs8" id="53tmmMsX89B" role="3cqZAp">
           <node concept="3cpWsn" id="53tmmMsX89C" role="3cpWs9">
             <property role="TrG5h" value="mTyArgs" />
@@ -4157,6 +4141,47 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="6v6oK22kTrU" role="3cqZAp">
+          <node concept="3cpWsn" id="6v6oK22kTrV" role="3cpWs9">
+            <property role="TrG5h" value="cdecl" />
+            <node concept="3Tqbb2" id="6v6oK22kSXR" role="1tU5fm">
+              <ref role="ehGHo" to="tpee:fzclF84" resolve="ConstructorDeclaration" />
+            </node>
+            <node concept="2OqwBi" id="6v6oK22kTrW" role="33vP2m">
+              <node concept="3A2sRY" id="6v6oK22kTrX" role="2Oq$k0">
+                <ref role="3A2yKK" node="4xoHD1Gi1m8" resolve="anonCls" />
+              </node>
+              <node concept="3TrEf2" id="6v6oK22kTrY" role="2OqNvi">
+                <ref role="3Tt5mk" to="tpee:2yoSzAaKW1s" resolve="constructorDeclaration" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="53tmmMsX89r" role="3cqZAp">
+          <node concept="3cpWsn" id="53tmmMsX89s" role="3cpWs9">
+            <property role="TrG5h" value="mdecl" />
+            <node concept="3Tqbb2" id="53tmmMsX89t" role="1tU5fm">
+              <ref role="ehGHo" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
+            </node>
+            <node concept="3K4zz7" id="6v6oK22kSDD" role="33vP2m">
+              <node concept="37vLTw" id="6v6oK22kTEF" role="3K4E3e">
+                <ref role="3cqZAo" node="6v6oK22kTrV" resolve="cdecl" />
+              </node>
+              <node concept="10Nm6u" id="6v6oK22kTG9" role="3K4GZi" />
+              <node concept="3clFbC" id="6v6oK22kRNj" role="3K4Cdx">
+                <node concept="37vLTw" id="6v6oK22kSa8" role="3uHU7w">
+                  <ref role="3cqZAo" node="53tmmMt5_Yh" resolve="baseCls" />
+                </node>
+                <node concept="2OqwBi" id="6v6oK22kMF8" role="3uHU7B">
+                  <node concept="37vLTw" id="6v6oK22kTrZ" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6v6oK22kTrV" resolve="constructorDeclaration" />
+                  </node>
+                  <node concept="1mfA1w" id="6v6oK22kPag" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="53tmmMt5Bhc" role="3cqZAp">
           <node concept="3cpWsn" id="53tmmMt5Bhd" role="3cpWs9">
             <property role="TrG5h" value="baseClsTvds" />
@@ -4544,6 +4569,23 @@
                               </node>
                             </node>
                           </node>
+                          <node concept="3Aqczg" id="3hZrJU5ho2a" role="3cqZAp">
+                            <node concept="3jm4v3" id="3hZrJU5ho27" role="3Aqpz8">
+                              <ref role="3jm46O" node="3hZrJU5cHtp" resolve="checkMethodCall" />
+                              <node concept="3A2sRY" id="3hZrJU5ho50" role="3jicU7">
+                                <ref role="3A2yKK" node="4xoHD1Gi1m8" resolve="anonCls" />
+                              </node>
+                              <node concept="a7P8L" id="3hZrJU5hp95" role="3jm6SO">
+                                <ref role="a7OzE" node="3hZrJU5hp7Q" resolve="VoidRetT" />
+                              </node>
+                              <node concept="a7P8L" id="3hZrJU5ho42" role="3jm6SO">
+                                <ref role="a7OzE" node="53tmmMsXI_3" resolve="InstMethSig" />
+                              </node>
+                              <node concept="a7P8L" id="3hZrJU5ho4Q" role="3jm6SO">
+                                <ref role="a7OzE" node="53tmmMsXI_7" resolve="ArgsT" />
+                              </node>
+                            </node>
+                          </node>
                         </node>
                         <node concept="3y3z36" id="5NUR$NqEkE" role="3clFbw">
                           <node concept="10Nm6u" id="5NUR$NqEkL" role="3uHU7w" />
@@ -4553,23 +4595,6 @@
                         </node>
                       </node>
                       <node concept="3clFbH" id="53tmmMsXIAQ" role="3cqZAp" />
-                      <node concept="3Aqczg" id="3hZrJU5ho2a" role="3cqZAp">
-                        <node concept="3jm4v3" id="3hZrJU5ho27" role="3Aqpz8">
-                          <ref role="3jm46O" node="3hZrJU5cHtp" resolve="checkMethodCall" />
-                          <node concept="3A2sRY" id="3hZrJU5ho50" role="3jicU7">
-                            <ref role="3A2yKK" node="4xoHD1Gi1m8" resolve="anonCls" />
-                          </node>
-                          <node concept="a7P8L" id="3hZrJU5hp95" role="3jm6SO">
-                            <ref role="a7OzE" node="3hZrJU5hp7Q" resolve="VoidRetT" />
-                          </node>
-                          <node concept="a7P8L" id="3hZrJU5ho42" role="3jm6SO">
-                            <ref role="a7OzE" node="53tmmMsXI_3" resolve="InstMethSig" />
-                          </node>
-                          <node concept="a7P8L" id="3hZrJU5ho4Q" role="3jm6SO">
-                            <ref role="a7OzE" node="53tmmMsXI_7" resolve="ArgsT" />
-                          </node>
-                        </node>
-                      </node>
                       <node concept="3Aqczg" id="53tmmMsXIBg" role="3cqZAp">
                         <node concept="3Aqt3T" id="53tmmMsXIBh" role="3Aqpz8">
                           <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />