diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features.mps
index 2b280cd6..fa9650be 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features.mps
@@ -672,9 +672,9 @@
             <ref role="37wK5l" node="1Py6iKHgUp" resolve="callMe" />
             <node concept="3cmrfG" id="1Py6iKHiep" role="37wK5m">
               <property role="3cmrfH" value="10" />
-            </node>
-            <node concept="1U20sH" id="1yt2T3TAgmf" role="lGtFl">
-              <property role="1U20sK" value="error" />
+              <node concept="1U20sH" id="2JTW8QYSCra" role="lGtFl">
+                <property role="1U20sK" value="error" />
+              </node>
             </node>
           </node>
         </node>
@@ -4018,9 +4018,9 @@
             <ref role="37wK5l" node="6EY0p2ylTPI" resolve="callMe" />
             <node concept="3cmrfG" id="6EY0p2ylW8t" role="37wK5m">
               <property role="3cmrfH" value="10" />
-            </node>
-            <node concept="1U20sH" id="1yt2T3TAks2" role="lGtFl">
-              <property role="1U20sK" value="error" />
+              <node concept="1U20sH" id="2JTW8QYSMC6" role="lGtFl">
+                <property role="1U20sK" value="error" />
+              </node>
             </node>
           </node>
         </node>
@@ -5698,9 +5698,9 @@
               <ref role="37wK5l" node="5XJPBczwaS7" resolve="primchar" />
               <node concept="37vLTw" id="5XJPBczO8AZ" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczO7Dr" resolve="b" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczPMeX" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT1Vy" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -5716,9 +5716,9 @@
               <ref role="37wK5l" node="5XJPBczwaS7" resolve="primchar" />
               <node concept="37vLTw" id="5XJPBczVY60" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczO7D$" resolve="s" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczVY3S" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT1X8" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -5749,9 +5749,9 @@
               <ref role="37wK5l" node="5XJPBczO6Id" resolve="primbyte" />
               <node concept="37vLTw" id="5XJPBczO9nL" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczO7Dk" resolve="c" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczPMs9" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT23L" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -5767,9 +5767,9 @@
               <ref role="37wK5l" node="5XJPBczO6Id" resolve="primbyte" />
               <node concept="37vLTw" id="5XJPBczO9p6" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczO7D$" resolve="s" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczPMBS" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT25n" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -5800,9 +5800,9 @@
               <ref role="37wK5l" node="5XJPBczO6Ka" resolve="primshort" />
               <node concept="37vLTw" id="5XJPBczVY3J" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczO7Dk" resolve="c" />
-              </node>
-              <node concept="1U20sH" id="7AyqXCdN$Je" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT26X" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -5833,9 +5833,9 @@
               <ref role="37wK5l" node="5XJPBczO6Ka" resolve="primshort" />
               <node concept="37vLTw" id="5XJPBczOaWk" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczO7E6" resolve="i" />
-              </node>
-              <node concept="1U20sH" id="7AyqXCdN$Xf" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT2c6" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -5911,9 +5911,9 @@
               <ref role="37wK5l" node="5XJPBczO6Lx" resolve="primint" />
               <node concept="37vLTw" id="5XJPBczOaZX" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczO7Ej" resolve="l" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczW0ZE" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT2dG" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -5974,9 +5974,9 @@
               <ref role="37wK5l" node="5XJPBczO6Ol" resolve="primfloat" />
               <node concept="37vLTw" id="5XJPBczObZl" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczO7EN" resolve="d" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczPMOV" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT2jw" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6092,9 +6092,9 @@
               <ref role="37wK5l" node="5XJPBczwaU9" resolve="boxedCharacter" />
               <node concept="37vLTw" id="5XJPBczXGAi" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczXG_S" resolve="b" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczXGAj" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT2zm" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6110,9 +6110,9 @@
               <ref role="37wK5l" node="5XJPBczwaU9" resolve="boxedCharacter" />
               <node concept="37vLTw" id="5XJPBczXGAp" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczXG_U" resolve="s" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczXGAq" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT2An" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6143,9 +6143,9 @@
               <ref role="37wK5l" node="5XJPBczO6R7" resolve="boxedByte" />
               <node concept="37vLTw" id="5XJPBczXGAA" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczXG_Q" resolve="c" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczXGAB" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT2C1" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6161,9 +6161,9 @@
               <ref role="37wK5l" node="5XJPBczO6R7" resolve="boxedByte" />
               <node concept="37vLTw" id="5XJPBczXGAH" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczXG_U" resolve="s" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczXGAI" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT2He" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6194,9 +6194,9 @@
               <ref role="37wK5l" node="5XJPBczO6T4" resolve="boxedShort" />
               <node concept="37vLTw" id="5XJPBczXGAU" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczXG_Q" resolve="c" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczXIwn" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT2IS" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6212,9 +6212,9 @@
               <ref role="37wK5l" node="5XJPBczO6T4" resolve="boxedShort" />
               <node concept="37vLTw" id="5XJPBczXGB0" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczXG_S" resolve="b" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczXIG8" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT2O5" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6230,9 +6230,9 @@
               <ref role="37wK5l" node="5XJPBczO6T4" resolve="boxedShort" />
               <node concept="37vLTw" id="5XJPBczXGB6" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczXG_W" resolve="i" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczXIKK" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT2SD" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6263,9 +6263,9 @@
               <ref role="37wK5l" node="5XJPBczO6V9" resolve="boxedInteger" />
               <node concept="37vLTw" id="5XJPBczXGBi" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczXG_U" resolve="s" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczXIV2" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT2VI" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6281,9 +6281,9 @@
               <ref role="37wK5l" node="5XJPBczO6V9" resolve="boxedInteger" />
               <node concept="37vLTw" id="5XJPBczXGBo" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczXG_S" resolve="b" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczXIXB" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT2Yb" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6299,9 +6299,9 @@
               <ref role="37wK5l" node="5XJPBczO6V9" resolve="boxedInteger" />
               <node concept="37vLTw" id="5XJPBczXGBu" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczXG_Q" resolve="c" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczXJ4j" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT2ZR" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6317,9 +6317,9 @@
               <ref role="37wK5l" node="5XJPBczO6V9" resolve="boxedInteger" />
               <node concept="37vLTw" id="5XJPBczXGB$" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczXG_Y" resolve="l" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczXGB_" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT32l" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6350,9 +6350,9 @@
               <ref role="37wK5l" node="5XJPBczO71S" resolve="boxedLong" />
               <node concept="37vLTw" id="5XJPBczXGBL" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczXG_W" resolve="i" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczXJ6T" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT38d" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6383,9 +6383,9 @@
               <ref role="37wK5l" node="5XJPBczO73z" resolve="boxedFloat" />
               <node concept="37vLTw" id="5XJPBczXGBX" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczXGA2" resolve="d" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczXGBY" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT3cO" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6416,9 +6416,9 @@
               <ref role="37wK5l" node="5XJPBczO75c" resolve="boxedDouble" />
               <node concept="37vLTw" id="5XJPBczXGCa" role="37wK5m">
                 <ref role="3cqZAo" node="5XJPBczXGA0" resolve="f" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczXJ9u" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT3eu" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6485,9 +6485,9 @@
               <ref role="37wK5l" node="5XJPBczwaS7" resolve="primchar" />
               <node concept="3cmrfG" id="5XJPBczW3hm" role="37wK5m">
                 <property role="3cmrfH" value="1" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczWdP5" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYSXYh" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6518,9 +6518,9 @@
               <ref role="37wK5l" node="5XJPBczO6Id" resolve="primbyte" />
               <node concept="1Xhbcc" id="5XJPBczW3TX" role="37wK5m">
                 <property role="1XhdNS" value="a" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczWdZm" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYSZU7" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6536,9 +6536,9 @@
               <ref role="37wK5l" node="5XJPBczO6Id" resolve="primbyte" />
               <node concept="3cmrfG" id="5XJPBczW4j_" role="37wK5m">
                 <property role="3cmrfH" value="1" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczWeb6" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYSZUW" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6554,9 +6554,9 @@
               <ref role="37wK5l" node="5XJPBczO6Id" resolve="primbyte" />
               <node concept="3cmrfG" id="5XJPBczW6EB" role="37wK5m">
                 <property role="3cmrfH" value="128" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczWeln" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT065" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6572,9 +6572,9 @@
               <ref role="37wK5l" node="5XJPBczO6Ka" resolve="primshort" />
               <node concept="3cmrfG" id="5XJPBczW4lN" role="37wK5m">
                 <property role="3cmrfH" value="1" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczWevC" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT0ew" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6590,9 +6590,9 @@
               <ref role="37wK5l" node="5XJPBczO6Ka" resolve="primshort" />
               <node concept="3cmrfG" id="5XJPBczW6GP" role="37wK5m">
                 <property role="3cmrfH" value="35768" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczWeDT" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT0dF" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6608,9 +6608,9 @@
               <ref role="37wK5l" node="5XJPBczO6Ka" resolve="primshort" />
               <node concept="1Xhbcc" id="5XJPBczW509" role="37wK5m">
                 <property role="1XhdNS" value="a" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczWeOa" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT0cQ" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6641,9 +6641,9 @@
               <ref role="37wK5l" node="5XJPBczO6Lx" resolve="primint" />
               <node concept="3b6qkQ" id="5XJPBczW7v9" role="37wK5m">
                 <property role="$nhwW" value="1.1" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczWeZU" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT0fl" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6659,9 +6659,9 @@
               <ref role="37wK5l" node="5XJPBczO6Lx" resolve="primint" />
               <node concept="3b6qkQ" id="5XJPBczW8ky" role="37wK5m">
                 <property role="$nhwW" value="1.1d" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczWf5K" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT0hK" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6737,9 +6737,9 @@
               <ref role="37wK5l" node="5XJPBczO6Ol" resolve="primfloat" />
               <node concept="3b6qkQ" id="5XJPBczWayX" role="37wK5m">
                 <property role="$nhwW" value="1.1" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczWfbA" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT0i_" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6770,9 +6770,9 @@
               <ref role="37wK5l" node="5XJPBczO6Ol" resolve="primfloat" />
               <node concept="3b6qkQ" id="5XJPBczWfe6" role="37wK5m">
                 <property role="$nhwW" value="1.1d" />
-              </node>
-              <node concept="1U20sH" id="5XJPBczWg6r" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT0pd" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6884,9 +6884,9 @@
               <ref role="37wK5l" node="5XJPBczwaU9" resolve="boxedCharacter" />
               <node concept="3cmrfG" id="7AyqXCd$L$u" role="37wK5m">
                 <property role="3cmrfH" value="1" />
-              </node>
-              <node concept="1U20sH" id="7AyqXCd$L$v" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT0Dg" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6917,9 +6917,9 @@
               <ref role="37wK5l" node="5XJPBczO6R7" resolve="boxedByte" />
               <node concept="1Xhbcc" id="7AyqXCd$L$F" role="37wK5m">
                 <property role="1XhdNS" value="a" />
-              </node>
-              <node concept="1U20sH" id="7AyqXCd$L$G" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT0NE" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6935,9 +6935,9 @@
               <ref role="37wK5l" node="5XJPBczO6R7" resolve="boxedByte" />
               <node concept="3cmrfG" id="7AyqXCd$L$M" role="37wK5m">
                 <property role="3cmrfH" value="1" />
-              </node>
-              <node concept="1U20sH" id="7AyqXCd$L$N" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT0S4" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6953,9 +6953,9 @@
               <ref role="37wK5l" node="5XJPBczO6R7" resolve="boxedByte" />
               <node concept="3cmrfG" id="7AyqXCd$L$T" role="37wK5m">
                 <property role="3cmrfH" value="128" />
-              </node>
-              <node concept="1U20sH" id="7AyqXCd$L$U" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT0SV" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6971,9 +6971,9 @@
               <ref role="37wK5l" node="5XJPBczO6T4" resolve="boxedShort" />
               <node concept="3cmrfG" id="7AyqXCd$L_0" role="37wK5m">
                 <property role="3cmrfH" value="1" />
-              </node>
-              <node concept="1U20sH" id="7AyqXCd$L_1" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT0TM" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -6989,9 +6989,9 @@
               <ref role="37wK5l" node="5XJPBczO6T4" resolve="boxedShort" />
               <node concept="3cmrfG" id="7AyqXCd$L_7" role="37wK5m">
                 <property role="3cmrfH" value="35768" />
-              </node>
-              <node concept="1U20sH" id="7AyqXCd$L_8" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT0UD" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -7007,9 +7007,9 @@
               <ref role="37wK5l" node="5XJPBczO6T4" resolve="boxedShort" />
               <node concept="1Xhbcc" id="7AyqXCd$L_e" role="37wK5m">
                 <property role="1XhdNS" value="a" />
-              </node>
-              <node concept="1U20sH" id="7AyqXCd$L_f" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT0Vw" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -7040,9 +7040,9 @@
               <ref role="37wK5l" node="5XJPBczO6V9" resolve="boxedInteger" />
               <node concept="3b6qkQ" id="7AyqXCd$L_r" role="37wK5m">
                 <property role="$nhwW" value="1.1" />
-              </node>
-              <node concept="1U20sH" id="7AyqXCd$L_s" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT0ZU" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -7058,9 +7058,9 @@
               <ref role="37wK5l" node="5XJPBczO6V9" resolve="boxedInteger" />
               <node concept="3b6qkQ" id="7AyqXCd$L_y" role="37wK5m">
                 <property role="$nhwW" value="1.1d" />
-              </node>
-              <node concept="1U20sH" id="7AyqXCd$L_z" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT1bA" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -7076,9 +7076,9 @@
               <ref role="37wK5l" node="5XJPBczO6V9" resolve="boxedInteger" />
               <node concept="1Xhbcc" id="7AyqXCdDJB7" role="37wK5m">
                 <property role="1XhdNS" value="a" />
-              </node>
-              <node concept="1U20sH" id="7AyqXCdDJ$z" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT1ct" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -7094,9 +7094,9 @@
               <ref role="37wK5l" node="5XJPBczO71S" resolve="boxedLong" />
               <node concept="3cmrfG" id="7AyqXCd$L_D" role="37wK5m">
                 <property role="3cmrfH" value="1" />
-              </node>
-              <node concept="1U20sH" id="7AyqXCd$NcH" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT1fL" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -7142,9 +7142,9 @@
               <ref role="37wK5l" node="5XJPBczO73z" resolve="boxedFloat" />
               <node concept="3b6qkQ" id="7AyqXCd$L_V" role="37wK5m">
                 <property role="$nhwW" value="1.1" />
-              </node>
-              <node concept="1U20sH" id="7AyqXCd$L_W" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT1tF" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -7175,9 +7175,9 @@
               <ref role="37wK5l" node="5XJPBczO73z" resolve="boxedFloat" />
               <node concept="3b6qkQ" id="7AyqXCd$LA8" role="37wK5m">
                 <property role="$nhwW" value="1.1d" />
-              </node>
-              <node concept="1U20sH" id="7AyqXCd$LA9" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT1uy" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
@@ -7223,9 +7223,9 @@
               <ref role="37wK5l" node="5XJPBczO75c" resolve="boxedDouble" />
               <node concept="2$xPTn" id="7AyqXCd$LAr" role="37wK5m">
                 <property role="2$xPTl" value="1.1f" />
-              </node>
-              <node concept="1U20sH" id="7AyqXCd$Nfh" role="lGtFl">
-                <property role="1U20sK" value="error" />
+                <node concept="1U20sH" id="2JTW8QYT1$r" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
               </node>
             </node>
           </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.incrementalBL@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.incrementalBL@tests.mps
index 97f1026c..6e57c46a 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.incrementalBL@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.incrementalBL@tests.mps
@@ -749,6 +749,34 @@
         <node concept="3clFbH" id="4t5t2tf9LFD" role="3cqZAp" />
         <node concept="3clFbJ" id="4t5t2tf9LFV" role="3cqZAp">
           <node concept="3clFbS" id="4t5t2tf9LFW" role="3clFbx">
+            <node concept="3SKdUt" id="2JTW8QYmJTb" role="3cqZAp">
+              <node concept="1PaTwC" id="2JTW8QYmJTc" role="3ndbpf">
+                <node concept="3oM_SD" id="2JTW8QYmJTe" role="1PaTwD">
+                  <property role="3oM_SC" value="it's" />
+                </node>
+                <node concept="3oM_SD" id="2JTW8QYmJUn" role="1PaTwD">
+                  <property role="3oM_SC" value="not" />
+                </node>
+                <node concept="3oM_SD" id="2JTW8QYmJUq" role="1PaTwD">
+                  <property role="3oM_SC" value="always" />
+                </node>
+                <node concept="3oM_SD" id="2JTW8QYmJUA" role="1PaTwD">
+                  <property role="3oM_SC" value="correct" />
+                </node>
+                <node concept="3oM_SD" id="2JTW8QYmJVw" role="1PaTwD">
+                  <property role="3oM_SC" value="assert," />
+                </node>
+                <node concept="3oM_SD" id="2JTW8QYmJWZ" role="1PaTwD">
+                  <property role="3oM_SC" value="e.g." />
+                </node>
+                <node concept="3oM_SD" id="2JTW8QYmJXe" role="1PaTwD">
+                  <property role="3oM_SC" value="for" />
+                </node>
+                <node concept="3oM_SD" id="2JTW8QYmJXm" role="1PaTwD">
+                  <property role="3oM_SC" value="InstanceMethodCall" />
+                </node>
+              </node>
+            </node>
             <node concept="3vFxKo" id="4t5t2tf9LFX" role="3cqZAp">
               <node concept="2OqwBi" id="4t5t2tf9LFY" role="3vFALc">
                 <node concept="37vLTw" id="4t5t2tf9LFZ" role="2Oq$k0">
@@ -2196,42 +2224,38 @@
         </node>
       </node>
     </node>
-    <node concept="1X3_iC" id="1yt2T3TDrGy" role="lGtFl">
-      <property role="3V$3am" value="testMethods" />
-      <property role="3V$3ak" value="8585453e-6bfb-4d80-98de-b16074f1d86c/1216913645126/1217501895093" />
-      <node concept="1LZb2c" id="3o9wrC3SR9C" role="8Wnug">
-        <property role="TrG5h" value="replaceBadArg" />
-        <node concept="3cqZAl" id="3o9wrC3SR9D" role="3clF45" />
-        <node concept="3clFbS" id="3o9wrC3SR9H" role="3clF47">
-          <node concept="3cpWs8" id="uau16qtV$k" role="3cqZAp">
-            <node concept="3cpWsn" id="uau16qtV$n" role="3cpWs9">
-              <property role="TrG5h" value="replacedWith" />
-              <node concept="3Tqbb2" id="uau16qtV$i" role="1tU5fm" />
-              <node concept="2OqwBi" id="uau16qtZcq" role="33vP2m">
-                <node concept="3xONca" id="uau16qtZ97" role="2Oq$k0">
-                  <ref role="3xOPvv" node="uau16qsXrO" resolve="bArgBadRef" />
-                </node>
-                <node concept="1$rogu" id="uau16qtZfN" role="2OqNvi" />
+    <node concept="1LZb2c" id="3o9wrC3SR9C" role="1SL9yI">
+      <property role="TrG5h" value="replaceBadArg" />
+      <node concept="3cqZAl" id="3o9wrC3SR9D" role="3clF45" />
+      <node concept="3clFbS" id="3o9wrC3SR9H" role="3clF47">
+        <node concept="3cpWs8" id="uau16qtV$k" role="3cqZAp">
+          <node concept="3cpWsn" id="uau16qtV$n" role="3cpWs9">
+            <property role="TrG5h" value="replacedWith" />
+            <node concept="3Tqbb2" id="uau16qtV$i" role="1tU5fm" />
+            <node concept="2OqwBi" id="uau16qtZcq" role="33vP2m">
+              <node concept="3xONca" id="uau16qtZ97" role="2Oq$k0">
+                <ref role="3xOPvv" node="uau16qsXrO" resolve="bArgBadRef" />
               </node>
+              <node concept="1$rogu" id="uau16qtZfN" role="2OqNvi" />
             </node>
           </node>
-          <node concept="3clFbF" id="3o9wrC3TFEe" role="3cqZAp">
-            <node concept="2OqwBi" id="3o9wrC3TFEf" role="3clFbG">
-              <node concept="2WthIp" id="3o9wrC3TFEg" role="2Oq$k0" />
-              <node concept="2XshWL" id="3o9wrC3TFEh" role="2OqNvi">
-                <ref role="2WH_rO" node="3o9wrC3yMuL" resolve="replaceFailTest" />
-                <node concept="3xONca" id="3o9wrC3TFEi" role="2XxRq1">
-                  <ref role="3xOPvv" node="2FNFm8neJum" resolve="demo2" />
-                </node>
-                <node concept="37vLTw" id="uau16qtZgE" role="2XxRq1">
-                  <ref role="3cqZAo" node="uau16qtV$n" resolve="replacedWith" />
-                </node>
-                <node concept="3xONca" id="3o9wrC3TFEk" role="2XxRq1">
-                  <ref role="3xOPvv" node="4gFYEnZAdZk" resolve="fooArg" />
-                </node>
-                <node concept="37vLTw" id="uau16qu2YJ" role="2XxRq1">
-                  <ref role="3cqZAo" node="uau16qtV$n" resolve="replacedWith" />
-                </node>
+        </node>
+        <node concept="3clFbF" id="3o9wrC3TFEe" role="3cqZAp">
+          <node concept="2OqwBi" id="3o9wrC3TFEf" role="3clFbG">
+            <node concept="2WthIp" id="3o9wrC3TFEg" role="2Oq$k0" />
+            <node concept="2XshWL" id="3o9wrC3TFEh" role="2OqNvi">
+              <ref role="2WH_rO" node="3o9wrC3yMuL" resolve="replaceFailTest" />
+              <node concept="3xONca" id="3o9wrC3TFEi" role="2XxRq1">
+                <ref role="3xOPvv" node="2FNFm8neJum" resolve="demo2" />
+              </node>
+              <node concept="37vLTw" id="uau16qtZgE" role="2XxRq1">
+                <ref role="3cqZAo" node="uau16qtV$n" resolve="replacedWith" />
+              </node>
+              <node concept="3xONca" id="3o9wrC3TFEk" role="2XxRq1">
+                <ref role="3xOPvv" node="4gFYEnZAdZk" resolve="fooArg" />
+              </node>
+              <node concept="37vLTw" id="uau16qu2YJ" role="2XxRq1">
+                <ref role="3cqZAo" node="uau16qtV$n" resolve="replacedWith" />
               </node>
             </node>
           </node>
@@ -2307,40 +2331,53 @@
         </node>
       </node>
     </node>
-    <node concept="1X3_iC" id="1yt2T3TDAd8" role="lGtFl">
-      <property role="3V$3am" value="testMethods" />
-      <property role="3V$3ak" value="8585453e-6bfb-4d80-98de-b16074f1d86c/1216913645126/1217501895093" />
-      <node concept="1LZb2c" id="uau16qzMQ3" role="8Wnug">
-        <property role="TrG5h" value="replaceBadAddBound2" />
-        <node concept="3cqZAl" id="uau16qzMQ4" role="3clF45" />
-        <node concept="3clFbS" id="uau16qzMQ5" role="3clF47">
-          <node concept="3clFbF" id="uau16qzMQ6" role="3cqZAp">
-            <node concept="2OqwBi" id="uau16qzMQ7" role="3clFbG">
-              <node concept="2WthIp" id="uau16qzMQ8" role="2Oq$k0" />
-              <node concept="2XshWL" id="uau16qzMQ9" role="2OqNvi">
-                <ref role="2WH_rO" node="3o9wrC3yMuL" resolve="replaceFailTest" />
-                <node concept="3xONca" id="uau16qzMQa" role="2XxRq1">
-                  <ref role="3xOPvv" node="7612DkLDcwk" resolve="demoBounds" />
-                </node>
-                <node concept="3xONca" id="uau16qzMQb" role="2XxRq1">
+    <node concept="1LZb2c" id="uau16qzMQ3" role="1SL9yI">
+      <property role="TrG5h" value="replaceBadAddBound2" />
+      <node concept="3cqZAl" id="uau16qzMQ4" role="3clF45" />
+      <node concept="3clFbS" id="uau16qzMQ5" role="3clF47">
+        <node concept="3cpWs8" id="2JTW8QYPFWU" role="3cqZAp">
+          <node concept="3cpWsn" id="2JTW8QYPFWX" role="3cpWs9">
+            <property role="TrG5h" value="argReported" />
+            <node concept="3Tqbb2" id="2JTW8QYPFWS" role="1tU5fm" />
+            <node concept="2OqwBi" id="2JTW8QYPIW7" role="33vP2m">
+              <node concept="2OqwBi" id="2JTW8QYPG7k" role="2Oq$k0">
+                <node concept="3xONca" id="2JTW8QYPFYA" role="2Oq$k0">
                   <ref role="3xOPvv" node="1LzJPInXWkX" resolve="boxCall" />
                 </node>
