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 8cfd00b1..0d442499 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
@@ -47062,82 +47062,97 @@
     <node concept="1nLNMY" id="12QmIo_7sjL" role="1nK1Vg">
       <property role="TrG5h" value="variableReference" />
       <node concept="3clFbS" id="12QmIo_7sjM" role="1nLNMH">
-        <node concept="1nLNNL" id="12QmIo_7sjN" role="3cqZAp">
-          <node concept="1nLNMm" id="12QmIo_7sjO" role="1nLNNK">
-            <node concept="3Aq93q" id="34$A1MfacdF" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="34$A1MfacdG" role="3Ip0Jz">
-                <node concept="3I6s7M" id="5moyjRHo5vI" role="3I6sU7">
-                  <node concept="3Aqt3T" id="5moyjRHo5vG" role="3I6s78">
-                    <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
-                    <node concept="37jhX" id="1TH_SRmhrt8" role="3AunhB">
-                      <node concept="2OqwBi" id="5moyjRHo5vV" role="37jj2">
-                        <node concept="3A2sRY" id="5moyjRHo5vW" role="2Oq$k0">
-                          <ref role="3A2yKK" node="7gr_romnvxW" resolve="vref" />
+        <node concept="3clFbJ" id="7kXqzcT$yzI" role="3cqZAp">
+          <node concept="3clFbS" id="7kXqzcT$yzK" role="3clFbx">
+            <node concept="1nLNNL" id="12QmIo_7sjN" role="3cqZAp">
+              <node concept="1nLNMm" id="12QmIo_7sjO" role="1nLNNK">
+                <node concept="3Aq93q" id="34$A1MfacdF" role="1nLNMb">
+                  <property role="3ArMco" value="true" />
+                  <node concept="3I6sU6" id="34$A1MfacdG" role="3Ip0Jz">
+                    <node concept="3I6s7M" id="5moyjRHo5vI" role="3I6sU7">
+                      <node concept="3Aqt3T" id="5moyjRHo5vG" role="3I6s78">
+                        <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
+                        <node concept="37jhX" id="1TH_SRmhrt8" role="3AunhB">
+                          <node concept="2OqwBi" id="5moyjRHo5vV" role="37jj2">
+                            <node concept="3A2sRY" id="5moyjRHo5vW" role="2Oq$k0">
+                              <ref role="3A2yKK" node="7gr_romnvxW" resolve="vref" />
+                            </node>
+                            <node concept="3TrEf2" id="5moyjRHo5vX" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:fzcqZ_w" resolve="variableDeclaration" />
+                            </node>
+                          </node>
                         </node>
-                        <node concept="3TrEf2" id="5moyjRHo5vX" role="2OqNvi">
-                          <ref role="3Tt5mk" to="tpee:fzcqZ_w" resolve="variableDeclaration" />
+                        <node concept="a7P8L" id="5moyjRHo65E" role="3AunhB">
+                          <ref role="a7OzE" node="7mm1a3qT4HQ" resolve="DeclType" />
                         </node>
                       </node>
                     </node>
-                    <node concept="a7P8L" id="5moyjRHo65E" role="3AunhB">
-                      <ref role="a7OzE" node="7mm1a3qT4HQ" resolve="DeclType" />
+                  </node>
+                </node>
+                <node concept="3NuqgR" id="4nIWweB_uLk" role="0Rg$4">
+                  <node concept="aZer4" id="7mm1a3qT4HQ" role="3XD1gS">
+                    <property role="TrG5h" value="DeclType" />
+                  </node>
+                  <node concept="aZer4" id="2HYHa0WMaIa" role="3XD1gS">
+                    <property role="TrG5h" value="StripT" />
+                  </node>
+                  <node concept="aZer4" id="3R6X$QVSRaY" role="3XD1gS">
+                    <property role="TrG5h" value="CaptureT" />
+                  </node>
+                  <node concept="32pEOW" id="24ciDNzxNBh" role="3vLBG7" />
+                </node>
+                <node concept="3xSepi" id="6E2cNicdihB" role="3xSepv">
+                  <node concept="3Aq9E8" id="7gr_romnvqt" role="3xSepj">
+                    <node concept="3I6sU6" id="4nIWweB_v4C" role="3Ip0Jz">
+                      <node concept="3I6s7M" id="2HYHa0WMaNb" role="3I6sU7">
+                        <node concept="3Aqt3T" id="2HYHa0WMaN9" role="3I6s78">
+                          <ref role="3AqCNq" node="2HYHa0WMaId" resolve="stripValue" />
+                          <node concept="a7P8L" id="2HYHa0WMaNt" role="3AunhB">
+                            <ref role="a7OzE" node="2HYHa0WMaIa" resolve="StripT" />
+                          </node>
+                          <node concept="a7P8L" id="2HYHa0WMaNz" role="3AunhB">
+                            <ref role="a7OzE" node="7mm1a3qT4HQ" resolve="DeclType" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3I6s7M" id="3R6X$QVSRyw" role="3I6sU7">
+                        <node concept="3Aqt3T" id="3R6X$QVSRyu" role="3I6s78">
+                          <ref role="3AqCNq" node="3wxtToEiJ2p" resolve="capture" />
+                          <node concept="a7P8L" id="3R6X$QVSRAz" role="3AunhB">
+                            <ref role="a7OzE" node="3R6X$QVSRaY" resolve="CaptureT" />
+                          </node>
+                          <node concept="a7P8L" id="3R6X$QVSRPX" role="3AunhB">
+                            <ref role="a7OzE" node="2HYHa0WMaIa" resolve="StripT" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3I6s7M" id="2HYHa0WMaMG" role="3I6sU7">
+                        <node concept="3Aqt3T" id="34$A1MfhpMJ" role="3I6s78">
+                          <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
+                          <node concept="37jhX" id="1TH_SRmhrt9" role="3AunhB">
+                            <node concept="3A2sRY" id="34$A1MfhpMH" role="37jj2">
+                              <ref role="3A2yKK" node="7gr_romnvxW" resolve="vref" />
+                            </node>
+                          </node>
+                          <node concept="a7P8L" id="3R6X$QVSS1z" role="3AunhB">
+                            <ref role="a7OzE" node="3R6X$QVSRaY" resolve="CaptureT" />
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3NuqgR" id="4nIWweB_uLk" role="0Rg$4">
-              <node concept="aZer4" id="7mm1a3qT4HQ" role="3XD1gS">
-                <property role="TrG5h" value="DeclType" />
+          </node>
+          <node concept="3y3z36" id="7kXqzcT$yTS" role="3clFbw">
+            <node concept="10Nm6u" id="7kXqzcT$z2U" role="3uHU7w" />
+            <node concept="2OqwBi" id="7kXqzcT$yHF" role="3uHU7B">
+              <node concept="3A2sRY" id="7kXqzcT$y$o" role="2Oq$k0">
+                <ref role="3A2yKK" node="7gr_romnvxW" resolve="vref" />
               </node>
-              <node concept="aZer4" id="2HYHa0WMaIa" role="3XD1gS">
-                <property role="TrG5h" value="StripT" />
-              </node>
-              <node concept="aZer4" id="3R6X$QVSRaY" role="3XD1gS">
-                <property role="TrG5h" value="CaptureT" />
-              </node>
-              <node concept="32pEOW" id="24ciDNzxNBh" role="3vLBG7" />
-            </node>
-            <node concept="3xSepi" id="6E2cNicdihB" role="3xSepv">
-              <node concept="3Aq9E8" id="7gr_romnvqt" role="3xSepj">
-                <node concept="3I6sU6" id="4nIWweB_v4C" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="2HYHa0WMaNb" role="3I6sU7">
-                    <node concept="3Aqt3T" id="2HYHa0WMaN9" role="3I6s78">
-                      <ref role="3AqCNq" node="2HYHa0WMaId" resolve="stripValue" />
-                      <node concept="a7P8L" id="2HYHa0WMaNt" role="3AunhB">
-                        <ref role="a7OzE" node="2HYHa0WMaIa" resolve="StripT" />
-                      </node>
-                      <node concept="a7P8L" id="2HYHa0WMaNz" role="3AunhB">
-                        <ref role="a7OzE" node="7mm1a3qT4HQ" resolve="DeclType" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3I6s7M" id="3R6X$QVSRyw" role="3I6sU7">
-                    <node concept="3Aqt3T" id="3R6X$QVSRyu" role="3I6s78">
-                      <ref role="3AqCNq" node="3wxtToEiJ2p" resolve="capture" />
-                      <node concept="a7P8L" id="3R6X$QVSRAz" role="3AunhB">
-                        <ref role="a7OzE" node="3R6X$QVSRaY" resolve="CaptureT" />
-                      </node>
-                      <node concept="a7P8L" id="3R6X$QVSRPX" role="3AunhB">
-                        <ref role="a7OzE" node="2HYHa0WMaIa" resolve="StripT" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3I6s7M" id="2HYHa0WMaMG" role="3I6sU7">
-                    <node concept="3Aqt3T" id="34$A1MfhpMJ" role="3I6s78">
-                      <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
-                      <node concept="37jhX" id="1TH_SRmhrt9" role="3AunhB">
-                        <node concept="3A2sRY" id="34$A1MfhpMH" role="37jj2">
-                          <ref role="3A2yKK" node="7gr_romnvxW" resolve="vref" />
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="3R6X$QVSS1z" role="3AunhB">
-                        <ref role="a7OzE" node="3R6X$QVSRaY" resolve="CaptureT" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
+              <node concept="3TrEf2" id="7kXqzcT$ySw" role="2OqNvi">
+                <ref role="3Tt5mk" to="tpee:fzcqZ_w" resolve="variableDeclaration" />
               </node>
             </node>
           </node>