diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps
index 27c029f8..e33e97f6 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps
@@ -10738,80 +10738,88 @@
           </node>
         </node>
         <node concept="3clFbH" id="4OKkcnfu_yz" role="3cqZAp" />
-        <node concept="3cpWs8" id="4OKkcnfu_y$" role="3cqZAp">
-          <node concept="3cpWsn" id="4OKkcnfu_y_" role="3cpWs9">
-            <property role="TrG5h" value="text" />
-            <node concept="17QB3L" id="4OKkcnfu_yA" role="1tU5fm" />
-            <node concept="2OqwBi" id="4OKkcnfu_yB" role="33vP2m">
-              <node concept="2YIFZM" id="4OKkcnfu_yC" role="2Oq$k0">
-                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                <node concept="37vLTw" id="4OKkcnfu_yD" role="37wK5m">
-                  <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
+        <node concept="1X3_iC" id="2mbQB8IY7km" role="lGtFl">
+          <property role="3V$3am" value="statement" />
+          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+          <node concept="3cpWs8" id="4OKkcnfu_y$" role="8Wnug">
+            <node concept="3cpWsn" id="4OKkcnfu_y_" role="3cpWs9">
+              <property role="TrG5h" value="text" />
+              <node concept="17QB3L" id="4OKkcnfu_yA" role="1tU5fm" />
+              <node concept="2OqwBi" id="4OKkcnfu_yB" role="33vP2m">
+                <node concept="2YIFZM" id="4OKkcnfu_yC" role="2Oq$k0">
+                  <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                  <node concept="37vLTw" id="4OKkcnfu_yD" role="37wK5m">
+                    <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
+                  </node>
                 </node>
+                <node concept="EvHYZ" id="4OKkcnfu_yE" role="2OqNvi" />
               </node>
-              <node concept="EvHYZ" id="4OKkcnfu_yE" role="2OqNvi" />
             </node>
           </node>
         </node>
-        <node concept="2ty0qM" id="4OKkcnfu_yF" role="3cqZAp">
-          <node concept="1Qi9sc" id="4OKkcnfu_yG" role="1YN4dH">
-            <node concept="1OJ37Q" id="4OKkcnfu_yH" role="1QigWp">
-              <node concept="2t4tHJ" id="4OKkcnfu_yI" role="1OLpdg" />
-              <node concept="1OJ37Q" id="4OKkcnfu_yJ" role="1OLqdY">
-                <node concept="1Tukvm" id="4OKkcnfu_yK" role="1OLpdg">
-                  <property role="TrG5h" value="ascii" />
-                  <node concept="1OClNT" id="4OKkcnfu_yL" role="1TuGhC">
-                    <node concept="2e2xP4" id="4OKkcnfu_yM" role="1OLDsb">
-                      <ref role="2e2_8$" node="4OKkcnfu_yK" resolve="ascii" />
+        <node concept="1X3_iC" id="2mbQB8IY7kn" role="lGtFl">
+          <property role="3V$3am" value="statement" />
+          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+          <node concept="2ty0qM" id="4OKkcnfu_yF" role="8Wnug">
+            <node concept="1Qi9sc" id="4OKkcnfu_yG" role="1YN4dH">
+              <node concept="1OJ37Q" id="4OKkcnfu_yH" role="1QigWp">
+                <node concept="2t4tHJ" id="4OKkcnfu_yI" role="1OLpdg" />
+                <node concept="1OJ37Q" id="4OKkcnfu_yJ" role="1OLqdY">
+                  <node concept="1Tukvm" id="4OKkcnfu_yK" role="1OLpdg">
+                    <property role="TrG5h" value="ascii" />
+                    <node concept="1OClNT" id="4OKkcnfu_yL" role="1TuGhC">
+                      <node concept="2e2xP4" id="4OKkcnfu_yM" role="1OLDsb">
+                        <ref role="2e2_8$" node="4OKkcnfu_yK" resolve="ascii" />
+                      </node>
                     </node>
                   </node>
-                </node>
-                <node concept="1OCmVF" id="4OKkcnfu_yN" role="1OLqdY">
-                  <node concept="1T2EwR" id="4OKkcnfu_yO" role="1OLDsb" />
+                  <node concept="1OCmVF" id="4OKkcnfu_yN" role="1OLqdY">
+                    <node concept="1T2EwR" id="4OKkcnfu_yO" role="1OLDsb" />
+                  </node>
                 </node>
               </node>
             </node>
-          </node>
-          <node concept="37vLTw" id="4OKkcnfu_yP" role="2ty3UH">
-            <ref role="3cqZAo" node="4OKkcnfu_y_" resolve="text" />
-          </node>
-          <node concept="3clFbS" id="4OKkcnfu_yQ" role="2tyzPh">
-            <node concept="3cpWs6" id="4OKkcnfu_yR" role="3cqZAp">
-              <node concept="2YIFZM" id="4OKkcnfu_yS" role="3cqZAk">
-                <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
-                <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
-                <node concept="Xl_RD" id="4OKkcnfu_yT" role="37wK5m">
-                  <property role="Xl_RC" value="node_3" />
-                </node>
-                <node concept="2YIFZM" id="4OKkcnfu_yU" role="37wK5m">
-                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
-                  <node concept="Xl_RD" id="4OKkcnfu_yV" role="37wK5m">
-                    <property role="Xl_RC" value="concept" />
+            <node concept="37vLTw" id="4OKkcnfu_yP" role="2ty3UH">
+              <ref role="3cqZAo" node="4OKkcnfu_y_" resolve="text" />
+            </node>
+            <node concept="3clFbS" id="4OKkcnfu_yQ" role="2tyzPh">
+              <node concept="3cpWs6" id="4OKkcnfu_yR" role="3cqZAp">
+                <node concept="2YIFZM" id="4OKkcnfu_yS" role="3cqZAk">
+                  <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+                  <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
+                  <node concept="Xl_RD" id="4OKkcnfu_yT" role="37wK5m">
+                    <property role="Xl_RC" value="node_3" />
                   </node>
-                  <node concept="37vLTw" id="4OKkcnfu_yW" role="37wK5m">
-                    <ref role="3cqZAo" node="4OKkcnfu_xT" resolve="cpt" />
+                  <node concept="2YIFZM" id="4OKkcnfu_yU" role="37wK5m">
+                    <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                    <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+                    <node concept="Xl_RD" id="4OKkcnfu_yV" role="37wK5m">
+                      <property role="Xl_RC" value="concept" />
+                    </node>
+                    <node concept="37vLTw" id="4OKkcnfu_yW" role="37wK5m">
+                      <ref role="3cqZAo" node="4OKkcnfu_xT" resolve="cpt" />
+                    </node>
                   </node>
-                </node>
-                <node concept="2YIFZM" id="4OKkcnfu_yX" role="37wK5m">
-                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
-                  <node concept="Xl_RD" id="4OKkcnfu_yY" role="37wK5m">
-                    <property role="Xl_RC" value="text" />
+                  <node concept="2YIFZM" id="4OKkcnfu_yX" role="37wK5m">
+                    <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                    <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+                    <node concept="Xl_RD" id="4OKkcnfu_yY" role="37wK5m">
+                      <property role="Xl_RC" value="text" />
+                    </node>
+                    <node concept="1TxZTf" id="4OKkcnfu_yZ" role="37wK5m">
+                      <ref role="1Ty1U8" node="4OKkcnfu_yK" resolve="ascii" />
+                    </node>
                   </node>
-                  <node concept="1TxZTf" id="4OKkcnfu_yZ" role="37wK5m">
-                    <ref role="1Ty1U8" node="4OKkcnfu_yK" resolve="ascii" />
-                  </node>
-                </node>
-                <node concept="2YIFZM" id="4OKkcnfu_z0" role="37wK5m">
-                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
-                  <node concept="Xl_RD" id="4OKkcnfu_z1" role="37wK5m">
-                    <property role="Xl_RC" value="id" />
-                  </node>
-                  <node concept="37vLTw" id="4OKkcnfu_z2" role="37wK5m">
-                    <ref role="3cqZAo" node="4OKkcnfu_y2" resolve="id" />
+                  <node concept="2YIFZM" id="4OKkcnfu_z0" role="37wK5m">
+                    <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                    <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+                    <node concept="Xl_RD" id="4OKkcnfu_z1" role="37wK5m">
+                      <property role="Xl_RC" value="id" />
+                    </node>
+                    <node concept="37vLTw" id="4OKkcnfu_z2" role="37wK5m">
+                      <ref role="3cqZAo" node="4OKkcnfu_y2" resolve="id" />
+                    </node>
                   </node>
                 </node>
               </node>