-                <node concept="2OqwBi" id="uau16qzMQc" role="2XxRq1">
-                  <node concept="2OqwBi" id="uau16qzMQd" role="2Oq$k0">
-                    <node concept="3xONca" id="uau16qzMQe" role="2Oq$k0">
-                      <ref role="3xOPvv" node="uau16qyQIV" resolve="barBoxTy" />
-                    </node>
-                    <node concept="3Tsc0h" id="uau16qzMQf" role="2OqNvi">
-                      <ref role="3TtcxE" to="tpee:g91_B6F" resolve="parameter" />
-                    </node>
-                  </node>
-                  <node concept="1uHKPH" id="uau16qzMQg" role="2OqNvi" />
+                <node concept="3Tsc0h" id="2JTW8QYPGoh" role="2OqNvi">
+                  <ref role="3TtcxE" to="tpee:fz7wK6I" resolve="actualArgument" />
                 </node>
-                <node concept="2OqwBi" id="uau16qzMQh" role="2XxRq1">
-                  <node concept="1$rogu" id="uau16qzMQj" role="2OqNvi" />
-                  <node concept="3xONca" id="uau16q$nx2" role="2Oq$k0">
-                    <ref role="3xOPvv" node="uau16q$fMp" resolve="extendsC" />
+              </node>
+              <node concept="1uHKPH" id="2JTW8QYPKGS" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="uau16qzMQ6" role="3cqZAp">
+          <node concept="2OqwBi" id="uau16qzMQ7" role="3clFbG">
+            <node concept="2WthIp" id="uau16qzMQ8" role="2Oq$k0" />
+            <node concept="2XshWL" id="uau16qzMQ9" role="2OqNvi">
+              <ref role="2WH_rO" node="3o9wrC3yMuL" resolve="replaceFailTest" />
+              <node concept="3xONca" id="uau16qzMQa" role="2XxRq1">
+                <ref role="3xOPvv" node="7612DkLDcwk" resolve="demoBounds" />
+              </node>
+              <node concept="37vLTw" id="2JTW8QYPKNV" role="2XxRq1">
+                <ref role="3cqZAo" node="2JTW8QYPFWX" resolve="argReported" />
+              </node>
+              <node concept="2OqwBi" id="uau16qzMQc" role="2XxRq1">
+                <node concept="2OqwBi" id="uau16qzMQd" role="2Oq$k0">
+                  <node concept="3xONca" id="uau16qzMQe" role="2Oq$k0">
+                    <ref role="3xOPvv" node="uau16qyQIV" resolve="barBoxTy" />
                   </node>
+                  <node concept="3Tsc0h" id="uau16qzMQf" role="2OqNvi">
+                    <ref role="3TtcxE" to="tpee:g91_B6F" resolve="parameter" />
+                  </node>
+                </node>
+                <node concept="1uHKPH" id="uau16qzMQg" role="2OqNvi" />
+              </node>
+              <node concept="2OqwBi" id="uau16qzMQh" role="2XxRq1">
+                <node concept="1$rogu" id="uau16qzMQj" role="2OqNvi" />
+                <node concept="3xONca" id="uau16q$nx2" role="2Oq$k0">
+                  <ref role="3xOPvv" node="uau16q$fMp" resolve="extendsC" />
                 </node>
               </node>
             </node>