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 0d442499..21341c74 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
@@ -31788,7 +31788,7 @@
     <node concept="3hwh0R" id="5itBwMaELbq" role="0oKgB">
       <property role="TrG5h" value="longType" />
       <node concept="3hPv5a" id="5itBwMaEMcg" role="3hP23H">
-        <property role="TrG5h" value="value" />
+        <property role="TrG5h" value="svalue" />
         <node concept="17QB3L" id="5itBwMaF3uf" role="3hPmi9" />
       </node>
       <node concept="3clFbS" id="5itBwMaELbs" role="3hEL4E">
@@ -31796,47 +31796,51 @@
           <node concept="3clFbS" id="5XJPBczy$R9" role="1zxBo7">
             <node concept="3clFbJ" id="5XJPBczUo9V" role="3cqZAp">
               <node concept="3clFbS" id="5XJPBczUo9X" role="3clFbx">
+                <node concept="3cpWs8" id="6BxgBHb8GQw" role="3cqZAp">
+                  <node concept="3cpWsn" id="6BxgBHb8GQx" role="3cpWs9">
+                    <property role="TrG5h" value="lvalue" />
+                    <property role="3TUv4t" value="true" />
+                    <node concept="3uibUv" id="6BxgBHbbYSC" role="1tU5fm">
+                      <ref role="3uigEE" to="wyt6:~Long" resolve="Long" />
+                    </node>
+                    <node concept="2YIFZM" id="6BxgBHb8GQy" role="33vP2m">
+                      <ref role="1Pybhc" to="wyt6:~Long" resolve="Long" />
+                      <ref role="37wK5l" to="wyt6:~Long.parseLong(java.lang.String)" resolve="parseLong" />
+                      <node concept="2OqwBi" id="6BxgBHb8GQz" role="37wK5m">
+                        <node concept="3hN9Ij" id="6BxgBHb8GQ$" role="2Oq$k0">
+                          <ref role="3hLkJx" node="5itBwMaEMcg" resolve="svalue" />
+                        </node>
+                        <node concept="liA8E" id="6BxgBHb8GQ_" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
+                          <node concept="3cmrfG" id="6BxgBHb8GQA" role="37wK5m">
+                            <property role="3cmrfH" value="0" />
+                          </node>
+                          <node concept="3cpWsd" id="6BxgBHb8GQB" role="37wK5m">
+                            <node concept="3cmrfG" id="6BxgBHb8GQC" role="3uHU7w">
+                              <property role="3cmrfH" value="1" />
+                            </node>
+                            <node concept="2OqwBi" id="6BxgBHb8GQD" role="3uHU7B">
+                              <node concept="3hN9Ij" id="6BxgBHb8GQE" role="2Oq$k0">
+                                <ref role="3hLkJx" node="5itBwMaEMcg" resolve="svalue" />
+                              </node>
+                              <node concept="liA8E" id="6BxgBHb8GQF" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
                 <node concept="3Aqczg" id="5XJPBczy$Rf" role="3cqZAp">
                   <node concept="3A8Hvi" id="5XJPBczy$Rg" role="3Aqpz8">
                     <node concept="ns1u0" id="5XJPBczy$Rj" role="3A8w4Q">
                       <ref role="ns1xF" node="JOGAOsVt2U" resolve="_long_" />
                       <node concept="nsMwS" id="5XJPBczy$Rk" role="ns1xD">
                         <ref role="nsMwP" node="JOGAOsVt2X" resolve="val" />
-                        <node concept="2YIFZM" id="4vr5SApBKIJ" role="nsMwV">
-                          <ref role="37wK5l" to="wyt6:~Long.parseLong(java.lang.String)" resolve="parseLong" />
-                          <ref role="1Pybhc" to="wyt6:~Long" resolve="Long" />
-                          <node concept="1nq8_$" id="5itBwMaET_C" role="37wK5m">
-                            <node concept="37jhX" id="5itBwMaET_B" role="1nq8_t">
-                              <node concept="2OqwBi" id="5itBwMaF5iH" role="37jj2">
-                                <node concept="3hN9Ij" id="5itBwMaET__" role="2Oq$k0">
-                                  <ref role="3hLkJx" node="5itBwMaEMcg" resolve="value" />
-                                </node>
-                                <node concept="liA8E" id="5itBwMaF6ne" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
-                                  <node concept="3cmrfG" id="4vr5SApBKIN" role="37wK5m">
-                                    <property role="3cmrfH" value="0" />
-                                  </node>
-                                  <node concept="3cpWsd" id="4vr5SApBKIO" role="37wK5m">
-                                    <node concept="3cmrfG" id="4vr5SApBKIP" role="3uHU7w">
-                                      <property role="3cmrfH" value="1" />
-                                    </node>
-                                    <node concept="1nq8_$" id="5itBwMaEU5c" role="3uHU7B">
-                                      <node concept="37jhX" id="5itBwMaEU5b" role="1nq8_t">
-                                        <node concept="2OqwBi" id="5itBwMaF0Gz" role="37jj2">
-                                          <node concept="3hN9Ij" id="5itBwMaEU59" role="2Oq$k0">
-                                            <ref role="3hLkJx" node="5itBwMaEMcg" resolve="value" />
-                                          </node>
-                                          <node concept="liA8E" id="5itBwMaF1vR" role="2OqNvi">
-                                            <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
+                        <node concept="37vLTw" id="6BxgBHb8GSv" role="nsMwV">
+                          <ref role="3cqZAo" node="6BxgBHb8GQx" resolve="lvalue" />
                         </node>
                       </node>
                     </node>
@@ -31850,7 +31854,7 @@
               <node concept="1Wc70l" id="7AyqXCdL3$l" role="3clFbw">
                 <node concept="3y3z36" id="5XJPBczUowo" role="3uHU7B">
                   <node concept="3hN9Ij" id="5itBwMaESdr" role="3uHU7B">
-                    <ref role="3hLkJx" node="5itBwMaEMcg" resolve="value" />
+                    <ref role="3hLkJx" node="5itBwMaEMcg" resolve="svalue" />
                   </node>
                   <node concept="10Nm6u" id="5XJPBczUowv" role="3uHU7w" />
                 </node>
@@ -31858,7 +31862,7 @@
                   <node concept="22lmx$" id="7AyqXCdL4JM" role="1eOMHV">
                     <node concept="2OqwBi" id="7AyqXCdL3U_" role="3uHU7B">
                       <node concept="3hN9Ij" id="5itBwMaET6q" role="2Oq$k0">
-                        <ref role="3hLkJx" node="5itBwMaEMcg" resolve="value" />
+                        <ref role="3hLkJx" node="5itBwMaEMcg" resolve="svalue" />
                       </node>
                       <node concept="liA8E" id="7AyqXCdL4s$" role="2OqNvi">
                         <ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
@@ -31869,7 +31873,7 @@
                     </node>
                     <node concept="2OqwBi" id="7AyqXCdL4JZ" role="3uHU7w">
                       <node concept="3hN9Ij" id="5itBwMaET85" role="2Oq$k0">
-                        <ref role="3hLkJx" node="5itBwMaEMcg" resolve="value" />
+                        <ref role="3hLkJx" node="5itBwMaEMcg" resolve="svalue" />
                       </node>
                       <node concept="liA8E" id="7AyqXCdL4K1" role="2OqNvi">
                         <ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />