From cc4b335286d04de0c97a31b0514a9af1cc1a6c5b Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Fri, 4 Jan 2019 17:47:44 +0100
Subject: [PATCH] Introduce checking for instances of RuntimeErrorType during
 tests. Refactor test typechecking launcher.

---
 build.xml                                     |    9 +
 .../jetbrains.mps.typechecking.build.mps      |    5 +
 .../jetbrains.mps.typechecking@tests.mps      |   27 +-
 .../jetbrains.mps.typechecking.msd            |   12 +
 .../models/service.mps                        | 1600 +++++++++--------
 .../models/firstOrderLogic@tests.mps          |  141 +-
 .../models/herbrandLogic@tests.mps            |   36 +-
 .../models/propositionalLogic@tests.mps       |  421 +++--
 .../models/samples.lambdacalc.demo@tests.mps  |  245 ++-
 .../models/bounds.bad@tests.mps               |   58 +-
 .../models/bounds@tests.mps                   |  116 +-
 .../models/codeAnal@tests.mps                 |   29 +-
 .../models/features@tests.mps                 |  219 ++-
 .../models/helloWorld@tests.mps               |  195 +-
 .../models/simpleGenerics@tests.mps           |   58 +-
 .../models/slice@tests.mps                    |   58 +-
 16 files changed, 1863 insertions(+), 1366 deletions(-)

diff --git a/build.xml b/build.xml
index 780b405f..d3ebfead 100644
--- a/build.xml
+++ b/build.xml
@@ -3134,9 +3134,18 @@
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
       </classpath>
     </javac>
   </target>
diff --git a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index 82d2f972..c8ce0397 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -931,6 +931,11 @@
             <ref role="3bR37D" node="46o4wsH5PJF" resolve="jetbrains.mps.typechecking.annotation" />
           </node>
         </node>
+        <node concept="1SiIV0" id="2hrSdN9bYck" role="3bR37C">
+          <node concept="3bR9La" id="2hrSdN9bYcl" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6Lc2" resolve="jetbrains.mps.lang.typesystem" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3u5wJtgiSM" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
index 634a0b54..5c279d8c 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
@@ -1977,19 +1977,24 @@
             <property role="3SKdUp" value="this method throws exception and &quot;read action&quot; doesn't like that" />
           </node>
         </node>
-        <node concept="3cpWs8" id="443LGHBj7CW" role="3cqZAp">
-          <node concept="3cpWsn" id="443LGHBj7CX" role="3cpWs9">
+        <node concept="3cpWs8" id="27bTNFfbxlM" role="3cqZAp">
+          <node concept="3cpWsn" id="27bTNFfbxlN" role="3cpWs9">
             <property role="TrG5h" value="checkTypes" />
-            <node concept="3uibUv" id="443LGHBj7CV" role="1tU5fm">
+            <node concept="3uibUv" id="27bTNFfbxlO" role="1tU5fm">
               <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
             </node>
-            <node concept="2YIFZM" id="443LGHBj7CY" role="33vP2m">
-              <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-              <node concept="37vLTw" id="443LGHBj7CZ" role="37wK5m">
-                <ref role="3cqZAo" node="4BHjwwGTLX6" resolve="demo" />
+            <node concept="2OqwBi" id="27bTNFfbxlP" role="33vP2m">
+              <node concept="2YIFZM" id="27bTNFfbxlQ" role="2Oq$k0">
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <node concept="37vLTw" id="27bTNFfbxlR" role="37wK5m">
+                  <ref role="3cqZAo" node="4BHjwwGTLX6" resolve="demo" />
+                </node>
+                <node concept="1jxXqW" id="27bTNFfc2nC" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbxlT" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
               </node>
-              <node concept="1jxXqW" id="443LGHBj7D0" role="37wK5m" />
             </node>
           </node>
         </node>
@@ -2003,7 +2008,7 @@
                   <node concept="3Tqbb2" id="4BHjwwGqWQm" role="1tU5fm" />
                   <node concept="2OqwBi" id="7y50OW6ZH4n" role="33vP2m">
                     <node concept="37vLTw" id="443LGHBj7MB" role="2Oq$k0">
-                      <ref role="3cqZAo" node="443LGHBj7CX" resolve="checkTypes" />
+                      <ref role="3cqZAo" node="27bTNFfbxlN" resolve="checkTypes" />
                     </node>
                     <node concept="liA8E" id="7y50OW6ZH4p" role="2OqNvi">
                       <ref role="37wK5l" to="tj24:6QH_LDtffJj" resolve="typeOf" />
@@ -2025,7 +2030,7 @@
                   <node concept="3Tqbb2" id="4BHjwwGqWVs" role="1tU5fm" />
                   <node concept="2OqwBi" id="7y50OW701J3" role="33vP2m">
                     <node concept="37vLTw" id="443LGHBj7W9" role="2Oq$k0">
-                      <ref role="3cqZAo" node="443LGHBj7CX" resolve="checkTypes" />
+                      <ref role="3cqZAo" node="27bTNFfbxlN" resolve="checkTypes" />
                     </node>
                     <node concept="liA8E" id="7y50OW701J5" role="2OqNvi">
                       <ref role="37wK5l" to="tj24:6QH_LDtffJj" resolve="typeOf" />
diff --git a/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd b/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd
index 9f97cc1a..0f1e58b1 100644
--- a/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd
+++ b/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd
@@ -16,6 +16,7 @@
     <dependency reexport="true">f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)</dependency>
     <dependency reexport="true">f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)</dependency>
     <dependency reexport="false">0b80a2e8-f9f1-47b3-823f-56eb115bca42(jetbrains.mps.typechecking.annotation)</dependency>
+    <dependency reexport="false">7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="8" />
@@ -45,11 +46,22 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
+    <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
     <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.typechecking/models/service.mps b/coderules/solutions/jetbrains.mps.typechecking/models/service.mps
index e3e29ccd..0a405416 100644
--- a/coderules/solutions/jetbrains.mps.typechecking/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking/models/service.mps
@@ -51,6 +51,7 @@
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
     <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
     <import index="wcmu" ref="r:1070fac4-bb22-4bb6-b0bf-ec58df816edc(jetbrains.mps.typechecking.annotation.structure)" />
+    <import index="tpd4" ref="r:00000000-0000-4000-0000-011c895902b4(jetbrains.mps.lang.typesystem.structure)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -140,7 +141,6 @@
       </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
         <property id="1181808852946" name="isFinal" index="DiZV1" />
-        <child id="1164879685961" name="throwsItem" index="Sfmx6" />
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
@@ -227,6 +227,7 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
       </concept>
@@ -280,6 +281,9 @@
       <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="1227264722563" name="jetbrains.mps.lang.smodel.structure.EqualsStructurallyExpression" flags="nn" index="2YFouu" />
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
+      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
+        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
+      </concept>
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
@@ -322,9 +326,6 @@
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
-      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
-        <child id="1151689745422" name="elementType" index="A3Ik2" />
-      </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
         <child id="1153944400369" name="variable" index="2Gsz3X" />
@@ -377,843 +378,982 @@
   <node concept="312cEu" id="1N_0WA5JxZO">
     <property role="TrG5h" value="TestLaunchTypechecking" />
     <property role="3GE5qa" value="launch" />
-    <node concept="2tJIrI" id="1N_0WA5Jy0e" role="jymVt" />
     <node concept="2tJIrI" id="7smgEqg8slD" role="jymVt" />
-    <node concept="2YIFZL" id="7y50OW6XU7p" role="jymVt">
-      <property role="TrG5h" value="checkTypes" />
-      <node concept="3uibUv" id="4BHjwwGOMhJ" role="Sfmx6">
-        <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
-      </node>
-      <node concept="37vLTG" id="7y50OW6XU7q" role="3clF46">
+    <node concept="2YIFZL" id="27bTNFfaOo$" role="jymVt">
+      <property role="TrG5h" value="ofNode" />
+      <node concept="37vLTG" id="27bTNFfaOEY" role="3clF46">
         <property role="TrG5h" value="root" />
-        <node concept="3Tqbb2" id="7y50OW6XU7r" role="1tU5fm" />
+        <node concept="3Tqbb2" id="27bTNFfaOEZ" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="7y50OW6XU7s" role="3clF46">
+      <node concept="37vLTG" id="27bTNFfaOF0" role="3clF46">
         <property role="TrG5h" value="prj" />
-        <node concept="3uibUv" id="7y50OW6XU7t" role="1tU5fm">
+        <node concept="3uibUv" id="27bTNFfaOF1" role="1tU5fm">
           <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
         </node>
       </node>
-      <node concept="3uibUv" id="443LGHBj0O0" role="3clF45">
-        <ref role="3uigEE" node="6QH_LDtfe19" resolve="TypeCache" />
+      <node concept="3uibUv" id="27bTNFfaOyT" role="3clF45">
+        <ref role="3uigEE" node="27bTNFfaJxq" resolve="TestLaunchTypechecking.Checker" />
       </node>
-      <node concept="3Tm1VV" id="7y50OW6XU7v" role="1B3o_S" />
-      <node concept="3clFbS" id="7y50OW6XU7w" role="3clF47">
-        <node concept="3clFbF" id="7smgEqg8E7z" role="3cqZAp">
-          <node concept="1rXfSq" id="7smgEqg8E7x" role="3clFbG">
-            <ref role="37wK5l" node="7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="37vLTw" id="7smgEqg8EFg" role="37wK5m">
-              <ref role="3cqZAo" node="7y50OW6XU7q" resolve="root" />
-            </node>
-            <node concept="37vLTw" id="7smgEqg8ENU" role="37wK5m">
-              <ref role="3cqZAo" node="7y50OW6XU7s" resolve="prj" />
-            </node>
-            <node concept="3clFbT" id="7smgEqg8EYm" role="37wK5m">
-              <property role="3clFbU" value="true" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7smgEqg8DJE" role="jymVt" />
-    <node concept="2YIFZL" id="5KrJ7UHX_5$" role="jymVt">
-      <property role="TrG5h" value="checkTypes" />
-      <node concept="3uibUv" id="5KrJ7UHX_5_" role="Sfmx6">
-        <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
-      </node>
-      <node concept="37vLTG" id="5KrJ7UHX_5A" role="3clF46">
-        <property role="TrG5h" value="root" />
-        <node concept="3Tqbb2" id="5KrJ7UHX_5B" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="5KrJ7UHX_5C" role="3clF46">
-        <property role="TrG5h" value="prj" />
-        <node concept="3uibUv" id="5KrJ7UHX_5D" role="1tU5fm">
-          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5KrJ7UHX_iH" role="3clF46">
-        <property role="TrG5h" value="expectedIssues" />
-        <node concept="A3Dl8" id="5KrJ7UHX_oc" role="1tU5fm">
-          <node concept="3uibUv" id="5KrJ7UHX_vz" role="A3Ik2">
-            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="5KrJ7UHX_5E" role="3clF45">
-        <ref role="3uigEE" node="6QH_LDtfe19" resolve="TypeCache" />
-      </node>
-      <node concept="3Tm1VV" id="5KrJ7UHX_5F" role="1B3o_S" />
-      <node concept="3clFbS" id="5KrJ7UHX_5G" role="3clF47">
-        <node concept="3clFbF" id="5KrJ7UHX_5H" role="3cqZAp">
-          <node concept="1rXfSq" id="5KrJ7UHX_5I" role="3clFbG">
-            <ref role="37wK5l" node="7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="37vLTw" id="5KrJ7UHX_5J" role="37wK5m">
-              <ref role="3cqZAo" node="5KrJ7UHX_5A" resolve="root" />
-            </node>
-            <node concept="37vLTw" id="5KrJ7UHX_5K" role="37wK5m">
-              <ref role="3cqZAo" node="5KrJ7UHX_5C" resolve="prj" />
-            </node>
-            <node concept="3clFbT" id="5KrJ7UHX_5L" role="37wK5m">
-              <property role="3clFbU" value="true" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5KrJ7UHX_5z" role="jymVt" />
-    <node concept="2YIFZL" id="7smgEqg8sZP" role="jymVt">
-      <property role="TrG5h" value="checkTypes" />
-      <node concept="37vLTG" id="7smgEqg8tfa" role="3clF46">
-        <property role="TrG5h" value="root" />
-        <node concept="3Tqbb2" id="7smgEqg8tp3" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7smgEqg8trA" role="3clF46">
-        <property role="TrG5h" value="prj" />
-        <node concept="3uibUv" id="7smgEqg8tuk" role="1tU5fm">
-          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="7smgEqg8tya" role="3clF46">
-        <property role="TrG5h" value="ensureLocal" />
-        <node concept="10P_77" id="7smgEqg8t$M" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="7smgEqg8tiV" role="3clF45">
-        <ref role="3uigEE" node="6QH_LDtfe19" resolve="TypeCache" />
-      </node>
-      <node concept="3Tm1VV" id="7smgEqg8sZS" role="1B3o_S" />
-      <node concept="3clFbS" id="7smgEqg8sZT" role="3clF47">
-        <node concept="3cpWs8" id="443LGHBTP5Y" role="3cqZAp">
-          <node concept="3cpWsn" id="443LGHBTP5Z" role="3cpWs9">
-            <property role="TrG5h" value="project" />
-            <node concept="3uibUv" id="443LGHBTP5W" role="1tU5fm">
-              <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
-            </node>
-            <node concept="10QFUN" id="443LGHBTP60" role="33vP2m">
-              <node concept="37vLTw" id="443LGHBTP61" role="10QFUP">
-                <ref role="3cqZAo" node="7smgEqg8trA" resolve="prj" />
+      <node concept="3Tm1VV" id="27bTNFfaOoB" role="1B3o_S" />
+      <node concept="3clFbS" id="27bTNFfaOoC" role="3clF47">
+        <node concept="3clFbF" id="27bTNFfaOO7" role="3cqZAp">
+          <node concept="2ShNRf" id="27bTNFfaOO5" role="3clFbG">
+            <node concept="1pGfFk" id="27bTNFfaQM6" role="2ShVmc">
+              <ref role="37wK5l" node="27bTNFfaKaw" resolve="TestLaunchTypechecking.Checker" />
+              <node concept="37vLTw" id="27bTNFfaR04" role="37wK5m">
+                <ref role="3cqZAo" node="27bTNFfaOEY" resolve="root" />
               </node>
-              <node concept="3uibUv" id="443LGHBTP62" role="10QFUM">
+              <node concept="37vLTw" id="27bTNFfaR5U" role="37wK5m">
+                <ref role="3cqZAo" node="27bTNFfaOF0" resolve="prj" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="27bTNFfaOda" role="jymVt" />
+    <node concept="312cEu" id="27bTNFfaJxq" role="jymVt">
+      <property role="TrG5h" value="Checker" />
+      <node concept="2tJIrI" id="27bTNFfaJFC" role="jymVt" />
+      <node concept="3clFbW" id="27bTNFfaKaw" role="jymVt">
+        <node concept="37vLTG" id="27bTNFfaKe8" role="3clF46">
+          <property role="TrG5h" value="root" />
+          <node concept="3Tqbb2" id="27bTNFfaKe9" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="27bTNFfaKea" role="3clF46">
+          <property role="TrG5h" value="prj" />
+          <node concept="3uibUv" id="27bTNFfaKeb" role="1tU5fm">
+            <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="27bTNFfaKay" role="3clF45" />
+        <node concept="3Tm6S6" id="27bTNFfaR9a" role="1B3o_S" />
+        <node concept="3clFbS" id="27bTNFfaKa$" role="3clF47">
+          <node concept="3clFbF" id="27bTNFfaKmq" role="3cqZAp">
+            <node concept="37vLTI" id="27bTNFfaKms" role="3clFbG">
+              <node concept="2OqwBi" id="27bTNFfaMFJ" role="37vLTJ">
+                <node concept="Xjq3P" id="27bTNFfaMNw" role="2Oq$k0" />
+                <node concept="2OwXpG" id="27bTNFfaMFM" role="2OqNvi">
+                  <ref role="2Oxat5" node="27bTNFfaKmm" resolve="root" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="27bTNFfaKmw" role="37vLTx">
+                <ref role="3cqZAo" node="27bTNFfaKe8" resolve="root" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="27bTNFfaN46" role="3cqZAp">
+            <node concept="37vLTI" id="27bTNFfaN48" role="3clFbG">
+              <node concept="2OqwBi" id="27bTNFfaNiK" role="37vLTJ">
+                <node concept="Xjq3P" id="27bTNFfaNqx" role="2Oq$k0" />
+                <node concept="2OwXpG" id="27bTNFfaNiN" role="2OqNvi">
+                  <ref role="2Oxat5" node="27bTNFfaN42" resolve="prj" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="27bTNFfaN4c" role="37vLTx">
+                <ref role="3cqZAo" node="27bTNFfaKea" resolve="prj" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="27bTNFfaK3Q" role="jymVt" />
+      <node concept="3clFb_" id="27bTNFfaVLW" role="jymVt">
+        <property role="TrG5h" value="skipLocal" />
+        <node concept="3uibUv" id="27bTNFfaVQX" role="3clF45">
+          <ref role="3uigEE" node="27bTNFfaJxq" resolve="TestLaunchTypechecking.Checker" />
+        </node>
+        <node concept="3Tm1VV" id="27bTNFfaVLZ" role="1B3o_S" />
+        <node concept="3clFbS" id="27bTNFfaVM0" role="3clF47">
+          <node concept="3clFbF" id="27bTNFfaWMo" role="3cqZAp">
+            <node concept="37vLTI" id="27bTNFfaYma" role="3clFbG">
+              <node concept="3clFbT" id="27bTNFfaYyK" role="37vLTx" />
+              <node concept="2OqwBi" id="27bTNFfaX8$" role="37vLTJ">
+                <node concept="Xjq3P" id="27bTNFfaWMn" role="2Oq$k0" />
+                <node concept="2OwXpG" id="27bTNFfaXrP" role="2OqNvi">
+                  <ref role="2Oxat5" node="27bTNFfaWf5" resolve="ensureLocal" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="27bTNFfaYI0" role="3cqZAp">
+            <node concept="Xjq3P" id="27bTNFfaYHY" role="3clFbG" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2hrSdN969an" role="jymVt" />
+      <node concept="3clFb_" id="2hrSdN96927" role="jymVt">
+        <property role="TrG5h" value="ignoreErrorTypes" />
+        <node concept="3uibUv" id="2hrSdN96928" role="3clF45">
+          <ref role="3uigEE" node="27bTNFfaJxq" resolve="TestLaunchTypechecking.Checker" />
+        </node>
+        <node concept="3Tm1VV" id="2hrSdN96929" role="1B3o_S" />
+        <node concept="3clFbS" id="2hrSdN9692a" role="3clF47">
+          <node concept="3clFbF" id="2hrSdN9692b" role="3cqZAp">
+            <node concept="37vLTI" id="2hrSdN9692c" role="3clFbG">
+              <node concept="3clFbT" id="2hrSdN9692d" role="37vLTx" />
+              <node concept="2OqwBi" id="2hrSdN9692e" role="37vLTJ">
+                <node concept="Xjq3P" id="2hrSdN9692f" role="2Oq$k0" />
+                <node concept="2OwXpG" id="2hrSdN96biS" role="2OqNvi">
+                  <ref role="2Oxat5" node="2hrSdN95Vxk" resolve="reportErrorTypes" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2hrSdN9692h" role="3cqZAp">
+            <node concept="Xjq3P" id="2hrSdN9692i" role="3clFbG" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="27bTNFfaJO1" role="jymVt" />
+      <node concept="3clFb_" id="27bTNFfaYS2" role="jymVt">
+        <property role="TrG5h" value="checkTypes" />
+        <node concept="3uibUv" id="27bTNFfb1W3" role="3clF45">
+          <ref role="3uigEE" node="6QH_LDtfe19" resolve="TypeCache" />
+        </node>
+        <node concept="3Tm1VV" id="27bTNFfaYS5" role="1B3o_S" />
+        <node concept="3clFbS" id="27bTNFfaYS6" role="3clF47">
+          <node concept="3cpWs8" id="27bTNFfaZ1f" role="3cqZAp">
+            <node concept="3cpWsn" id="27bTNFfaZ1g" role="3cpWs9">
+              <property role="TrG5h" value="project" />
+              <node concept="3uibUv" id="27bTNFfaZ1h" role="1tU5fm">
                 <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="443LGHBTRnQ" role="3cqZAp">
-          <node concept="3cpWsn" id="443LGHBTRnR" role="3cpWs9">
-            <property role="TrG5h" value="repository" />
-            <node concept="3uibUv" id="443LGHBTRnK" role="1tU5fm">
-              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-            </node>
-            <node concept="2OqwBi" id="443LGHBTRnS" role="33vP2m">
-              <node concept="37vLTw" id="443LGHBTRnT" role="2Oq$k0">
-                <ref role="3cqZAo" node="443LGHBTP5Z" resolve="project" />
-              </node>
-              <node concept="liA8E" id="443LGHBTRnU" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1FOQehxyT5V" role="3cqZAp" />
-        <node concept="3cpWs8" id="1FOQehxz5MQ" role="3cqZAp">
-          <node concept="3cpWsn" id="1FOQehxz5MR" role="3cpWs9">
-            <property role="TrG5h" value="sink" />
-            <node concept="3uibUv" id="1FOQehxz5MP" role="1tU5fm">
-              <ref role="3uigEE" node="1FOQehxyYXm" resolve="TestLaunchTypechecking.Sink" />
-            </node>
-            <node concept="2ShNRf" id="1FOQehxz5MS" role="33vP2m">
-              <node concept="HV5vD" id="1FOQehxz5MT" role="2ShVmc">
-                <ref role="HV5vE" node="1FOQehxyYXm" resolve="TestLaunchTypechecking.Sink" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="1FOQehxz73g" role="3cqZAp">
-          <node concept="3cpWsn" id="1FOQehxz73h" role="3cpWs9">
-            <property role="TrG5h" value="facade" />
-            <node concept="3uibUv" id="1FOQehxz73e" role="1tU5fm">
-              <ref role="3uigEE" to="1g4i:7kaxm0sEy3e" resolve="TypecheckingFacade" />
-            </node>
-            <node concept="2OqwBi" id="1FOQehxz73i" role="33vP2m">
-              <node concept="2YIFZM" id="1FOQehxzdX8" role="2Oq$k0">
-                <ref role="37wK5l" to="1g4i:1FOQehxzbI0" resolve="forRepository" />
-                <ref role="1Pybhc" to="1g4i:7kaxm0sEy3e" resolve="TypecheckingFacade" />
-                <node concept="37vLTw" id="1FOQehxzegQ" role="37wK5m">
-                  <ref role="3cqZAo" node="443LGHBTRnR" resolve="repository" />
+              <node concept="10QFUN" id="27bTNFfaZ1i" role="33vP2m">
+                <node concept="37vLTw" id="27bTNFfaZ1j" role="10QFUP">
+                  <ref role="3cqZAo" node="27bTNFfaN42" resolve="prj" />
                 </node>
-              </node>
-              <node concept="liA8E" id="1FOQehxz73l" role="2OqNvi">
-                <ref role="37wK5l" to="1g4i:5KrJ7UHN1Lk" resolve="withReportSink" />
-                <node concept="37vLTw" id="1FOQehxz73m" role="37wK5m">
-                  <ref role="3cqZAo" node="1FOQehxz5MR" resolve="sink" />
+                <node concept="3uibUv" id="27bTNFfaZ1k" role="10QFUM">
+                  <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
                 </node>
               </node>
             </node>
           </node>
-        </node>
-        <node concept="3clFbH" id="1FOQehxyTF$" role="3cqZAp" />
-        <node concept="3cpWs8" id="1FOQehxzenc" role="3cqZAp">
-          <node concept="3cpWsn" id="1FOQehxzend" role="3cpWs9">
-            <property role="TrG5h" value="cache" />
-            <node concept="3uibUv" id="1FOQehxzemQ" role="1tU5fm">
-              <ref role="3uigEE" node="6QH_LDtfe19" resolve="TypeCache" />
+          <node concept="3cpWs8" id="27bTNFfaZ1l" role="3cqZAp">
+            <node concept="3cpWsn" id="27bTNFfaZ1m" role="3cpWs9">
+              <property role="TrG5h" value="repository" />
+              <node concept="3uibUv" id="27bTNFfaZ1n" role="1tU5fm">
+                <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+              </node>
+              <node concept="2OqwBi" id="27bTNFfaZ1o" role="33vP2m">
+                <node concept="37vLTw" id="27bTNFfaZ1p" role="2Oq$k0">
+                  <ref role="3cqZAo" node="27bTNFfaZ1g" resolve="project" />
+                </node>
+                <node concept="liA8E" id="27bTNFfaZ1q" role="2OqNvi">
+                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                </node>
+              </node>
             </node>
           </node>
-        </node>
-        <node concept="3clFbH" id="1FOQehxKkwi" role="3cqZAp" />
-        <node concept="1QHqEK" id="1FOQehxKaLs" role="3cqZAp">
-          <node concept="1QHqEC" id="1FOQehxKaLu" role="1QHqEI">
-            <node concept="3clFbS" id="1FOQehxKaLw" role="1bW5cS">
-              <node concept="3clFbF" id="1FOQehxKiYL" role="3cqZAp">
-                <node concept="37vLTI" id="1FOQehxKiYN" role="3clFbG">
-                  <node concept="2OqwBi" id="1FOQehxzene" role="37vLTx">
-                    <node concept="37vLTw" id="1FOQehxzenf" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1FOQehxz73h" resolve="facade" />
-                    </node>
-                    <node concept="liA8E" id="1FOQehxzeng" role="2OqNvi">
-                      <ref role="37wK5l" to="1g4i:1FOQehxdXIx" resolve="checkTypes" />
-                      <node concept="37vLTw" id="1FOQehxzenh" role="37wK5m">
-                        <ref role="3cqZAo" node="7smgEqg8tfa" resolve="root" />
+          <node concept="3clFbH" id="27bTNFfaZ1r" role="3cqZAp" />
+          <node concept="3cpWs8" id="27bTNFfaZ1s" role="3cqZAp">
+            <node concept="3cpWsn" id="27bTNFfaZ1t" role="3cpWs9">
+              <property role="TrG5h" value="sink" />
+              <node concept="3uibUv" id="27bTNFfaZ1u" role="1tU5fm">
+                <ref role="3uigEE" node="1FOQehxyYXm" resolve="TestLaunchTypechecking.Sink" />
+              </node>
+              <node concept="2ShNRf" id="27bTNFfaZ1v" role="33vP2m">
+                <node concept="HV5vD" id="27bTNFfaZ1w" role="2ShVmc">
+                  <ref role="HV5vE" node="1FOQehxyYXm" resolve="TestLaunchTypechecking.Sink" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="27bTNFfaZ1x" role="3cqZAp">
+            <node concept="3cpWsn" id="27bTNFfaZ1y" role="3cpWs9">
+              <property role="TrG5h" value="facade" />
+              <node concept="3uibUv" id="27bTNFfaZ1z" role="1tU5fm">
+                <ref role="3uigEE" to="1g4i:7kaxm0sEy3e" resolve="TypecheckingFacade" />
+              </node>
+              <node concept="2OqwBi" id="27bTNFfaZ1$" role="33vP2m">
+                <node concept="2YIFZM" id="27bTNFfaZ1_" role="2Oq$k0">
+                  <ref role="37wK5l" to="1g4i:1FOQehxzbI0" resolve="forRepository" />
+                  <ref role="1Pybhc" to="1g4i:7kaxm0sEy3e" resolve="TypecheckingFacade" />
+                  <node concept="37vLTw" id="27bTNFfaZ1A" role="37wK5m">
+                    <ref role="3cqZAo" node="27bTNFfaZ1m" resolve="repository" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="27bTNFfaZ1B" role="2OqNvi">
+                  <ref role="37wK5l" to="1g4i:5KrJ7UHN1Lk" resolve="withReportSink" />
+                  <node concept="37vLTw" id="27bTNFfaZ1C" role="37wK5m">
+                    <ref role="3cqZAo" node="27bTNFfaZ1t" resolve="sink" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="27bTNFfaZ1D" role="3cqZAp" />
+          <node concept="3cpWs8" id="27bTNFfaZ1E" role="3cqZAp">
+            <node concept="3cpWsn" id="27bTNFfaZ1F" role="3cpWs9">
+              <property role="TrG5h" value="cache" />
+              <node concept="3uibUv" id="27bTNFfaZ1G" role="1tU5fm">
+                <ref role="3uigEE" node="6QH_LDtfe19" resolve="TypeCache" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="27bTNFfaZ1H" role="3cqZAp" />
+          <node concept="1QHqEK" id="27bTNFfaZ1I" role="3cqZAp">
+            <node concept="1QHqEC" id="27bTNFfaZ1J" role="1QHqEI">
+              <node concept="3clFbS" id="27bTNFfaZ1K" role="1bW5cS">
+                <node concept="3clFbF" id="27bTNFfaZ1L" role="3cqZAp">
+                  <node concept="37vLTI" id="27bTNFfaZ1M" role="3clFbG">
+                    <node concept="2OqwBi" id="27bTNFfaZ1N" role="37vLTx">
+                      <node concept="37vLTw" id="27bTNFfaZ1O" role="2Oq$k0">
+                        <ref role="3cqZAo" node="27bTNFfaZ1y" resolve="facade" />
+                      </node>
+                      <node concept="liA8E" id="27bTNFfaZ1P" role="2OqNvi">
+                        <ref role="37wK5l" to="1g4i:1FOQehxdXIx" resolve="checkTypes" />
+                        <node concept="37vLTw" id="27bTNFfaZ1Q" role="37wK5m">
+                          <ref role="3cqZAo" node="27bTNFfaKmm" resolve="root" />
+                        </node>
                       </node>
                     </node>
-                  </node>
-                  <node concept="37vLTw" id="1FOQehxKiYR" role="37vLTJ">
-                    <ref role="3cqZAo" node="1FOQehxzend" resolve="cache" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="1FOQehxLziU" role="3cqZAp" />
-              <node concept="3cpWs8" id="2Bs9D5Ry_nC" role="3cqZAp">
-                <node concept="3cpWsn" id="2Bs9D5Ry_nD" role="3cpWs9">
-                  <property role="TrG5h" value="errors" />
-                  <node concept="_YKpA" id="2Bs9D5Ry_n$" role="1tU5fm">
-                    <node concept="3Tqbb2" id="2Bs9D5Ry_nB" role="_ZDj9">
-                      <ref role="ehGHo" to="wcmu:1FOQehwZdZ9" resolve="ErrorAnnotation" />
+                    <node concept="37vLTw" id="27bTNFfaZ1R" role="37vLTJ">
+                      <ref role="3cqZAo" node="27bTNFfaZ1F" resolve="cache" />
                     </node>
                   </node>
-                  <node concept="2OqwBi" id="2Bs9D5Ry_nE" role="33vP2m">
-                    <node concept="2OqwBi" id="2Bs9D5Ry_nF" role="2Oq$k0">
-                      <node concept="2OqwBi" id="2Bs9D5Ry_nG" role="2Oq$k0">
-                        <node concept="2OqwBi" id="2Bs9D5Ry_nH" role="2Oq$k0">
-                          <node concept="37vLTw" id="2Bs9D5Ry_nI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7smgEqg8tfa" resolve="root" />
-                          </node>
-                          <node concept="2Rf3mk" id="2Bs9D5Ry_nJ" role="2OqNvi">
-                            <node concept="1xMEDy" id="2Bs9D5Ry_nK" role="1xVPHs">
-                              <node concept="chp4Y" id="2Bs9D5Ry_nL" role="ri$Ld">
-                                <ref role="cht4Q" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                              </node>
+                </node>
+                <node concept="3clFbH" id="27bTNFfaZ1S" role="3cqZAp" />
+                <node concept="3cpWs8" id="27bTNFfaZ1T" role="3cqZAp">
+                  <node concept="3cpWsn" id="27bTNFfaZ1U" role="3cpWs9">
+                    <property role="TrG5h" value="errors" />
+                    <node concept="_YKpA" id="27bTNFfaZ1V" role="1tU5fm">
+                      <node concept="3Tqbb2" id="27bTNFfaZ1W" role="_ZDj9">
+                        <ref role="ehGHo" to="wcmu:1FOQehwZdZ9" resolve="ErrorAnnotation" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="27bTNFfaZ1X" role="33vP2m">
+                      <node concept="2OqwBi" id="27bTNFfaZ1Y" role="2Oq$k0">
+                        <node concept="2OqwBi" id="27bTNFfaZ1Z" role="2Oq$k0">
+                          <node concept="2OqwBi" id="27bTNFfaZ20" role="2Oq$k0">
+                            <node concept="37vLTw" id="27bTNFfaZ21" role="2Oq$k0">
+                              <ref role="3cqZAo" node="27bTNFfaKmm" resolve="root" />
+                            </node>
+                            <node concept="2Rf3mk" id="27bTNFfaZ22" role="2OqNvi">
+                              <node concept="1xMEDy" id="27bTNFfaZ23" role="1xVPHs">
+                                <node concept="chp4Y" id="27bTNFfaZ24" role="ri$Ld">
+                                  <ref role="cht4Q" to="tpck:gw2VY9q" resolve="BaseConcept" />
+                                </node>
+                              </node>
+                              <node concept="1xIGOp" id="27bTNFfaZ25" role="1xVPHs" />
                             </node>
-                            <node concept="1xIGOp" id="2Bs9D5Ry_nM" role="1xVPHs" />
                           </node>
-                        </node>
-                        <node concept="3zZkjj" id="2Bs9D5Ry_nN" role="2OqNvi">
-                          <node concept="1bVj0M" id="2Bs9D5Ry_nO" role="23t8la">
-                            <node concept="3clFbS" id="2Bs9D5Ry_nP" role="1bW5cS">
-                              <node concept="3clFbF" id="2Bs9D5Ry_nQ" role="3cqZAp">
-                                <node concept="2OqwBi" id="2Bs9D5Ry_nR" role="3clFbG">
-                                  <node concept="2OqwBi" id="2Bs9D5Ry_nS" role="2Oq$k0">
-                                    <node concept="37vLTw" id="2Bs9D5Ry_nT" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2Bs9D5Ry_nX" resolve="it" />
-                                    </node>
-                                    <node concept="3CFZ6_" id="2Bs9D5Ry_nU" role="2OqNvi">
-                                      <node concept="3CFYIy" id="2Bs9D5Ry_nV" role="3CFYIz">
-                                        <ref role="3CFYIx" to="wcmu:1FOQehwZdZ9" resolve="ErrorAnnotation" />
+                          <node concept="3zZkjj" id="27bTNFfaZ26" role="2OqNvi">
+                            <node concept="1bVj0M" id="27bTNFfaZ27" role="23t8la">
+                              <node concept="3clFbS" id="27bTNFfaZ28" role="1bW5cS">
+                                <node concept="3clFbF" id="27bTNFfaZ29" role="3cqZAp">
+                                  <node concept="2OqwBi" id="27bTNFfaZ2a" role="3clFbG">
+                                    <node concept="2OqwBi" id="27bTNFfaZ2b" role="2Oq$k0">
+                                      <node concept="37vLTw" id="27bTNFfaZ2c" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="27bTNFfaZ2g" resolve="it" />
+                                      </node>
+                                      <node concept="3CFZ6_" id="27bTNFfaZ2d" role="2OqNvi">
+                                        <node concept="3CFYIy" id="27bTNFfaZ2e" role="3CFYIz">
+                                          <ref role="3CFYIx" to="wcmu:1FOQehwZdZ9" resolve="ErrorAnnotation" />
+                                        </node>
                                       </node>
                                     </node>
+                                    <node concept="3x8VRR" id="27bTNFfaZ2f" role="2OqNvi" />
                                   </node>
-                                  <node concept="3x8VRR" id="2Bs9D5Ry_nW" role="2OqNvi" />
                                 </node>
                               </node>
-                            </node>
-                            <node concept="Rh6nW" id="2Bs9D5Ry_nX" role="1bW2Oz">
-                              <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2Bs9D5Ry_nY" role="1tU5fm" />
+                              <node concept="Rh6nW" id="27bTNFfaZ2g" role="1bW2Oz">
+                                <property role="TrG5h" value="it" />
+                                <node concept="2jxLKc" id="27bTNFfaZ2h" role="1tU5fm" />
+                              </node>
                             </node>
                           </node>
                         </node>
-                      </node>
-                      <node concept="3$u5V9" id="2Bs9D5Ry_nZ" role="2OqNvi">
-                        <node concept="1bVj0M" id="2Bs9D5Ry_o0" role="23t8la">
-                          <node concept="3clFbS" id="2Bs9D5Ry_o1" role="1bW5cS">
-                            <node concept="3clFbF" id="2Bs9D5Ry_o2" role="3cqZAp">
-                              <node concept="2OqwBi" id="2Bs9D5Ry_o3" role="3clFbG">
-                                <node concept="37vLTw" id="2Bs9D5Ry_o4" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2Bs9D5Ry_o7" resolve="it" />
-                                </node>
-                                <node concept="3CFZ6_" id="2Bs9D5Ry_o5" role="2OqNvi">
-                                  <node concept="3CFYIy" id="2Bs9D5Ry_o6" role="3CFYIz">
-                                    <ref role="3CFYIx" to="wcmu:1FOQehwZdZ9" resolve="ErrorAnnotation" />
+                        <node concept="3$u5V9" id="27bTNFfaZ2i" role="2OqNvi">
+                          <node concept="1bVj0M" id="27bTNFfaZ2j" role="23t8la">
+                            <node concept="3clFbS" id="27bTNFfaZ2k" role="1bW5cS">
+                              <node concept="3clFbF" id="27bTNFfaZ2l" role="3cqZAp">
+                                <node concept="2OqwBi" id="27bTNFfaZ2m" role="3clFbG">
+                                  <node concept="37vLTw" id="27bTNFfaZ2n" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="27bTNFfaZ2q" resolve="it" />
                                   </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="Rh6nW" id="2Bs9D5Ry_o7" role="1bW2Oz">
-                            <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="2Bs9D5Ry_o8" role="1tU5fm" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="ANE8D" id="2Bs9D5Ry_o9" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="2Bs9D5RySzg" role="3cqZAp">
-                <node concept="3cpWsn" id="2Bs9D5RySzh" role="3cpWs9">
-                  <property role="TrG5h" value="errRefs" />
-                  <node concept="2hMVRd" id="2Bs9D5RySyZ" role="1tU5fm">
-                    <node concept="3uibUv" id="2Bs9D5RySz2" role="2hN53Y">
-                      <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                    </node>
-                  </node>
-                  <node concept="2ShNRf" id="2Bs9D5RySzi" role="33vP2m">
-                    <node concept="2i4dXS" id="2Bs9D5RySzj" role="2ShVmc">
-                      <node concept="3uibUv" id="2Bs9D5RySzk" role="HW$YZ">
-                        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                      </node>
-                      <node concept="2OqwBi" id="2Bs9D5RySzl" role="I$8f6">
-                        <node concept="37vLTw" id="2Bs9D5RySzm" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2Bs9D5Ry_nD" resolve="errors" />
-                        </node>
-                        <node concept="3$u5V9" id="2Bs9D5RySzn" role="2OqNvi">
-                          <node concept="1bVj0M" id="2Bs9D5RySzo" role="23t8la">
-                            <node concept="3clFbS" id="2Bs9D5RySzp" role="1bW5cS">
-                              <node concept="3clFbF" id="2Bs9D5RySzq" role="3cqZAp">
-                                <node concept="2OqwBi" id="2Bs9D5RySzr" role="3clFbG">
-                                  <node concept="2JrnkZ" id="2Bs9D5RySzs" role="2Oq$k0">
-                                    <node concept="37vLTw" id="2Bs9D5RySzt" role="2JrQYb">
-                                      <ref role="3cqZAo" node="2Bs9D5RySzv" resolve="it" />
-                                    </node>
-                                  </node>
-                                  <node concept="liA8E" id="2Bs9D5RySzu" role="2OqNvi">
-                                    <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="Rh6nW" id="2Bs9D5RySzv" role="1bW2Oz">
-                              <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2Bs9D5RySzw" role="1tU5fm" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="2Bs9D5RySEd" role="3cqZAp" />
-              <node concept="1DcWWT" id="1FOQehxzEsK" role="3cqZAp">
-                <node concept="3clFbS" id="1FOQehxzEsN" role="2LFqv$">
-                  <node concept="3clFbJ" id="1FOQehxzFJn" role="3cqZAp">
-                    <node concept="3clFbC" id="1FOQehxzGnt" role="3clFbw">
-                      <node concept="2OqwBi" id="1FOQehxzH9l" role="3uHU7w">
-                        <node concept="37vLTw" id="1FOQehxzGrE" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1FOQehxzEsO" resolve="it" />
-                        </node>
-                        <node concept="liA8E" id="1FOQehxzHod" role="2OqNvi">
-                          <ref role="37wK5l" to="d6hs:~ReportItem.getSeverity():jetbrains.mps.errors.MessageStatus" resolve="getSeverity" />
-                        </node>
-                      </node>
-                      <node concept="Rm8GO" id="1FOQehxzFUY" role="3uHU7B">
-                        <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
-                        <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
-                      </node>
-                    </node>
-                    <node concept="3clFbS" id="1FOQehxzFJp" role="3clFbx">
-                      <node concept="3clFbJ" id="1FOQehxzHzP" role="3cqZAp">
-                        <node concept="3clFbS" id="1FOQehxzHzR" role="3clFbx">
-                          <node concept="3cpWs8" id="1FOQehxzJoY" role="3cqZAp">
-                            <node concept="3cpWsn" id="1FOQehxzJoZ" role="3cpWs9">
-                              <property role="TrG5h" value="cause" />
-                              <node concept="3uibUv" id="1FOQehxzJoV" role="1tU5fm">
-                                <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
-                              </node>
-                              <node concept="2OqwBi" id="1FOQehxzJp0" role="33vP2m">
-                                <node concept="1eOMI4" id="1FOQehxzJp1" role="2Oq$k0">
-                                  <node concept="10QFUN" id="1FOQehxzJp2" role="1eOMHV">
-                                    <node concept="3uibUv" id="1FOQehxzJp3" role="10QFUM">
-                                      <ref role="3uigEE" to="1g4i:1FOQehxypKu" resolve="LaunchProblemReportItem" />
-                                    </node>
-                                    <node concept="37vLTw" id="1FOQehxzJp4" role="10QFUP">
-                                      <ref role="3cqZAo" node="1FOQehxzEsO" resolve="it" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="liA8E" id="1FOQehxzJp5" role="2OqNvi">
-                                  <ref role="37wK5l" to="1g4i:1FOQehxyC1K" resolve="getCause" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="YS8fn" id="1FOQehxMvBe" role="3cqZAp">
-                            <node concept="2ShNRf" id="1FOQehxMvBf" role="YScLw">
-                              <node concept="1pGfFk" id="1FOQehxMvBg" role="2ShVmc">
-                                <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="RuntimeException" />
-                                <node concept="2OqwBi" id="1FOQehxMvBh" role="37wK5m">
-                                  <node concept="37vLTw" id="1FOQehxMvBi" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1FOQehxzEsO" resolve="it" />
-                                  </node>
-                                  <node concept="liA8E" id="1FOQehxMvBj" role="2OqNvi">
-                                    <ref role="37wK5l" to="d6hs:~ReportItem.getMessage():java.lang.String" resolve="getMessage" />
-                                  </node>
-                                </node>
-                                <node concept="37vLTw" id="1FOQehxNBVz" role="37wK5m">
-                                  <ref role="3cqZAo" node="1FOQehxzJoZ" resolve="cause" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3clFbH" id="1FOQehxL$tm" role="3cqZAp" />
-                        </node>
-                        <node concept="2ZW3vV" id="1FOQehxzI4U" role="3clFbw">
-                          <node concept="3uibUv" id="1FOQehxzId4" role="2ZW6by">
-                            <ref role="3uigEE" to="1g4i:1FOQehxypKu" resolve="LaunchProblemReportItem" />
-                          </node>
-                          <node concept="37vLTw" id="1FOQehxzHCm" role="2ZW6bz">
-                            <ref role="3cqZAo" node="1FOQehxzEsO" resolve="it" />
-                          </node>
-                        </node>
-                        <node concept="3eNFk2" id="1FOQehxL_FE" role="3eNLev">
-                          <node concept="2ZW3vV" id="1FOQehxLCo1" role="3eO9$A">
-                            <node concept="3uibUv" id="1FOQehxLDBn" role="2ZW6by">
-                              <ref role="3uigEE" to="1g4i:1FOQehwovmW" resolve="TypecheckingReportItem" />
-                            </node>
-                            <node concept="37vLTw" id="1FOQehxLASB" role="2ZW6bz">
-                              <ref role="3cqZAo" node="1FOQehxzEsO" resolve="it" />
-                            </node>
-                          </node>
-                          <node concept="3clFbS" id="1FOQehxL_FG" role="3eOfB_">
-                            <node concept="3cpWs8" id="1FOQehxLG4c" role="3cqZAp">
-                              <node concept="3cpWsn" id="1FOQehxLG4d" role="3cpWs9">
-                                <property role="TrG5h" value="tri" />
-                                <node concept="3uibUv" id="1FOQehxLG49" role="1tU5fm">
-                                  <ref role="3uigEE" to="1g4i:1FOQehwovmW" resolve="TypecheckingReportItem" />
-                                </node>
-                                <node concept="1eOMI4" id="1FOQehxLG4e" role="33vP2m">
-                                  <node concept="10QFUN" id="1FOQehxLG4f" role="1eOMHV">
-                                    <node concept="3uibUv" id="1FOQehxLG4g" role="10QFUM">
-                                      <ref role="3uigEE" to="1g4i:1FOQehwovmW" resolve="TypecheckingReportItem" />
-                                    </node>
-                                    <node concept="37vLTw" id="1FOQehxLG4h" role="10QFUP">
-                                      <ref role="3cqZAo" node="1FOQehxzEsO" resolve="it" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3cpWs8" id="1FOQehxMVpy" role="3cqZAp">
-                              <node concept="3cpWsn" id="1FOQehxMVpz" role="3cpWs9">
-                                <property role="TrG5h" value="cause" />
-                                <node concept="3uibUv" id="1FOQehxMVpw" role="1tU5fm">
-                                  <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
-                                </node>
-                                <node concept="2OqwBi" id="1FOQehxMVp$" role="33vP2m">
-                                  <node concept="37vLTw" id="1FOQehxMVp_" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1FOQehxLG4d" resolve="tri" />
-                                  </node>
-                                  <node concept="liA8E" id="1FOQehxMVpA" role="2OqNvi">
-                                    <ref role="37wK5l" to="1g4i:1FOQehxMNx1" resolve="getCause" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3clFbH" id="1FOQehxMXS1" role="3cqZAp" />
-                            <node concept="3cpWs8" id="1FOQehxLY0P" role="3cqZAp">
-                              <node concept="3cpWsn" id="1FOQehxLY0Q" role="3cpWs9">
-                                <property role="TrG5h" value="resolve" />
-                                <node concept="3Tqbb2" id="1FOQehxLZgc" role="1tU5fm" />
-                                <node concept="2OqwBi" id="1FOQehxLY0R" role="33vP2m">
-                                  <node concept="2OqwBi" id="1FOQehxLY0S" role="2Oq$k0">
-                                    <node concept="37vLTw" id="1FOQehxLY0T" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1FOQehxLG4d" resolve="tri" />
-                                    </node>
-                                    <node concept="liA8E" id="1FOQehxLY0U" role="2OqNvi">
-                                      <ref role="37wK5l" to="d6hs:~NodeReportItemBase.getNode():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getNode" />
-                                    </node>
-                                  </node>
-                                  <node concept="liA8E" id="1FOQehxLY0V" role="2OqNvi">
-                                    <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
-                                    <node concept="37vLTw" id="1FOQehxLY0W" role="37wK5m">
-                                      <ref role="3cqZAo" node="443LGHBTRnR" resolve="repository" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3cpWs8" id="1FOQehxMqQK" role="3cqZAp">
-                              <node concept="3cpWsn" id="1FOQehxMqQL" role="3cpWs9">
-                                <property role="TrG5h" value="ea" />
-                                <node concept="3Tqbb2" id="1FOQehxMqQv" role="1tU5fm">
-                                  <ref role="ehGHo" to="wcmu:1FOQehwZdZ9" resolve="ErrorAnnotation" />
-                                </node>
-                                <node concept="2OqwBi" id="1FOQehxMqQM" role="33vP2m">
-                                  <node concept="37vLTw" id="1FOQehxMqQN" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1FOQehxLY0Q" resolve="resolve" />
-                                  </node>
-                                  <node concept="3CFZ6_" id="1FOQehxMqQO" role="2OqNvi">
-                                    <node concept="3CFYIy" id="1FOQehxMqQP" role="3CFYIz">
+                                  <node concept="3CFZ6_" id="27bTNFfaZ2o" role="2OqNvi">
+                                    <node concept="3CFYIy" id="27bTNFfaZ2p" role="3CFYIz">
                                       <ref role="3CFYIx" to="wcmu:1FOQehwZdZ9" resolve="ErrorAnnotation" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="3clFbJ" id="1FOQehxMwTv" role="3cqZAp">
-                              <node concept="3clFbS" id="1FOQehxMwTx" role="3clFbx">
-                                <node concept="YS8fn" id="1FOQehxzLkN" role="3cqZAp">
-                                  <node concept="2ShNRf" id="1FOQehxzLrT" role="YScLw">
-                                    <node concept="1pGfFk" id="1FOQehxzMdK" role="2ShVmc">
-                                      <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="RuntimeException" />
-                                      <node concept="2YIFZM" id="1FOQehxN6L0" role="37wK5m">
-                                        <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
-                                        <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                                        <node concept="Xl_RD" id="1FOQehxN83k" role="37wK5m">
-                                          <property role="Xl_RC" value="Unadvised error in '%s': %s" />
-                                        </node>
-                                        <node concept="2OqwBi" id="1FOQehxN$Ei" role="37wK5m">
-                                          <node concept="37vLTw" id="1FOQehxNyU7" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="1FOQehxLG4d" resolve="tri" />
-                                          </node>
-                                          <node concept="liA8E" id="1FOQehxNAAZ" role="2OqNvi">
-                                            <ref role="37wK5l" to="d6hs:~NodeReportItemBase.getNode():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getNode" />
-                                          </node>
-                                        </node>
-                                        <node concept="2OqwBi" id="1FOQehxNcbw" role="37wK5m">
-                                          <node concept="37vLTw" id="1FOQehxNa$$" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="1FOQehxLG4d" resolve="tri" />
-                                          </node>
-                                          <node concept="liA8E" id="1FOQehxNdW6" role="2OqNvi">
-                                            <ref role="37wK5l" to="d6hs:~ReportItemBase.getMessage():java.lang.String" resolve="getMessage" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="37vLTw" id="1FOQehxMZiO" role="37wK5m">
-                                        <ref role="3cqZAo" node="1FOQehxMVpz" resolve="cause" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3clFbH" id="2Bs9D5RyTv6" role="3cqZAp" />
-                              </node>
-                              <node concept="2OqwBi" id="1FOQehxMz$9" role="3clFbw">
-                                <node concept="37vLTw" id="1FOQehxMy9Y" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1FOQehxMqQL" resolve="ea" />
-                                </node>
-                                <node concept="3w_OXm" id="1FOQehxMA$r" role="2OqNvi" />
-                              </node>
-                              <node concept="9aQIb" id="2Bs9D5RySMS" role="9aQIa">
-                                <node concept="3clFbS" id="2Bs9D5RySMT" role="9aQI4">
-                                  <node concept="3clFbF" id="2Bs9D5RyTDV" role="3cqZAp">
-                                    <node concept="2OqwBi" id="2Bs9D5RyUTr" role="3clFbG">
-                                      <node concept="37vLTw" id="2Bs9D5RyTDU" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2Bs9D5RySzh" resolve="errRefs" />
-                                      </node>
-                                      <node concept="3dhRuq" id="1GKPrS22Kih" role="2OqNvi">
-                                        <node concept="2OqwBi" id="1GKPrS22Kid" role="25WWJ7">
-                                          <node concept="2JrnkZ" id="1GKPrS22Kie" role="2Oq$k0">
-                                            <node concept="37vLTw" id="1GKPrS22Kif" role="2JrQYb">
-                                              <ref role="3cqZAo" node="1FOQehxMqQL" resolve="ea" />
-                                            </node>
-                                          </node>
-                                          <node concept="liA8E" id="1GKPrS22Kig" role="2OqNvi">
-                                            <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
+                            <node concept="Rh6nW" id="27bTNFfaZ2q" role="1bW2Oz">
+                              <property role="TrG5h" value="it" />
+                              <node concept="2jxLKc" id="27bTNFfaZ2r" role="1tU5fm" />
                             </node>
                           </node>
                         </node>
                       </node>
+                      <node concept="ANE8D" id="27bTNFfaZ2s" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
-                <node concept="3cpWsn" id="1FOQehxzEsO" role="1Duv9x">
-                  <property role="TrG5h" value="it" />
-                  <node concept="3uibUv" id="1FOQehxzEsS" role="1tU5fm">
-                    <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="1FOQehxzEsT" role="1DdaDG">
-                  <node concept="37vLTw" id="1FOQehxzEsU" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1FOQehxz5MR" resolve="sink" />
-                  </node>
-                  <node concept="2OwXpG" id="1FOQehxzEsV" role="2OqNvi">
-                    <ref role="2Oxat5" node="1FOQehxyZrr" resolve="reportItems" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="2Bs9D5RyZWq" role="3cqZAp" />
-              <node concept="3clFbJ" id="2Bs9D5Rz08N" role="3cqZAp">
-                <node concept="3clFbS" id="2Bs9D5Rz08P" role="3clFbx">
-                  <node concept="3cpWs8" id="2Bs9D5RznNI" role="3cqZAp">
-                    <node concept="3cpWsn" id="2Bs9D5RznNJ" role="3cpWs9">
-                      <property role="TrG5h" value="first" />
-                      <node concept="3uibUv" id="2Bs9D5RznN1" role="1tU5fm">
+                <node concept="3cpWs8" id="27bTNFfaZ2t" role="3cqZAp">
+                  <node concept="3cpWsn" id="27bTNFfaZ2u" role="3cpWs9">
+                    <property role="TrG5h" value="errRefs" />
+                    <node concept="2hMVRd" id="27bTNFfaZ2v" role="1tU5fm">
+                      <node concept="3uibUv" id="27bTNFfaZ2w" role="2hN53Y">
                         <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
                       </node>
-                      <node concept="2OqwBi" id="2Bs9D5RznNK" role="33vP2m">
-                        <node concept="37vLTw" id="2Bs9D5RznNL" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2Bs9D5RySzh" resolve="errRefs" />
-                        </node>
-                        <node concept="1uHKPH" id="2Bs9D5RznNM" role="2OqNvi" />
-                      </node>
                     </node>
-                  </node>
-                  <node concept="3cpWs8" id="2Bs9D5RziX7" role="3cqZAp">
-                    <node concept="3cpWsn" id="2Bs9D5RziX8" role="3cpWs9">
-                      <property role="TrG5h" value="ea" />
-                      <node concept="3Tqbb2" id="2Bs9D5RziW1" role="1tU5fm">
-                        <ref role="ehGHo" to="wcmu:1FOQehwZdZ9" resolve="ErrorAnnotation" />
-                      </node>
-                      <node concept="2OqwBi" id="2Bs9D5RziX9" role="33vP2m">
-                        <node concept="37vLTw" id="2Bs9D5RziXa" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2Bs9D5Ry_nD" resolve="errors" />
+                    <node concept="2ShNRf" id="27bTNFfaZ2x" role="33vP2m">
+                      <node concept="2i4dXS" id="27bTNFfaZ2y" role="2ShVmc">
+                        <node concept="3uibUv" id="27bTNFfaZ2z" role="HW$YZ">
+                          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
                         </node>
-                        <node concept="1z4cxt" id="2Bs9D5RziXb" role="2OqNvi">
-                          <node concept="1bVj0M" id="2Bs9D5RziXc" role="23t8la">
-                            <node concept="3clFbS" id="2Bs9D5RziXd" role="1bW5cS">
-                              <node concept="3clFbF" id="2Bs9D5RziXe" role="3cqZAp">
-                                <node concept="2OqwBi" id="2Bs9D5RziXf" role="3clFbG">
-                                  <node concept="2OqwBi" id="2Bs9D5RziXg" role="2Oq$k0">
-                                    <node concept="2JrnkZ" id="2Bs9D5RziXh" role="2Oq$k0">
-                                      <node concept="37vLTw" id="2Bs9D5RziXi" role="2JrQYb">
-                                        <ref role="3cqZAo" node="2Bs9D5RziXo" resolve="it" />
+                        <node concept="2OqwBi" id="27bTNFfaZ2$" role="I$8f6">
+                          <node concept="37vLTw" id="27bTNFfaZ2_" role="2Oq$k0">
+                            <ref role="3cqZAo" node="27bTNFfaZ1U" resolve="errors" />
+                          </node>
+                          <node concept="3$u5V9" id="27bTNFfaZ2A" role="2OqNvi">
+                            <node concept="1bVj0M" id="27bTNFfaZ2B" role="23t8la">
+                              <node concept="3clFbS" id="27bTNFfaZ2C" role="1bW5cS">
+                                <node concept="3clFbF" id="27bTNFfaZ2D" role="3cqZAp">
+                                  <node concept="2OqwBi" id="27bTNFfaZ2E" role="3clFbG">
+                                    <node concept="2JrnkZ" id="27bTNFfaZ2F" role="2Oq$k0">
+                                      <node concept="37vLTw" id="27bTNFfaZ2G" role="2JrQYb">
+                                        <ref role="3cqZAo" node="27bTNFfaZ2I" resolve="it" />
                                       </node>
                                     </node>
-                                    <node concept="liA8E" id="2Bs9D5RziXj" role="2OqNvi">
+                                    <node concept="liA8E" id="27bTNFfaZ2H" role="2OqNvi">
                                       <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
                                     </node>
                                   </node>
-                                  <node concept="liA8E" id="2Bs9D5RziXk" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
-                                    <node concept="37vLTw" id="2Bs9D5RznNN" role="37wK5m">
-                                      <ref role="3cqZAo" node="2Bs9D5RznNJ" resolve="first" />
+                                </node>
+                              </node>
+                              <node concept="Rh6nW" id="27bTNFfaZ2I" role="1bW2Oz">
+                                <property role="TrG5h" value="it" />
+                                <node concept="2jxLKc" id="27bTNFfaZ2J" role="1tU5fm" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="27bTNFfaZ2K" role="3cqZAp" />
+                <node concept="1DcWWT" id="27bTNFfaZ2L" role="3cqZAp">
+                  <node concept="3clFbS" id="27bTNFfaZ2M" role="2LFqv$">
+                    <node concept="3clFbJ" id="27bTNFfaZ2N" role="3cqZAp">
+                      <node concept="3clFbC" id="27bTNFfaZ2O" role="3clFbw">
+                        <node concept="2OqwBi" id="27bTNFfaZ2P" role="3uHU7w">
+                          <node concept="37vLTw" id="27bTNFfaZ2Q" role="2Oq$k0">
+                            <ref role="3cqZAo" node="27bTNFfaZ4f" resolve="it" />
+                          </node>
+                          <node concept="liA8E" id="27bTNFfaZ2R" role="2OqNvi">
+                            <ref role="37wK5l" to="d6hs:~ReportItem.getSeverity():jetbrains.mps.errors.MessageStatus" resolve="getSeverity" />
+                          </node>
+                        </node>
+                        <node concept="Rm8GO" id="27bTNFfaZ2S" role="3uHU7B">
+                          <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                          <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
+                        </node>
+                      </node>
+                      <node concept="3clFbS" id="27bTNFfaZ2T" role="3clFbx">
+                        <node concept="3clFbJ" id="27bTNFfaZ2U" role="3cqZAp">
+                          <node concept="3clFbS" id="27bTNFfaZ2V" role="3clFbx">
+                            <node concept="3cpWs8" id="27bTNFfaZ2W" role="3cqZAp">
+                              <node concept="3cpWsn" id="27bTNFfaZ2X" role="3cpWs9">
+                                <property role="TrG5h" value="cause" />
+                                <node concept="3uibUv" id="27bTNFfaZ2Y" role="1tU5fm">
+                                  <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+                                </node>
+                                <node concept="2OqwBi" id="27bTNFfaZ2Z" role="33vP2m">
+                                  <node concept="1eOMI4" id="27bTNFfaZ30" role="2Oq$k0">
+                                    <node concept="10QFUN" id="27bTNFfaZ31" role="1eOMHV">
+                                      <node concept="3uibUv" id="27bTNFfaZ32" role="10QFUM">
+                                        <ref role="3uigEE" to="1g4i:1FOQehxypKu" resolve="LaunchProblemReportItem" />
+                                      </node>
+                                      <node concept="37vLTw" id="27bTNFfaZ33" role="10QFUP">
+                                        <ref role="3cqZAo" node="27bTNFfaZ4f" resolve="it" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="27bTNFfaZ34" role="2OqNvi">
+                                    <ref role="37wK5l" to="1g4i:1FOQehxyC1K" resolve="getCause" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="YS8fn" id="27bTNFfaZ35" role="3cqZAp">
+                              <node concept="2ShNRf" id="27bTNFfaZ36" role="YScLw">
+                                <node concept="1pGfFk" id="27bTNFfaZ37" role="2ShVmc">
+                                  <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="RuntimeException" />
+                                  <node concept="2OqwBi" id="27bTNFfaZ38" role="37wK5m">
+                                    <node concept="37vLTw" id="27bTNFfaZ39" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="27bTNFfaZ4f" resolve="it" />
+                                    </node>
+                                    <node concept="liA8E" id="27bTNFfaZ3a" role="2OqNvi">
+                                      <ref role="37wK5l" to="d6hs:~ReportItem.getMessage():java.lang.String" resolve="getMessage" />
+                                    </node>
+                                  </node>
+                                  <node concept="37vLTw" id="27bTNFfaZ3b" role="37wK5m">
+                                    <ref role="3cqZAo" node="27bTNFfaZ2X" resolve="cause" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbH" id="27bTNFfaZ3c" role="3cqZAp" />
+                          </node>
+                          <node concept="2ZW3vV" id="27bTNFfaZ3d" role="3clFbw">
+                            <node concept="3uibUv" id="27bTNFfaZ3e" role="2ZW6by">
+                              <ref role="3uigEE" to="1g4i:1FOQehxypKu" resolve="LaunchProblemReportItem" />
+                            </node>
+                            <node concept="37vLTw" id="27bTNFfaZ3f" role="2ZW6bz">
+                              <ref role="3cqZAo" node="27bTNFfaZ4f" resolve="it" />
+                            </node>
+                          </node>
+                          <node concept="3eNFk2" id="27bTNFfaZ3g" role="3eNLev">
+                            <node concept="2ZW3vV" id="27bTNFfaZ3h" role="3eO9$A">
+                              <node concept="3uibUv" id="27bTNFfaZ3i" role="2ZW6by">
+                                <ref role="3uigEE" to="1g4i:1FOQehwovmW" resolve="TypecheckingReportItem" />
+                              </node>
+                              <node concept="37vLTw" id="27bTNFfaZ3j" role="2ZW6bz">
+                                <ref role="3cqZAo" node="27bTNFfaZ4f" resolve="it" />
+                              </node>
+                            </node>
+                            <node concept="3clFbS" id="27bTNFfaZ3k" role="3eOfB_">
+                              <node concept="3cpWs8" id="27bTNFfaZ3l" role="3cqZAp">
+                                <node concept="3cpWsn" id="27bTNFfaZ3m" role="3cpWs9">
+                                  <property role="TrG5h" value="tri" />
+                                  <node concept="3uibUv" id="27bTNFfaZ3n" role="1tU5fm">
+                                    <ref role="3uigEE" to="1g4i:1FOQehwovmW" resolve="TypecheckingReportItem" />
+                                  </node>
+                                  <node concept="1eOMI4" id="27bTNFfaZ3o" role="33vP2m">
+                                    <node concept="10QFUN" id="27bTNFfaZ3p" role="1eOMHV">
+                                      <node concept="3uibUv" id="27bTNFfaZ3q" role="10QFUM">
+                                        <ref role="3uigEE" to="1g4i:1FOQehwovmW" resolve="TypecheckingReportItem" />
+                                      </node>
+                                      <node concept="37vLTw" id="27bTNFfaZ3r" role="10QFUP">
+                                        <ref role="3cqZAo" node="27bTNFfaZ4f" resolve="it" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3cpWs8" id="27bTNFfaZ3s" role="3cqZAp">
+                                <node concept="3cpWsn" id="27bTNFfaZ3t" role="3cpWs9">
+                                  <property role="TrG5h" value="cause" />
+                                  <node concept="3uibUv" id="27bTNFfaZ3u" role="1tU5fm">
+                                    <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+                                  </node>
+                                  <node concept="2OqwBi" id="27bTNFfaZ3v" role="33vP2m">
+                                    <node concept="37vLTw" id="27bTNFfaZ3w" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="27bTNFfaZ3m" resolve="tri" />
+                                    </node>
+                                    <node concept="liA8E" id="27bTNFfaZ3x" role="2OqNvi">
+                                      <ref role="37wK5l" to="1g4i:1FOQehxMNx1" resolve="getCause" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbH" id="27bTNFfaZ3y" role="3cqZAp" />
+                              <node concept="3cpWs8" id="27bTNFfaZ3z" role="3cqZAp">
+                                <node concept="3cpWsn" id="27bTNFfaZ3$" role="3cpWs9">
+                                  <property role="TrG5h" value="resolve" />
+                                  <node concept="3Tqbb2" id="27bTNFfaZ3_" role="1tU5fm" />
+                                  <node concept="2OqwBi" id="27bTNFfaZ3A" role="33vP2m">
+                                    <node concept="2OqwBi" id="27bTNFfaZ3B" role="2Oq$k0">
+                                      <node concept="37vLTw" id="27bTNFfaZ3C" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="27bTNFfaZ3m" resolve="tri" />
+                                      </node>
+                                      <node concept="liA8E" id="27bTNFfaZ3D" role="2OqNvi">
+                                        <ref role="37wK5l" to="d6hs:~NodeReportItemBase.getNode():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getNode" />
+                                      </node>
+                                    </node>
+                                    <node concept="liA8E" id="27bTNFfaZ3E" role="2OqNvi">
+                                      <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                                      <node concept="37vLTw" id="27bTNFfaZ3F" role="37wK5m">
+                                        <ref role="3cqZAo" node="27bTNFfaZ1m" resolve="repository" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3cpWs8" id="27bTNFfaZ3G" role="3cqZAp">
+                                <node concept="3cpWsn" id="27bTNFfaZ3H" role="3cpWs9">
+                                  <property role="TrG5h" value="ea" />
+                                  <node concept="3Tqbb2" id="27bTNFfaZ3I" role="1tU5fm">
+                                    <ref role="ehGHo" to="wcmu:1FOQehwZdZ9" resolve="ErrorAnnotation" />
+                                  </node>
+                                  <node concept="2OqwBi" id="27bTNFfaZ3J" role="33vP2m">
+                                    <node concept="37vLTw" id="27bTNFfaZ3K" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="27bTNFfaZ3$" resolve="resolve" />
+                                    </node>
+                                    <node concept="3CFZ6_" id="27bTNFfaZ3L" role="2OqNvi">
+                                      <node concept="3CFYIy" id="27bTNFfaZ3M" role="3CFYIz">
+                                        <ref role="3CFYIx" to="wcmu:1FOQehwZdZ9" resolve="ErrorAnnotation" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbJ" id="27bTNFfaZ3N" role="3cqZAp">
+                                <node concept="3clFbS" id="27bTNFfaZ3O" role="3clFbx">
+                                  <node concept="YS8fn" id="27bTNFfaZ3P" role="3cqZAp">
+                                    <node concept="2ShNRf" id="27bTNFfaZ3Q" role="YScLw">
+                                      <node concept="1pGfFk" id="27bTNFfaZ3R" role="2ShVmc">
+                                        <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="RuntimeException" />
+                                        <node concept="2YIFZM" id="27bTNFfaZ3S" role="37wK5m">
+                                          <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                          <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
+                                          <node concept="Xl_RD" id="27bTNFfaZ3T" role="37wK5m">
+                                            <property role="Xl_RC" value="Unadvised error in '%s': %s" />
+                                          </node>
+                                          <node concept="2OqwBi" id="27bTNFfaZ3U" role="37wK5m">
+                                            <node concept="37vLTw" id="27bTNFfaZ3V" role="2Oq$k0">
+                                              <ref role="3cqZAo" node="27bTNFfaZ3m" resolve="tri" />
+                                            </node>
+                                            <node concept="liA8E" id="27bTNFfaZ3W" role="2OqNvi">
+                                              <ref role="37wK5l" to="d6hs:~NodeReportItemBase.getNode():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getNode" />
+                                            </node>
+                                          </node>
+                                          <node concept="2OqwBi" id="27bTNFfaZ3X" role="37wK5m">
+                                            <node concept="37vLTw" id="27bTNFfaZ3Y" role="2Oq$k0">
+                                              <ref role="3cqZAo" node="27bTNFfaZ3m" resolve="tri" />
+                                            </node>
+                                            <node concept="liA8E" id="27bTNFfaZ3Z" role="2OqNvi">
+                                              <ref role="37wK5l" to="d6hs:~ReportItemBase.getMessage():java.lang.String" resolve="getMessage" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="37vLTw" id="27bTNFfaZ40" role="37wK5m">
+                                          <ref role="3cqZAo" node="27bTNFfaZ3t" resolve="cause" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbH" id="27bTNFfaZ41" role="3cqZAp" />
+                                </node>
+                                <node concept="2OqwBi" id="27bTNFfaZ42" role="3clFbw">
+                                  <node concept="37vLTw" id="27bTNFfaZ43" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="27bTNFfaZ3H" resolve="ea" />
+                                  </node>
+                                  <node concept="3w_OXm" id="27bTNFfaZ44" role="2OqNvi" />
+                                </node>
+                                <node concept="9aQIb" id="27bTNFfaZ45" role="9aQIa">
+                                  <node concept="3clFbS" id="27bTNFfaZ46" role="9aQI4">
+                                    <node concept="3clFbF" id="27bTNFfaZ47" role="3cqZAp">
+                                      <node concept="2OqwBi" id="27bTNFfaZ48" role="3clFbG">
+                                        <node concept="37vLTw" id="27bTNFfaZ49" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="27bTNFfaZ2u" resolve="errRefs" />
+                                        </node>
+                                        <node concept="3dhRuq" id="27bTNFfaZ4a" role="2OqNvi">
+                                          <node concept="2OqwBi" id="27bTNFfaZ4b" role="25WWJ7">
+                                            <node concept="2JrnkZ" id="27bTNFfaZ4c" role="2Oq$k0">
+                                              <node concept="37vLTw" id="27bTNFfaZ4d" role="2JrQYb">
+                                                <ref role="3cqZAo" node="27bTNFfaZ3H" resolve="ea" />
+                                              </node>
+                                            </node>
+                                            <node concept="liA8E" id="27bTNFfaZ4e" role="2OqNvi">
+                                              <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="2Bs9D5RziXo" role="1bW2Oz">
-                              <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="2Bs9D5RziXp" role="1tU5fm" />
-                            </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="YS8fn" id="2Bs9D5RziYc" role="3cqZAp">
-                    <node concept="2ShNRf" id="2Bs9D5RziYd" role="YScLw">
-                      <node concept="1pGfFk" id="2Bs9D5RziYe" role="2ShVmc">
-                        <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
-                        <node concept="2YIFZM" id="2Bs9D5RziYf" role="37wK5m">
-                          <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                          <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
-                          <node concept="Xl_RD" id="2Bs9D5RziYg" role="37wK5m">
-                            <property role="Xl_RC" value="Advised error not triggered in '%s'" />
-                          </node>
-                          <node concept="2OqwBi" id="2Bs9D5RziYh" role="37wK5m">
-                            <node concept="37vLTw" id="2Bs9D5RzjNl" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2Bs9D5RziX8" resolve="ea" />
-                            </node>
-                            <node concept="1mfA1w" id="2Bs9D5RzkK$" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
+                  <node concept="3cpWsn" id="27bTNFfaZ4f" role="1Duv9x">
+                    <property role="TrG5h" value="it" />
+                    <node concept="3uibUv" id="27bTNFfaZ4g" role="1tU5fm">
+                      <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="27bTNFfaZ4h" role="1DdaDG">
+                    <node concept="37vLTw" id="27bTNFfaZ4i" role="2Oq$k0">
+                      <ref role="3cqZAo" node="27bTNFfaZ1t" resolve="sink" />
+                    </node>
+                    <node concept="2OwXpG" id="27bTNFfaZ4j" role="2OqNvi">
+                      <ref role="2Oxat5" node="1FOQehxyZrr" resolve="reportItems" />
                     </node>
                   </node>
                 </node>
-                <node concept="2OqwBi" id="2Bs9D5Rz1BH" role="3clFbw">
-                  <node concept="37vLTw" id="2Bs9D5Rz0gz" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2Bs9D5RySzh" resolve="errRefs" />
-                  </node>
-                  <node concept="3GX2aA" id="2Bs9D5Rz3aX" role="2OqNvi" />
-                </node>
-              </node>
-              <node concept="3clFbH" id="1FOQehxLs9D" role="3cqZAp" />
-              <node concept="1DcWWT" id="1FOQehxzfWD" role="3cqZAp">
-                <node concept="3clFbS" id="1FOQehxzfWG" role="2LFqv$">
-                  <node concept="3cpWs8" id="1FOQehxzmo3" role="3cqZAp">
-                    <node concept="3cpWsn" id="1FOQehxzmo4" role="3cpWs9">
-                      <property role="TrG5h" value="node" />
-                      <node concept="3Tqbb2" id="1FOQehxKpTW" role="1tU5fm" />
-                      <node concept="2OqwBi" id="1FOQehxzmo6" role="33vP2m">
-                        <node concept="2OqwBi" id="1FOQehxzmo7" role="2Oq$k0">
-                          <node concept="37vLTw" id="1FOQehxzo81" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1FOQehxzfWH" resolve="ref2type" />
-                          </node>
-                          <node concept="3AY5_j" id="1FOQehxzmo9" role="2OqNvi" />
+                <node concept="3clFbH" id="27bTNFfaZ4k" role="3cqZAp" />
+                <node concept="3clFbJ" id="27bTNFfaZ4l" role="3cqZAp">
+                  <node concept="3clFbS" id="27bTNFfaZ4m" role="3clFbx">
+                    <node concept="3cpWs8" id="27bTNFfaZ4n" role="3cqZAp">
+                      <node concept="3cpWsn" id="27bTNFfaZ4o" role="3cpWs9">
+                        <property role="TrG5h" value="first" />
+                        <node concept="3uibUv" id="27bTNFfaZ4p" role="1tU5fm">
+                          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
                         </node>
-                        <node concept="liA8E" id="1FOQehxzmoa" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
-                          <node concept="37vLTw" id="1FOQehxzmob" role="37wK5m">
-                            <ref role="3cqZAo" node="443LGHBTRnR" resolve="repository" />
+                        <node concept="2OqwBi" id="27bTNFfaZ4q" role="33vP2m">
+                          <node concept="37vLTw" id="27bTNFfaZ4r" role="2Oq$k0">
+                            <ref role="3cqZAo" node="27bTNFfaZ2u" resolve="errRefs" />
                           </node>
+                          <node concept="1uHKPH" id="27bTNFfaZ4s" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                  </node>
-                  <node concept="3clFbJ" id="1FOQehxzmoc" role="3cqZAp">
-                    <node concept="3clFbS" id="1FOQehxzmod" role="3clFbx">
-                      <node concept="3cpWs8" id="1FOQehxzria" role="3cqZAp">
-                        <node concept="3cpWsn" id="1FOQehxzrib" role="3cpWs9">
-                          <property role="TrG5h" value="localType" />
-                          <node concept="3Tqbb2" id="1FOQehxzrhC" role="1tU5fm" />
-                          <node concept="2OqwBi" id="1FOQehxzric" role="33vP2m">
-                            <node concept="37vLTw" id="1FOQehxzrid" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1FOQehxz73h" resolve="facade" />
-                            </node>
-                            <node concept="liA8E" id="1FOQehxzrie" role="2OqNvi">
-                              <ref role="37wK5l" to="1g4i:1FOQehxpov2" resolve="getTypeLocally" />
-                              <node concept="37vLTw" id="1FOQehxzrif" role="37wK5m">
-                                <ref role="3cqZAo" node="1FOQehxzmo4" resolve="node" />
+                    <node concept="3cpWs8" id="27bTNFfaZ4t" role="3cqZAp">
+                      <node concept="3cpWsn" id="27bTNFfaZ4u" role="3cpWs9">
+                        <property role="TrG5h" value="ea" />
+                        <node concept="3Tqbb2" id="27bTNFfaZ4v" role="1tU5fm">
+                          <ref role="ehGHo" to="wcmu:1FOQehwZdZ9" resolve="ErrorAnnotation" />
+                        </node>
+                        <node concept="2OqwBi" id="27bTNFfaZ4w" role="33vP2m">
+                          <node concept="37vLTw" id="27bTNFfaZ4x" role="2Oq$k0">
+                            <ref role="3cqZAo" node="27bTNFfaZ1U" resolve="errors" />
+                          </node>
+                          <node concept="1z4cxt" id="27bTNFfaZ4y" role="2OqNvi">
+                            <node concept="1bVj0M" id="27bTNFfaZ4z" role="23t8la">
+                              <node concept="3clFbS" id="27bTNFfaZ4$" role="1bW5cS">
+                                <node concept="3clFbF" id="27bTNFfaZ4_" role="3cqZAp">
+                                  <node concept="2OqwBi" id="27bTNFfaZ4A" role="3clFbG">
+                                    <node concept="2OqwBi" id="27bTNFfaZ4B" role="2Oq$k0">
+                                      <node concept="2JrnkZ" id="27bTNFfaZ4C" role="2Oq$k0">
+                                        <node concept="37vLTw" id="27bTNFfaZ4D" role="2JrQYb">
+                                          <ref role="3cqZAo" node="27bTNFfaZ4H" resolve="it" />
+                                        </node>
+                                      </node>
+                                      <node concept="liA8E" id="27bTNFfaZ4E" role="2OqNvi">
+                                        <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                      </node>
+                                    </node>
+                                    <node concept="liA8E" id="27bTNFfaZ4F" role="2OqNvi">
+                                      <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                                      <node concept="37vLTw" id="27bTNFfaZ4G" role="37wK5m">
+                                        <ref role="3cqZAo" node="27bTNFfaZ4o" resolve="first" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="Rh6nW" id="27bTNFfaZ4H" role="1bW2Oz">
+                                <property role="TrG5h" value="it" />
+                                <node concept="2jxLKc" id="27bTNFfaZ4I" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbJ" id="1FOQehxzrT1" role="3cqZAp">
-                        <node concept="3clFbS" id="1FOQehxzrT2" role="3clFbx">
-                          <node concept="3clFbH" id="1FOQehxzvRR" role="3cqZAp" />
-                          <node concept="3clFbJ" id="6EwjVjWv8Va" role="3cqZAp">
-                            <node concept="3clFbS" id="6EwjVjWv8Vc" role="3clFbx">
-                              <node concept="YS8fn" id="1FOQehxzrT3" role="3cqZAp">
-                                <node concept="2ShNRf" id="1FOQehxzrT4" role="YScLw">
-                                  <node concept="1pGfFk" id="1FOQehxzrT5" role="2ShVmc">
-                                    <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
-                                    <node concept="2YIFZM" id="1FOQehxzrT6" role="37wK5m">
+                    </node>
+                    <node concept="YS8fn" id="27bTNFfaZ4J" role="3cqZAp">
+                      <node concept="2ShNRf" id="27bTNFfaZ4K" role="YScLw">
+                        <node concept="1pGfFk" id="27bTNFfaZ4L" role="2ShVmc">
+                          <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
+                          <node concept="2YIFZM" id="27bTNFfaZ4M" role="37wK5m">
+                            <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
+                            <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                            <node concept="Xl_RD" id="27bTNFfaZ4N" role="37wK5m">
+                              <property role="Xl_RC" value="Advised error not triggered in '%s'" />
+                            </node>
+                            <node concept="2OqwBi" id="27bTNFfaZ4O" role="37wK5m">
+                              <node concept="37vLTw" id="27bTNFfaZ4P" role="2Oq$k0">
+                                <ref role="3cqZAo" node="27bTNFfaZ4u" resolve="ea" />
+                              </node>
+                              <node concept="1mfA1w" id="27bTNFfaZ4Q" role="2OqNvi" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="27bTNFfaZ4R" role="3clFbw">
+                    <node concept="37vLTw" id="27bTNFfaZ4S" role="2Oq$k0">
+                      <ref role="3cqZAo" node="27bTNFfaZ2u" resolve="errRefs" />
+                    </node>
+                    <node concept="3GX2aA" id="27bTNFfaZ4T" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="3clFbH" id="27bTNFfaZ4U" role="3cqZAp" />
+                <node concept="1DcWWT" id="27bTNFfaZ4V" role="3cqZAp">
+                  <node concept="3clFbS" id="27bTNFfaZ4W" role="2LFqv$">
+                    <node concept="3cpWs8" id="27bTNFfaZ4X" role="3cqZAp">
+                      <node concept="3cpWsn" id="27bTNFfaZ4Y" role="3cpWs9">
+                        <property role="TrG5h" value="resolve" />
+                        <node concept="3Tqbb2" id="27bTNFfaZ4Z" role="1tU5fm" />
+                        <node concept="2OqwBi" id="27bTNFfaZ50" role="33vP2m">
+                          <node concept="2OqwBi" id="27bTNFfaZ51" role="2Oq$k0">
+                            <node concept="37vLTw" id="27bTNFfaZ52" role="2Oq$k0">
+                              <ref role="3cqZAo" node="27bTNFfaZ6s" resolve="ref2type" />
+                            </node>
+                            <node concept="3AY5_j" id="27bTNFfaZ53" role="2OqNvi" />
+                          </node>
+                          <node concept="liA8E" id="27bTNFfaZ54" role="2OqNvi">
+                            <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                            <node concept="37vLTw" id="27bTNFfaZ55" role="37wK5m">
+                              <ref role="3cqZAo" node="27bTNFfaZ1m" resolve="repository" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="27bTNFfaZ56" role="3cqZAp" />
+                    <node concept="3clFbJ" id="27bTNFfaZ57" role="3cqZAp">
+                      <node concept="3clFbS" id="27bTNFfaZ58" role="3clFbx">
+                        <node concept="3cpWs8" id="27bTNFfaZ59" role="3cqZAp">
+                          <node concept="3cpWsn" id="27bTNFfaZ5a" role="3cpWs9">
+                            <property role="TrG5h" value="ea" />
+                            <node concept="3Tqbb2" id="27bTNFfaZ5b" role="1tU5fm">
+                              <ref role="ehGHo" to="wcmu:1FOQehwZdZ9" resolve="ErrorAnnotation" />
+                            </node>
+                            <node concept="2OqwBi" id="27bTNFfaZ5c" role="33vP2m">
+                              <node concept="37vLTw" id="27bTNFfaZ5d" role="2Oq$k0">
+                                <ref role="3cqZAo" node="27bTNFfaZ4Y" resolve="resolve" />
+                              </node>
+                              <node concept="3CFZ6_" id="27bTNFfaZ5e" role="2OqNvi">
+                                <node concept="3CFYIy" id="27bTNFfaZ5f" role="3CFYIz">
+                                  <ref role="3CFYIx" to="wcmu:1FOQehwZdZ9" resolve="ErrorAnnotation" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbJ" id="27bTNFfaZ5g" role="3cqZAp">
+                          <node concept="3clFbS" id="27bTNFfaZ5h" role="3clFbx">
+                            <node concept="YS8fn" id="27bTNFfaZ5i" role="3cqZAp">
+                              <node concept="2ShNRf" id="27bTNFfaZ5j" role="YScLw">
+                                <node concept="1pGfFk" id="27bTNFfaZ5k" role="2ShVmc">
+                                  <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
+                                  <node concept="2YIFZM" id="27bTNFfaZ5l" role="37wK5m">
+                                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
+                                    <node concept="Xl_RD" id="27bTNFfaZ5m" role="37wK5m">
+                                      <property role="Xl_RC" value="Error type of [%s]: [%s]" />
+                                    </node>
+                                    <node concept="2OqwBi" id="27bTNFfaZ5n" role="37wK5m">
+                                      <node concept="37vLTw" id="27bTNFfaZ5o" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="27bTNFfaZ6s" resolve="ref2type" />
+                                      </node>
+                                      <node concept="3AY5_j" id="27bTNFfaZ5p" role="2OqNvi" />
+                                    </node>
+                                    <node concept="2OqwBi" id="27bTNFfaZ5q" role="37wK5m">
+                                      <node concept="37vLTw" id="27bTNFfaZ5r" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="27bTNFfaZ6s" resolve="ref2type" />
+                                      </node>
+                                      <node concept="3AV6Ez" id="27bTNFfaZ5s" role="2OqNvi" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="27bTNFfaZ5t" role="3clFbw">
+                            <node concept="37vLTw" id="27bTNFfaZ5u" role="2Oq$k0">
+                              <ref role="3cqZAo" node="27bTNFfaZ5a" resolve="ea" />
+                            </node>
+                            <node concept="3w_OXm" id="27bTNFfaZ5v" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="1Wc70l" id="2hrSdN968I5" role="3clFbw">
+                        <node concept="37vLTw" id="2hrSdN968YS" role="3uHU7B">
+                          <ref role="3cqZAo" node="2hrSdN95Vxk" resolve="reportErrorTypes" />
+                        </node>
+                        <node concept="2OqwBi" id="27bTNFfaZ5w" role="3uHU7w">
+                          <node concept="2OqwBi" id="27bTNFfaZ5x" role="2Oq$k0">
+                            <node concept="37vLTw" id="27bTNFfaZ5y" role="2Oq$k0">
+                              <ref role="3cqZAo" node="27bTNFfaZ6s" resolve="ref2type" />
+                            </node>
+                            <node concept="3AV6Ez" id="27bTNFfaZ5z" role="2OqNvi" />
+                          </node>
+                          <node concept="1mIQ4w" id="27bTNFfaZ5$" role="2OqNvi">
+                            <node concept="chp4Y" id="27bTNFfaZ5_" role="cj9EA">
+                              <ref role="cht4Q" to="tpd4:hfSilrT" resolve="RuntimeErrorType" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="27bTNFfaZ5A" role="3cqZAp" />
+                    <node concept="3clFbJ" id="27bTNFfaZ5B" role="3cqZAp">
+                      <node concept="3clFbS" id="27bTNFfaZ5C" role="3clFbx">
+                        <node concept="3cpWs8" id="27bTNFfaZ5D" role="3cqZAp">
+                          <node concept="3cpWsn" id="27bTNFfaZ5E" role="3cpWs9">
+                            <property role="TrG5h" value="localType" />
+                            <node concept="3Tqbb2" id="27bTNFfaZ5F" role="1tU5fm" />
+                            <node concept="2OqwBi" id="27bTNFfaZ5G" role="33vP2m">
+                              <node concept="37vLTw" id="27bTNFfaZ5H" role="2Oq$k0">
+                                <ref role="3cqZAo" node="27bTNFfaZ1y" resolve="facade" />
+                              </node>
+                              <node concept="liA8E" id="27bTNFfaZ5I" role="2OqNvi">
+                                <ref role="37wK5l" to="1g4i:1FOQehxpov2" resolve="getTypeLocally" />
+                                <node concept="37vLTw" id="27bTNFfaZ5J" role="37wK5m">
+                                  <ref role="3cqZAo" node="27bTNFfaZ4Y" resolve="resolve" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbJ" id="27bTNFfaZ5K" role="3cqZAp">
+                          <node concept="3clFbS" id="27bTNFfaZ5L" role="3clFbx">
+                            <node concept="3clFbH" id="27bTNFfaZ5M" role="3cqZAp" />
+                            <node concept="3clFbJ" id="27bTNFfaZ5N" role="3cqZAp">
+                              <node concept="3clFbS" id="27bTNFfaZ5O" role="3clFbx">
+                                <node concept="YS8fn" id="27bTNFfaZ5P" role="3cqZAp">
+                                  <node concept="2ShNRf" id="27bTNFfaZ5Q" role="YScLw">
+                                    <node concept="1pGfFk" id="27bTNFfaZ5R" role="2ShVmc">
+                                      <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
+                                      <node concept="2YIFZM" id="27bTNFfaZ5S" role="37wK5m">
+                                        <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
+                                        <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                        <node concept="Xl_RD" id="27bTNFfaZ5T" role="37wK5m">
+                                          <property role="Xl_RC" value="types of [%s] differ: [%s] and [%s]" />
+                                        </node>
+                                        <node concept="2OqwBi" id="27bTNFfaZ5U" role="37wK5m">
+                                          <node concept="37vLTw" id="27bTNFfaZ5V" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="27bTNFfaZ6s" resolve="ref2type" />
+                                          </node>
+                                          <node concept="3AY5_j" id="27bTNFfaZ5W" role="2OqNvi" />
+                                        </node>
+                                        <node concept="2OqwBi" id="27bTNFfaZ5X" role="37wK5m">
+                                          <node concept="37vLTw" id="27bTNFfaZ5Y" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="27bTNFfaZ6s" resolve="ref2type" />
+                                          </node>
+                                          <node concept="3AV6Ez" id="27bTNFfaZ5Z" role="2OqNvi" />
+                                        </node>
+                                        <node concept="37vLTw" id="27bTNFfaZ60" role="37wK5m">
+                                          <ref role="3cqZAo" node="27bTNFfaZ5E" resolve="localType" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbH" id="27bTNFfaZ61" role="3cqZAp" />
+                              </node>
+                              <node concept="37vLTw" id="27bTNFfaZ62" role="3clFbw">
+                                <ref role="3cqZAo" node="27bTNFfaWf5" resolve="ensureLocal" />
+                              </node>
+                              <node concept="9aQIb" id="27bTNFfaZ63" role="9aQIa">
+                                <node concept="3clFbS" id="27bTNFfaZ64" role="9aQI4">
+                                  <node concept="34ab3g" id="27bTNFfaZ65" role="3cqZAp">
+                                    <property role="35gtTG" value="warn" />
+                                    <node concept="37vLTw" id="27bTNFfaZ66" role="RQzLk">
+                                      <ref role="3cqZAo" node="27bTNFfaZ1g" resolve="project" />
+                                    </node>
+                                    <node concept="2YIFZM" id="27bTNFfaZ67" role="34bqiv">
                                       <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
                                       <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                                      <node concept="Xl_RD" id="1FOQehxzrT7" role="37wK5m">
+                                      <node concept="Xl_RD" id="27bTNFfaZ68" role="37wK5m">
                                         <property role="Xl_RC" value="types of [%s] differ: [%s] and [%s]" />
                                       </node>
-                                      <node concept="2OqwBi" id="1FOQehxzrT8" role="37wK5m">
-                                        <node concept="37vLTw" id="1FOQehxzx2$" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1FOQehxzfWH" resolve="ref2type" />
+                                      <node concept="2OqwBi" id="27bTNFfaZ69" role="37wK5m">
+                                        <node concept="37vLTw" id="27bTNFfaZ6a" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="27bTNFfaZ6s" resolve="ref2type" />
                                         </node>
-                                        <node concept="3AY5_j" id="1FOQehxzrTa" role="2OqNvi" />
+                                        <node concept="3AY5_j" id="27bTNFfaZ6b" role="2OqNvi" />
                                       </node>
-                                      <node concept="2OqwBi" id="1FOQehxzyiz" role="37wK5m">
-                                        <node concept="37vLTw" id="1FOQehxzx$t" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1FOQehxzfWH" resolve="ref2type" />
+                                      <node concept="2OqwBi" id="27bTNFfaZ6c" role="37wK5m">
+                                        <node concept="37vLTw" id="27bTNFfaZ6d" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="27bTNFfaZ6s" resolve="ref2type" />
                                         </node>
-                                        <node concept="3AV6Ez" id="1FOQehxzyOr" role="2OqNvi" />
+                                        <node concept="3AV6Ez" id="27bTNFfaZ6e" role="2OqNvi" />
                                       </node>
-                                      <node concept="37vLTw" id="1FOQehxzzsr" role="37wK5m">
-                                        <ref role="3cqZAo" node="1FOQehxzrib" resolve="localType" />
+                                      <node concept="37vLTw" id="27bTNFfaZ6f" role="37wK5m">
+                                        <ref role="3cqZAo" node="27bTNFfaZ5E" resolve="localType" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbH" id="6EwjVjWv8Vb" role="3cqZAp" />
-                            </node>
-                            <node concept="37vLTw" id="6EwjVjWv93D" role="3clFbw">
-                              <ref role="3cqZAo" node="7smgEqg8tya" resolve="ensureLocal" />
-                            </node>
-                            <node concept="9aQIb" id="6EwjVjWv98K" role="9aQIa">
-                              <node concept="3clFbS" id="6EwjVjWv98L" role="9aQI4">
-                                <node concept="34ab3g" id="6EwjVjWv9cS" role="3cqZAp">
-                                  <property role="35gtTG" value="warn" />
-                                  <node concept="37vLTw" id="6EwjVjWv9l6" role="RQzLk">
-                                    <ref role="3cqZAo" node="443LGHBTP5Z" resolve="project" />
-                                  </node>
-                                  <node concept="2YIFZM" id="6EwjVjWv9l_" role="34bqiv">
-                                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
-                                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                                    <node concept="Xl_RD" id="6EwjVjWv9lA" role="37wK5m">
-                                      <property role="Xl_RC" value="types of [%s] differ: [%s] and [%s]" />
-                                    </node>
-                                    <node concept="2OqwBi" id="6EwjVjWv9lB" role="37wK5m">
-                                      <node concept="37vLTw" id="6EwjVjWv9lC" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1FOQehxzfWH" resolve="ref2type" />
-                                      </node>
-                                      <node concept="3AY5_j" id="6EwjVjWv9lD" role="2OqNvi" />
-                                    </node>
-                                    <node concept="2OqwBi" id="6EwjVjWv9lE" role="37wK5m">
-                                      <node concept="37vLTw" id="6EwjVjWv9lF" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1FOQehxzfWH" resolve="ref2type" />
-                                      </node>
-                                      <node concept="3AV6Ez" id="6EwjVjWv9lG" role="2OqNvi" />
-                                    </node>
-                                    <node concept="37vLTw" id="6EwjVjWv9lH" role="37wK5m">
-                                      <ref role="3cqZAo" node="1FOQehxzrib" resolve="localType" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
                             </node>
                           </node>
-                        </node>
-                        <node concept="3fqX7Q" id="1FOQehxzrTd" role="3clFbw">
-                          <node concept="1eOMI4" id="1FOQehxzrTe" role="3fr31v">
-                            <node concept="2YFouu" id="1FOQehxzrTf" role="1eOMHV">
-                              <node concept="37vLTw" id="1FOQehxzwti" role="3uHU7w">
-                                <ref role="3cqZAo" node="1FOQehxzrib" resolve="localType" />
-                              </node>
-                              <node concept="2OqwBi" id="1FOQehxzsYR" role="3uHU7B">
-                                <node concept="37vLTw" id="1FOQehxzsgI" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="1FOQehxzfWH" resolve="ref2type" />
+                          <node concept="3fqX7Q" id="27bTNFfaZ6g" role="3clFbw">
+                            <node concept="1eOMI4" id="27bTNFfaZ6h" role="3fr31v">
+                              <node concept="2YFouu" id="27bTNFfaZ6i" role="1eOMHV">
+                                <node concept="37vLTw" id="27bTNFfaZ6j" role="3uHU7w">
+                                  <ref role="3cqZAo" node="27bTNFfaZ5E" resolve="localType" />
+                                </node>
+                                <node concept="2OqwBi" id="27bTNFfaZ6k" role="3uHU7B">
+                                  <node concept="37vLTw" id="27bTNFfaZ6l" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="27bTNFfaZ6s" resolve="ref2type" />
+                                  </node>
+                                  <node concept="3AV6Ez" id="27bTNFfaZ6m" role="2OqNvi" />
                                 </node>
-                                <node concept="3AV6Ez" id="1FOQehxztBT" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="3clFbC" id="1FOQehxzmoo" role="3clFbw">
-                      <node concept="2OqwBi" id="1FOQehxzmop" role="3uHU7B">
-                        <node concept="37vLTw" id="1FOQehxzmoq" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1FOQehxzmo4" resolve="node" />
+                      <node concept="3clFbC" id="27bTNFfaZ6n" role="3clFbw">
+                        <node concept="2OqwBi" id="27bTNFfaZ6o" role="3uHU7B">
+                          <node concept="37vLTw" id="27bTNFfaZ6p" role="2Oq$k0">
+                            <ref role="3cqZAo" node="27bTNFfaZ4Y" resolve="resolve" />
+                          </node>
+                          <node concept="2Rxl7S" id="27bTNFfaZ6q" role="2OqNvi" />
+                        </node>
+                        <node concept="37vLTw" id="27bTNFfaZ6r" role="3uHU7w">
+                          <ref role="3cqZAo" node="27bTNFfaKmm" resolve="root" />
                         </node>
-                        <node concept="2Rxl7S" id="1FOQehxKq$Z" role="2OqNvi" />
-                      </node>
-                      <node concept="37vLTw" id="1FOQehxzmos" role="3uHU7w">
-                        <ref role="3cqZAo" node="7smgEqg8tfa" resolve="root" />
                       </node>
                     </node>
                   </node>
-                </node>
-                <node concept="3cpWsn" id="1FOQehxzfWH" role="1Duv9x">
-                  <property role="TrG5h" value="ref2type" />
-                  <node concept="3f3tKP" id="1FOQehxzfWL" role="1tU5fm">
-                    <node concept="3uibUv" id="1FOQehxzfWM" role="3f3zw5">
-                      <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                    </node>
-                    <node concept="3Tqbb2" id="1FOQehxzfWN" role="3f3$T$" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="1FOQehxByUI" role="1DdaDG">
-                  <node concept="2OqwBi" id="1FOQehxzfWO" role="2Oq$k0">
-                    <node concept="37vLTw" id="1FOQehxzfWP" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1FOQehxzend" resolve="cache" />
-                    </node>
-                    <node concept="liA8E" id="1FOQehxzfWQ" role="2OqNvi">
-                      <ref role="37wK5l" node="1FOQehxe5cU" resolve="allTypes" />
+                  <node concept="3cpWsn" id="27bTNFfaZ6s" role="1Duv9x">
+                    <property role="TrG5h" value="ref2type" />
+                    <node concept="3f3tKP" id="27bTNFfaZ6t" role="1tU5fm">
+                      <node concept="3uibUv" id="27bTNFfaZ6u" role="3f3zw5">
+                        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                      </node>
+                      <node concept="3Tqbb2" id="27bTNFfaZ6v" role="3f3$T$" />
                     </node>
                   </node>
-                  <node concept="3CFNJx" id="1FOQehxB$3G" role="2OqNvi" />
+                  <node concept="2OqwBi" id="27bTNFfaZ6w" role="1DdaDG">
+                    <node concept="2OqwBi" id="27bTNFfaZ6x" role="2Oq$k0">
+                      <node concept="37vLTw" id="27bTNFfaZ6y" role="2Oq$k0">
+                        <ref role="3cqZAo" node="27bTNFfaZ1F" resolve="cache" />
+                      </node>
+                      <node concept="liA8E" id="27bTNFfaZ6z" role="2OqNvi">
+                        <ref role="37wK5l" node="1FOQehxe5cU" resolve="allTypes" />
+                      </node>
+                    </node>
+                    <node concept="3CFNJx" id="27bTNFfaZ6$" role="2OqNvi" />
+                  </node>
                 </node>
               </node>
             </node>
+            <node concept="37vLTw" id="27bTNFfaZ6_" role="ukAjM">
+              <ref role="3cqZAo" node="27bTNFfaZ1m" resolve="repository" />
+            </node>
           </node>
-          <node concept="37vLTw" id="1FOQehxKbG6" role="ukAjM">
-            <ref role="3cqZAo" node="443LGHBTRnR" resolve="repository" />
+          <node concept="3clFbH" id="27bTNFfaZ6A" role="3cqZAp" />
+          <node concept="3clFbF" id="27bTNFfaZ6B" role="3cqZAp">
+            <node concept="37vLTw" id="27bTNFfaZ6C" role="3clFbG">
+              <ref role="3cqZAo" node="27bTNFfaZ1F" resolve="cache" />
+            </node>
           </node>
         </node>
-        <node concept="3clFbH" id="1FOQehxzCUF" role="3cqZAp" />
-        <node concept="3clFbF" id="1FOQehxzA$r" role="3cqZAp">
-          <node concept="37vLTw" id="1FOQehxzA$p" role="3clFbG">
-            <ref role="3cqZAo" node="1FOQehxzend" resolve="cache" />
-          </node>
+      </node>
+      <node concept="2tJIrI" id="27bTNFfaJFL" role="jymVt" />
+      <node concept="3Tm1VV" id="27bTNFfaJxr" role="1B3o_S" />
+      <node concept="312cEg" id="27bTNFfaKmm" role="jymVt">
+        <property role="TrG5h" value="root" />
+        <node concept="3Tm6S6" id="27bTNFfaKmn" role="1B3o_S" />
+        <node concept="3Tqbb2" id="27bTNFfaKmp" role="1tU5fm" />
+      </node>
+      <node concept="312cEg" id="27bTNFfaN42" role="jymVt">
+        <property role="TrG5h" value="prj" />
+        <node concept="3Tm6S6" id="27bTNFfaN43" role="1B3o_S" />
+        <node concept="3uibUv" id="27bTNFfaN45" role="1tU5fm">
+          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+        </node>
+      </node>
+      <node concept="312cEg" id="27bTNFfaWf5" role="jymVt">
+        <property role="TrG5h" value="ensureLocal" />
+        <node concept="3Tm6S6" id="27bTNFfaWf6" role="1B3o_S" />
+        <node concept="10P_77" id="27bTNFfaWk8" role="1tU5fm" />
+        <node concept="3clFbT" id="27bTNFfaWCR" role="33vP2m">
+          <property role="3clFbU" value="true" />
+        </node>
+      </node>
+      <node concept="312cEg" id="2hrSdN95Vxk" role="jymVt">
+        <property role="TrG5h" value="reportErrorTypes" />
+        <node concept="3Tm6S6" id="2hrSdN95Vxl" role="1B3o_S" />
+        <node concept="10P_77" id="2hrSdN95Vxm" role="1tU5fm" />
+        <node concept="3clFbT" id="2hrSdN95Vxn" role="33vP2m">
+          <property role="3clFbU" value="true" />
         </node>
       </node>
     </node>
diff --git a/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps
index 3fb56577..669b3a6c 100644
--- a/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps
+++ b/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps
@@ -57,7 +57,6 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -141,23 +140,32 @@
       <property role="TrG5h" value="Test1" />
       <node concept="3cqZAl" id="5s5QomKHHK2" role="3clF45" />
       <node concept="3clFbS" id="5s5QomKHHK6" role="3clF47">
-        <node concept="2Hmddi" id="4BHjwwGPNaW" role="3cqZAp">
-          <node concept="2YIFZM" id="4BHjwwGPNe3" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="35YJGAJT$tF" role="37wK5m">
-              <node concept="2WthIp" id="35YJGAJT$tI" role="2Oq$k0" />
-              <node concept="2XshWL" id="35YJGAJT$tK" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="6EwjVjWuYwA" role="2XxRq1">
-                  <node concept="ZC_QK" id="5RH_cL_9G1s" role="2tJFKM">
-                    <ref role="2aWVGs" to="ious:3w0n0hzkQZ9" resolve="Test1" />
+        <node concept="2Hmddi" id="27bTNFfbwI1" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwI2" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwI3" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwI4" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbZPj" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbZPk" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbZPl" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbZPm" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbZPn" role="2tJFKM">
+                        <ref role="2aWVGs" to="ious:3w0n0hzkQZ9" resolve="Test1" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbZRk" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwI7" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="4BHjwwGPNe5" role="37wK5m" />
-            <node concept="3clFbT" id="6EwjVjWv9xk" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwI8" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -166,23 +174,32 @@
       <property role="TrG5h" value="Test2" />
       <node concept="3cqZAl" id="5RH_cL_9G1w" role="3clF45" />
       <node concept="3clFbS" id="5RH_cL_9G1x" role="3clF47">
-        <node concept="2Hmddi" id="5RH_cL_9G1y" role="3cqZAp">
-          <node concept="2YIFZM" id="5RH_cL_9G1z" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="5RH_cL_9G1$" role="37wK5m">
-              <node concept="2WthIp" id="5RH_cL_9G1_" role="2Oq$k0" />
-              <node concept="2XshWL" id="5RH_cL_9G1A" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="5RH_cL_9G1B" role="2XxRq1">
-                  <node concept="ZC_QK" id="5RH_cL_9G23" role="2tJFKM">
-                    <ref role="2aWVGs" to="ious:3w0n0hznGEq" resolve="Test2" />
+        <node concept="2Hmddi" id="27bTNFfbwIF" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwIG" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwIH" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwII" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfc04W" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfc04X" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfc04Y" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfc04Z" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfc050" role="2tJFKM">
+                        <ref role="2aWVGs" to="ious:3w0n0hznGEq" resolve="Test2" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfc06X" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwIL" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="5RH_cL_9G1D" role="37wK5m" />
-            <node concept="3clFbT" id="5RH_cL_9G1E" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwIM" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -191,23 +208,32 @@
       <property role="TrG5h" value="Test3" />
       <node concept="3cqZAl" id="5RH_cL_9G27" role="3clF45" />
       <node concept="3clFbS" id="5RH_cL_9G28" role="3clF47">
-        <node concept="2Hmddi" id="5RH_cL_9G29" role="3cqZAp">
-          <node concept="2YIFZM" id="5RH_cL_9G2a" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="5RH_cL_9G2b" role="37wK5m">
-              <node concept="2WthIp" id="5RH_cL_9G2c" role="2Oq$k0" />
-              <node concept="2XshWL" id="5RH_cL_9G2d" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="5RH_cL_9G2e" role="2XxRq1">
-                  <node concept="ZC_QK" id="5RH_cL_9G2Q" role="2tJFKM">
-                    <ref role="2aWVGs" to="ious:3w0n0hznGIK" resolve="Test3" />
+        <node concept="2Hmddi" id="27bTNFfbwJl" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwJm" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwJn" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwJo" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfc08Q" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfc08R" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfc08S" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfc08T" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfc08U" role="2tJFKM">
+                        <ref role="2aWVGs" to="ious:3w0n0hznGIK" resolve="Test3" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfc0aR" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwJr" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="5RH_cL_9G2g" role="37wK5m" />
-            <node concept="3clFbT" id="5RH_cL_9G2h" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwJs" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -216,23 +242,32 @@
       <property role="TrG5h" value="Test4" />
       <node concept="3cqZAl" id="5RH_cL_9G2U" role="3clF45" />
       <node concept="3clFbS" id="5RH_cL_9G2V" role="3clF47">
-        <node concept="2Hmddi" id="5RH_cL_9G2W" role="3cqZAp">
-          <node concept="2YIFZM" id="5RH_cL_9G2X" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="5RH_cL_9G2Y" role="37wK5m">
-              <node concept="2WthIp" id="5RH_cL_9G2Z" role="2Oq$k0" />
-              <node concept="2XshWL" id="5RH_cL_9G30" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="5RH_cL_9G31" role="2XxRq1">
-                  <node concept="ZC_QK" id="5RH_cL_9G3P" role="2tJFKM">
-                    <ref role="2aWVGs" to="ious:3w0n0hznGNm" resolve="Test4" />
+        <node concept="2Hmddi" id="27bTNFfbwJZ" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwK0" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwK1" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwK2" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfc0cK" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfc0cL" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfc0cM" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfc0cN" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfc0cO" role="2tJFKM">
+                        <ref role="2aWVGs" to="ious:3w0n0hznGNm" resolve="Test4" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfc0eL" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwK5" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="5RH_cL_9G33" role="37wK5m" />
-            <node concept="3clFbT" id="5RH_cL_9G34" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwK6" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
diff --git a/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps
index 49d1f67c..c428af03 100644
--- a/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps
+++ b/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps
@@ -57,7 +57,6 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -138,23 +137,32 @@
       <property role="TrG5h" value="Example" />
       <node concept="3cqZAl" id="5s5QomKHHK2" role="3clF45" />
       <node concept="3clFbS" id="5s5QomKHHK6" role="3clF47">
-        <node concept="2Hmddi" id="4BHjwwGPNaW" role="3cqZAp">
-          <node concept="2YIFZM" id="4BHjwwGPNe3" role="2Hmdds">
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <node concept="2OqwBi" id="35YJGAJT$tF" role="37wK5m">
-              <node concept="2WthIp" id="35YJGAJT$tI" role="2Oq$k0" />
-              <node concept="2XshWL" id="35YJGAJT$tK" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="6EwjVjWuYwA" role="2XxRq1">
-                  <node concept="ZC_QK" id="5RH_cL_9FKw" role="2tJFKM">
-                    <ref role="2aWVGs" to="fr15:3w0n0hzkMd2" resolve="Example" />
+        <node concept="2Hmddi" id="27bTNFfbwWt" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwWu" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwWv" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwWw" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbZAI" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbZAJ" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbZAK" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbZAL" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbZAM" role="2tJFKM">
+                        <ref role="2aWVGs" to="fr15:3w0n0hzkMd2" resolve="Example" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbZCJ" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwWz" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="4BHjwwGPNe5" role="37wK5m" />
-            <node concept="3clFbT" id="6EwjVjWv9xk" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwW$" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
diff --git a/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps
index efecf958..8a42dda5 100644
--- a/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps
+++ b/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps
@@ -57,7 +57,6 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -138,23 +137,32 @@
       <property role="TrG5h" value="Contrapositive" />
       <node concept="3cqZAl" id="5s5QomKHHK2" role="3clF45" />
       <node concept="3clFbS" id="5s5QomKHHK6" role="3clF47">
-        <node concept="2Hmddi" id="4BHjwwGPNaW" role="3cqZAp">
-          <node concept="2YIFZM" id="4BHjwwGPNe3" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="35YJGAJT$tF" role="37wK5m">
-              <node concept="2WthIp" id="35YJGAJT$tI" role="2Oq$k0" />
-              <node concept="2XshWL" id="35YJGAJT$tK" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="6EwjVjWuYwA" role="2XxRq1">
-                  <node concept="ZC_QK" id="2dF51l1ebnO" role="2tJFKM">
-                    <ref role="2aWVGs" to="ctog:2AfSc6Jv$28" resolve="Contrapositive" />
+        <node concept="2Hmddi" id="27bTNFfbwKD" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwKE" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwKF" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwKG" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbXle" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbXlf" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbXlg" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbXlh" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbXli" role="2tJFKM">
+                        <ref role="2aWVGs" to="ctog:2AfSc6Jv$28" resolve="Contrapositive" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbXnf" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwKJ" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="4BHjwwGPNe5" role="37wK5m" />
-            <node concept="3clFbT" id="6EwjVjWv9xk" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwKK" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -163,23 +171,32 @@
       <property role="TrG5h" value="Foo" />
       <node concept="3cqZAl" id="2dF51l1ebnh" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebni" role="3clF47">
-        <node concept="2Hmddi" id="2dF51l1ebnj" role="3cqZAp">
-          <node concept="2YIFZM" id="2dF51l1ebnk" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2dF51l1ebnl" role="37wK5m">
-              <node concept="2WthIp" id="2dF51l1ebnm" role="2Oq$k0" />
-              <node concept="2XshWL" id="2dF51l1ebnn" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2dF51l1ebno" role="2XxRq1">
-                  <node concept="ZC_QK" id="2dF51l1ebnR" role="2tJFKM">
-                    <ref role="2aWVGs" to="ctog:4wvktoXPtyv" resolve="Foo" />
+        <node concept="2Hmddi" id="27bTNFfbwLj" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwLk" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwLl" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwLm" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbXQp" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbXQq" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbXQr" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbXQs" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbXQt" role="2tJFKM">
+                        <ref role="2aWVGs" to="ctog:4wvktoXPtyv" resolve="Foo" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbXSq" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwLp" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="2dF51l1ebnq" role="37wK5m" />
-            <node concept="3clFbT" id="2dF51l1ebnr" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwLq" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -188,23 +205,32 @@
       <property role="TrG5h" value="Implication" />
       <node concept="3cqZAl" id="2dF51l1ebnV" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebnW" role="3clF47">
-        <node concept="2Hmddi" id="2dF51l1ebnX" role="3cqZAp">
-          <node concept="2YIFZM" id="2dF51l1ebnY" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2dF51l1ebnZ" role="37wK5m">
-              <node concept="2WthIp" id="2dF51l1ebo0" role="2Oq$k0" />
-              <node concept="2XshWL" id="2dF51l1ebo1" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2dF51l1ebo2" role="2XxRq1">
-                  <node concept="ZC_QK" id="2dF51l1eboE" role="2tJFKM">
-                    <ref role="2aWVGs" to="ctog:5jVx7S230hl" resolve="Implication" />
+        <node concept="2Hmddi" id="27bTNFfbwLX" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwLY" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwLZ" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwM0" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbXUj" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbXUk" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbXUl" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbXUm" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbXUn" role="2tJFKM">
+                        <ref role="2aWVGs" to="ctog:5jVx7S230hl" resolve="Implication" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbXWk" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwM3" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="2dF51l1ebo4" role="37wK5m" />
-            <node concept="3clFbT" id="2dF51l1ebo5" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwM4" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -213,23 +239,32 @@
       <property role="TrG5h" value="Nonsense" />
       <node concept="3cqZAl" id="2dF51l1eboI" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1eboJ" role="3clF47">
-        <node concept="2Hmddi" id="2dF51l1eboK" role="3cqZAp">
-          <node concept="2YIFZM" id="2dF51l1eboL" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2dF51l1eboM" role="37wK5m">
-              <node concept="2WthIp" id="2dF51l1eboN" role="2Oq$k0" />
-              <node concept="2XshWL" id="2dF51l1eboO" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2dF51l1eboP" role="2XxRq1">
-                  <node concept="ZC_QK" id="2dF51l1ebpD" role="2tJFKM">
-                    <ref role="2aWVGs" to="ctog:3l440nVt5$e" resolve="Nonsense" />
+        <node concept="2Hmddi" id="27bTNFfbwMB" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwMC" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwMD" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwME" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbXYd" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbXYe" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbXYf" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbXYg" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbXYh" role="2tJFKM">
+                        <ref role="2aWVGs" to="ctog:3l440nVt5$e" resolve="Nonsense" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbY0e" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwMH" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="2dF51l1eboR" role="37wK5m" />
-            <node concept="3clFbT" id="2dF51l1eboS" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwMI" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -238,23 +273,32 @@
       <property role="TrG5h" value="Sample" />
       <node concept="3cqZAl" id="2dF51l1ebpH" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebpI" role="3clF47">
-        <node concept="2Hmddi" id="2dF51l1ebpJ" role="3cqZAp">
-          <node concept="2YIFZM" id="2dF51l1ebpK" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2dF51l1ebpL" role="37wK5m">
-              <node concept="2WthIp" id="2dF51l1ebpM" role="2Oq$k0" />
-              <node concept="2XshWL" id="2dF51l1ebpN" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2dF51l1ebpO" role="2XxRq1">
-                  <node concept="ZC_QK" id="2dF51l1ebBT" role="2tJFKM">
-                    <ref role="2aWVGs" to="ctog:5A8qZLXfUvB" resolve="Sample" />
+        <node concept="2Hmddi" id="27bTNFfbwNh" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwNi" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwNj" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwNk" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbY27" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbY28" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbY29" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbY2a" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbY2b" role="2tJFKM">
+                        <ref role="2aWVGs" to="ctog:5A8qZLXfUvB" resolve="Sample" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbY48" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwNn" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="2dF51l1ebpQ" role="37wK5m" />
-            <node concept="3clFbT" id="2dF51l1ebpR" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwNo" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -263,23 +307,32 @@
       <property role="TrG5h" value="Tautology" />
       <node concept="3cqZAl" id="2dF51l1ebBX" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebBY" role="3clF47">
-        <node concept="2Hmddi" id="2dF51l1ebBZ" role="3cqZAp">
-          <node concept="2YIFZM" id="2dF51l1ebC0" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2dF51l1ebC1" role="37wK5m">
-              <node concept="2WthIp" id="2dF51l1ebC2" role="2Oq$k0" />
-              <node concept="2XshWL" id="2dF51l1ebC3" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2dF51l1ebC4" role="2XxRq1">
-                  <node concept="ZC_QK" id="2dF51l1ebDg" role="2tJFKM">
-                    <ref role="2aWVGs" to="ctog:3JXBM6C4h$e" resolve="Tautology" />
+        <node concept="2Hmddi" id="27bTNFfbwNV" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwNW" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwNX" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwNY" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbY_u" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbY_v" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbY_w" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbY_x" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbY_y" role="2tJFKM">
+                        <ref role="2aWVGs" to="ctog:3JXBM6C4h$e" resolve="Tautology" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbYBv" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwO1" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="2dF51l1ebC6" role="37wK5m" />
-            <node concept="3clFbT" id="2dF51l1ebC7" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwO2" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -288,23 +341,32 @@
       <property role="TrG5h" value="Test1" />
       <node concept="3cqZAl" id="2dF51l1ebDk" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebDl" role="3clF47">
-        <node concept="2Hmddi" id="2dF51l1ebDm" role="3cqZAp">
-          <node concept="2YIFZM" id="2dF51l1ebDn" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2dF51l1ebDo" role="37wK5m">
-              <node concept="2WthIp" id="2dF51l1ebDp" role="2Oq$k0" />
-              <node concept="2XshWL" id="2dF51l1ebDq" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2dF51l1ebDr" role="2XxRq1">
-                  <node concept="ZC_QK" id="2dF51l1ebEN" role="2tJFKM">
-                    <ref role="2aWVGs" to="ctog:2AfSc6Jv_cR" resolve="Test1" />
+        <node concept="2Hmddi" id="27bTNFfbwO_" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwOA" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwOB" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwOC" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbYDo" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbYDp" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbYDq" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbYDr" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbYDs" role="2tJFKM">
+                        <ref role="2aWVGs" to="ctog:2AfSc6Jv_cR" resolve="Test1" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbYFp" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwOF" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="2dF51l1ebDt" role="37wK5m" />
-            <node concept="3clFbT" id="2dF51l1ebDu" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwOG" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -313,23 +375,32 @@
       <property role="TrG5h" value="Test2" />
       <node concept="3cqZAl" id="2dF51l1ebER" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebES" role="3clF47">
-        <node concept="2Hmddi" id="2dF51l1ebET" role="3cqZAp">
-          <node concept="2YIFZM" id="2dF51l1ebEU" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2dF51l1ebEV" role="37wK5m">
-              <node concept="2WthIp" id="2dF51l1ebEW" role="2Oq$k0" />
-              <node concept="2XshWL" id="2dF51l1ebEX" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2dF51l1ebEY" role="2XxRq1">
-                  <node concept="ZC_QK" id="2dF51l1ebGy" role="2tJFKM">
-                    <ref role="2aWVGs" to="ctog:2AfSc6Jw7pl" resolve="Test2" />
+        <node concept="2Hmddi" id="27bTNFfbwPf" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwPg" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwPh" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwPi" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbYHi" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbYHj" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbYHk" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbYHl" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbYHm" role="2tJFKM">
+                        <ref role="2aWVGs" to="ctog:2AfSc6Jw7pl" resolve="Test2" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbYJj" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwPl" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="2dF51l1ebF0" role="37wK5m" />
-            <node concept="3clFbT" id="2dF51l1ebF1" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwPm" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -338,23 +409,32 @@
       <property role="TrG5h" value="Test3" />
       <node concept="3cqZAl" id="2dF51l1ebGA" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebGB" role="3clF47">
-        <node concept="2Hmddi" id="2dF51l1ebGC" role="3cqZAp">
-          <node concept="2YIFZM" id="2dF51l1ebGD" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2dF51l1ebGE" role="37wK5m">
-              <node concept="2WthIp" id="2dF51l1ebGF" role="2Oq$k0" />
-              <node concept="2XshWL" id="2dF51l1ebGG" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2dF51l1ebGH" role="2XxRq1">
-                  <node concept="ZC_QK" id="2dF51l1ebIw" role="2tJFKM">
-                    <ref role="2aWVGs" to="ctog:2AfSc6JxXEN" resolve="Test3" />
+        <node concept="2Hmddi" id="27bTNFfbwPT" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwPU" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwPV" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwPW" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbYLc" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbYLd" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbYLe" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbYLf" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbYLg" role="2tJFKM">
+                        <ref role="2aWVGs" to="ctog:2AfSc6JxXEN" resolve="Test3" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbYNd" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwPZ" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="2dF51l1ebGJ" role="37wK5m" />
-            <node concept="3clFbT" id="2dF51l1ebGK" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwQ0" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -363,23 +443,32 @@
       <property role="TrG5h" value="Test4" />
       <node concept="3cqZAl" id="2dF51l1ebI$" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebI_" role="3clF47">
-        <node concept="2Hmddi" id="2dF51l1ebIA" role="3cqZAp">
-          <node concept="2YIFZM" id="2dF51l1ebIB" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2dF51l1ebIC" role="37wK5m">
-              <node concept="2WthIp" id="2dF51l1ebID" role="2Oq$k0" />
-              <node concept="2XshWL" id="2dF51l1ebIE" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2dF51l1ebIF" role="2XxRq1">
-                  <node concept="ZC_QK" id="2dF51l1ebKB" role="2tJFKM">
-                    <ref role="2aWVGs" to="ctog:3l440nVqpsF" resolve="Test4" />
+        <node concept="2Hmddi" id="27bTNFfbwQz" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwQ$" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwQ_" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwQA" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbYP6" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbYP7" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbYP8" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbYP9" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbYPa" role="2tJFKM">
+                        <ref role="2aWVGs" to="ctog:3l440nVqpsF" resolve="Test4" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbYR7" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwQD" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="2dF51l1ebIH" role="37wK5m" />
-            <node concept="3clFbT" id="2dF51l1ebII" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwQE" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -388,23 +477,32 @@
       <property role="TrG5h" value="Test5" />
       <node concept="3cqZAl" id="2dF51l1ebKF" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebKG" role="3clF47">
-        <node concept="2Hmddi" id="2dF51l1ebKH" role="3cqZAp">
-          <node concept="2YIFZM" id="2dF51l1ebKI" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2dF51l1ebKJ" role="37wK5m">
-              <node concept="2WthIp" id="2dF51l1ebKK" role="2Oq$k0" />
-              <node concept="2XshWL" id="2dF51l1ebKL" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2dF51l1ebKM" role="2XxRq1">
-                  <node concept="ZC_QK" id="2dF51l1ebMU" role="2tJFKM">
-                    <ref role="2aWVGs" to="ctog:3l440nVrsN1" resolve="Test5" />
+        <node concept="2Hmddi" id="27bTNFfbwRd" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwRe" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwRf" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwRg" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbYT0" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbYT1" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbYT2" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbYT3" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbYT4" role="2tJFKM">
+                        <ref role="2aWVGs" to="ctog:3l440nVrsN1" resolve="Test5" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbYV1" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwRj" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="2dF51l1ebKO" role="37wK5m" />
-            <node concept="3clFbT" id="2dF51l1ebKP" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwRk" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -413,23 +511,32 @@
       <property role="TrG5h" value="Test6" />
       <node concept="3cqZAl" id="2dF51l1ebMY" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebMZ" role="3clF47">
-        <node concept="2Hmddi" id="2dF51l1ebN0" role="3cqZAp">
-          <node concept="2YIFZM" id="2dF51l1ebN1" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2dF51l1ebN2" role="37wK5m">
-              <node concept="2WthIp" id="2dF51l1ebN3" role="2Oq$k0" />
-              <node concept="2XshWL" id="2dF51l1ebN4" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2dF51l1ebN5" role="2XxRq1">
-                  <node concept="ZC_QK" id="2dF51l1ebPp" role="2tJFKM">
-                    <ref role="2aWVGs" to="ctog:5A8qZLXfUwO" resolve="Test6" />
+        <node concept="2Hmddi" id="27bTNFfbwRR" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwRS" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwRT" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwRU" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbYWU" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbYWV" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbYWW" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbYWX" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbYWY" role="2tJFKM">
+                        <ref role="2aWVGs" to="ctog:5A8qZLXfUwO" resolve="Test6" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbYYV" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwRX" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="2dF51l1ebN7" role="37wK5m" />
-            <node concept="3clFbT" id="2dF51l1ebN8" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwRY" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
index 7461e2dc..5d0bb414 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
@@ -57,7 +57,6 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -141,23 +140,32 @@
       <property role="TrG5h" value="Demo" />
       <node concept="3cqZAl" id="5s5QomKHHK2" role="3clF45" />
       <node concept="3clFbS" id="5s5QomKHHK6" role="3clF47">
-        <node concept="2Hmddi" id="4BHjwwGPNaW" role="3cqZAp">
-          <node concept="2YIFZM" id="4BHjwwGPNe3" role="2Hmdds">
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <node concept="2OqwBi" id="35YJGAJT$tF" role="37wK5m">
-              <node concept="2WthIp" id="35YJGAJT$tI" role="2Oq$k0" />
-              <node concept="2XshWL" id="35YJGAJT$tK" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="6EwjVjWuYwA" role="2XxRq1">
-                  <node concept="ZC_QK" id="6EwjVjWv75i" role="2tJFKM">
-                    <ref role="2aWVGs" to="ysck:4dPZ2m2jNim" resolve="Demo" />
+        <node concept="2Hmddi" id="27bTNFfbwSx" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwSy" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwSz" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwS$" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbVCh" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbVCi" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbVCj" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbVCk" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbVCl" role="2tJFKM">
+                        <ref role="2aWVGs" to="ysck:4dPZ2m2jNim" resolve="Demo" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbVgO" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwSB" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="4BHjwwGPNe5" role="37wK5m" />
-            <node concept="3clFbT" id="6EwjVjWv9xk" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwSC" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -166,23 +174,32 @@
       <property role="TrG5h" value="Fix" />
       <node concept="3cqZAl" id="6EwjVjWv74$" role="3clF45" />
       <node concept="3clFbS" id="6EwjVjWv74_" role="3clF47">
-        <node concept="2Hmddi" id="6EwjVjWv74A" role="3cqZAp">
-          <node concept="2YIFZM" id="6EwjVjWvgUR" role="2Hmdds">
-            <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <node concept="2OqwBi" id="6EwjVjWvgUS" role="37wK5m">
-              <node concept="2WthIp" id="6EwjVjWvgUT" role="2Oq$k0" />
-              <node concept="2XshWL" id="6EwjVjWvgUU" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="6EwjVjWvgUV" role="2XxRq1">
-                  <node concept="ZC_QK" id="6EwjVjWvgUW" role="2tJFKM">
-                    <ref role="2aWVGs" to="ysck:G788z3ofcS" resolve="Fix" />
+        <node concept="2Hmddi" id="27bTNFfbxw0" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxw1" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbMeC" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbxw2" role="2Oq$k0">
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <node concept="2OqwBi" id="27bTNFfbVHV" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbVHW" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbVHX" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbVHY" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbVHZ" role="2tJFKM">
+                        <ref role="2aWVGs" to="ysck:G788z3ofcS" resolve="Fix" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbVEe" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbUSe" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="6EwjVjWvgUX" role="37wK5m" />
-            <node concept="3clFbT" id="6EwjVjWvjW7" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbxw5" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -191,22 +208,32 @@
       <property role="TrG5h" value="Peculiar" />
       <node concept="3cqZAl" id="6EwjVjWv0Y4" role="3clF45" />
       <node concept="3clFbS" id="6EwjVjWv0Y5" role="3clF47">
-        <node concept="2Hmddi" id="6EwjVjWv0Y6" role="3cqZAp">
-          <node concept="2YIFZM" id="6EwjVjWv0Y7" role="2Hmdds">
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <node concept="2OqwBi" id="6EwjVjWv0Y8" role="37wK5m">
-              <node concept="2WthIp" id="6EwjVjWv0Y9" role="2Oq$k0" />
-              <node concept="2XshWL" id="6EwjVjWv0Ya" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="6EwjVjWv0Yb" role="2XxRq1">
-                  <node concept="ZC_QK" id="6EwjVjWv0Y$" role="2tJFKM">
-                    <ref role="2aWVGs" to="ysck:oyq0R0e9lD" resolve="Peculiar" />
+        <node concept="2Hmddi" id="27bTNFfbwTb" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwTc" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwTd" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwTe" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbW4I" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbW4J" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbW4K" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbW4L" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbW4M" role="2tJFKM">
+                        <ref role="2aWVGs" to="ysck:oyq0R0e9lD" resolve="Peculiar" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbW6J" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwTh" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="6EwjVjWv0Yd" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwTi" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -215,23 +242,32 @@
       <property role="TrG5h" value="SKI" />
       <node concept="3cqZAl" id="6EwjVjWvpYH" role="3clF45" />
       <node concept="3clFbS" id="6EwjVjWvpYI" role="3clF47">
-        <node concept="2Hmddi" id="6EwjVjWvpYJ" role="3cqZAp">
-          <node concept="2YIFZM" id="6EwjVjWvpYK" role="2Hmdds">
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <node concept="2OqwBi" id="6EwjVjWvpYL" role="37wK5m">
-              <node concept="2WthIp" id="6EwjVjWvpYM" role="2Oq$k0" />
-              <node concept="2XshWL" id="6EwjVjWvpYN" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="6EwjVjWvpYO" role="2XxRq1">
-                  <node concept="ZC_QK" id="6EwjVjWvpZ_" role="2tJFKM">
-                    <ref role="2aWVGs" to="ysck:7Et5j8uqHKT" resolve="SKI" />
+        <node concept="2Hmddi" id="27bTNFfbwTP" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwTQ" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwTR" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwTS" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbW8C" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbW8D" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbW8E" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbW8F" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbW8G" role="2tJFKM">
+                        <ref role="2aWVGs" to="ysck:7Et5j8uqHKT" resolve="SKI" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbWaD" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwTV" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="6EwjVjWvpYQ" role="37wK5m" />
-            <node concept="3clFbT" id="6EwjVjWvsGf" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwTW" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -240,23 +276,32 @@
       <property role="TrG5h" value="Numerals" />
       <node concept="3cqZAl" id="6EwjVjWvvH5" role="3clF45" />
       <node concept="3clFbS" id="6EwjVjWvvH6" role="3clF47">
-        <node concept="2Hmddi" id="6EwjVjWvvH7" role="3cqZAp">
-          <node concept="2YIFZM" id="6EwjVjWvvH8" role="2Hmdds">
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <node concept="2OqwBi" id="6EwjVjWvvH9" role="37wK5m">
-              <node concept="2WthIp" id="6EwjVjWvvHa" role="2Oq$k0" />
-              <node concept="2XshWL" id="6EwjVjWvvHb" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="6EwjVjWvvHc" role="2XxRq1">
-                  <node concept="ZC_QK" id="6EwjVjWvvIb" role="2tJFKM">
-                    <ref role="2aWVGs" to="ysck:7_8aRkgE06U" resolve="Numerals" />
+        <node concept="2Hmddi" id="27bTNFfbwUv" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwUw" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwUx" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwUy" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbWvq" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbWvr" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbWvs" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbWvt" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbWvu" role="2tJFKM">
+                        <ref role="2aWVGs" to="ysck:7_8aRkgE06U" resolve="Numerals" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbWxr" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwU_" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="6EwjVjWvvHe" role="37wK5m" />
-            <node concept="3clFbT" id="6EwjVjWvvHf" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwUA" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -265,23 +310,32 @@
       <property role="TrG5h" value="Omega" />
       <node concept="3cqZAl" id="6EwjVjWvydS" role="3clF45" />
       <node concept="3clFbS" id="6EwjVjWvydT" role="3clF47">
-        <node concept="2Hmddi" id="6EwjVjWvydU" role="3cqZAp">
-          <node concept="2YIFZM" id="6EwjVjWvydV" role="2Hmdds">
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <node concept="2OqwBi" id="6EwjVjWvydW" role="37wK5m">
-              <node concept="2WthIp" id="6EwjVjWvydX" role="2Oq$k0" />
-              <node concept="2XshWL" id="6EwjVjWvydY" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="6EwjVjWvydZ" role="2XxRq1">
-                  <node concept="ZC_QK" id="6EwjVjWvyfa" role="2tJFKM">
-                    <ref role="2aWVGs" to="ysck:nOeFRaGxm_" resolve="Omega" />
+        <node concept="2Hmddi" id="27bTNFfbwV9" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwVa" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwVb" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwVc" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbWzk" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbWzl" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbWzm" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbWzn" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbWzo" role="2tJFKM">
+                        <ref role="2aWVGs" to="ysck:nOeFRaGxm_" resolve="Omega" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbW_l" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwVf" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="6EwjVjWvye1" role="37wK5m" />
-            <node concept="3clFbT" id="6EwjVjWvye2" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwVg" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -290,23 +344,32 @@
       <property role="TrG5h" value="Y_combinator" />
       <node concept="3cqZAl" id="6EwjVjWvyrX" role="3clF45" />
       <node concept="3clFbS" id="6EwjVjWvyrY" role="3clF47">
-        <node concept="2Hmddi" id="6EwjVjWvyrZ" role="3cqZAp">
-          <node concept="2YIFZM" id="6EwjVjWvys0" role="2Hmdds">
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <node concept="2OqwBi" id="6EwjVjWvys1" role="37wK5m">
-              <node concept="2WthIp" id="6EwjVjWvys2" role="2Oq$k0" />
-              <node concept="2XshWL" id="6EwjVjWvys3" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="6EwjVjWvys4" role="2XxRq1">
-                  <node concept="ZC_QK" id="6EwjVjWvytr" role="2tJFKM">
-                    <ref role="2aWVGs" to="ysck:1PL$JmLA85j" resolve="Y_combinator" />
+        <node concept="2Hmddi" id="27bTNFfbwVN" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbwVO" role="2Hmdds">
+            <node concept="2OqwBi" id="27bTNFfbwVP" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbwVQ" role="2Oq$k0">
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <node concept="2OqwBi" id="27bTNFfbWBe" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfbWBf" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfbWBg" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfbWBh" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfbWBi" role="2tJFKM">
+                        <ref role="2aWVGs" to="ysck:1PL$JmLA85j" resolve="Y_combinator" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfbWDf" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="27bTNFfbwVT" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="1jxXqW" id="6EwjVjWvys6" role="37wK5m" />
-            <node concept="3clFbT" id="6EwjVjWvys7" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbwVU" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps
index 3e26a8a2..91a08475 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps
@@ -208,22 +208,27 @@
       <property role="TrG5h" value="Sample_bad1" />
       <node concept="3cqZAl" id="1N_0WA5DT8H" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
-        <node concept="2Hmddi" id="4BHjwwGPMah" role="3cqZAp">
-          <node concept="2YIFZM" id="4BHjwwGPMdn" role="2Hmdds">
-            <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <node concept="2OqwBi" id="2QSgdliBFSp" role="37wK5m">
-              <node concept="2WthIp" id="2QSgdliBFNX" role="2Oq$k0" />
-              <node concept="2XshWL" id="2QSgdliBFZs" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2QSgdliBFZv" role="2XxRq1">
-                  <node concept="ZC_QK" id="2QSgdlj89sr" role="2tJFKM">
-                    <ref role="2aWVGs" to="7rut:5s497Vrh6EY" resolve="Sample_bad1" />
+        <node concept="2Hmddi" id="27bTNFfbxjk" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxjl" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxjm" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfc3tK" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfc3tL" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfc3tM" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfc3tN" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfc3tO" role="2tJFKM">
+                      <ref role="2aWVGs" to="7rut:5s497Vrh6EY" resolve="Sample_bad1" />
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfc3vJ" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxjp" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="4BHjwwGPMdp" role="37wK5m" />
           </node>
         </node>
       </node>
@@ -235,22 +240,27 @@
       <property role="TrG5h" value="Sample_bad2" />
       <node concept="3cqZAl" id="4ekooLap0Mz" role="3clF45" />
       <node concept="3clFbS" id="4ekooLap0M$" role="3clF47">
-        <node concept="2Hmddi" id="2QSgdlj89ME" role="3cqZAp">
-          <node concept="2YIFZM" id="2QSgdlj89MF" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2QSgdlj89MG" role="37wK5m">
-              <node concept="2WthIp" id="2QSgdlj89MH" role="2Oq$k0" />
-              <node concept="2XshWL" id="2QSgdlj89MI" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2QSgdlj89MJ" role="2XxRq1">
-                  <node concept="ZC_QK" id="2QSgdlj89NE" role="2tJFKM">
-                    <ref role="2aWVGs" to="7rut:4ekooLalg08" resolve="Sample_bad2" />
+        <node concept="2Hmddi" id="27bTNFfbxjQ" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxjR" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxjS" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfc3xA" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfc3xB" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfc3xC" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfc3xD" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfc3xE" role="2tJFKM">
+                      <ref role="2aWVGs" to="7rut:4ekooLalg08" resolve="Sample_bad2" />
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfc3z_" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxjV" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="2QSgdlj89ML" role="37wK5m" />
           </node>
         </node>
       </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps
index 887358bf..0c38e665 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps
@@ -211,22 +211,27 @@
       <property role="TrG5h" value="Sample" />
       <node concept="3cqZAl" id="1N_0WA5DT8H" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
-        <node concept="2Hmddi" id="4BHjwwGPMah" role="3cqZAp">
-          <node concept="2YIFZM" id="4BHjwwGPMdn" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2QSgdliBFSp" role="37wK5m">
-              <node concept="2WthIp" id="2QSgdliBFNX" role="2Oq$k0" />
-              <node concept="2XshWL" id="2QSgdliBFZs" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2QSgdliBFZv" role="2XxRq1">
-                  <node concept="ZC_QK" id="2QSgdliBFZw" role="2tJFKM">
-                    <ref role="2aWVGs" to="f6t6:5s497Vrh6EY" resolve="Sample" />
+        <node concept="2Hmddi" id="27bTNFfbxmm" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxmn" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxmo" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfc3IH" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfc3II" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfc3IJ" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfc3IK" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfc3IL" role="2tJFKM">
+                      <ref role="2aWVGs" to="f6t6:5s497Vrh6EY" resolve="Sample" />
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfc3KG" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxmr" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="4BHjwwGPMdp" role="37wK5m" />
           </node>
         </node>
       </node>
@@ -238,22 +243,27 @@
       <property role="TrG5h" value="Sample2" />
       <node concept="3cqZAl" id="1N_0WA5J$AE" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5J$AF" role="3clF47">
-        <node concept="2Hmddi" id="2QSgdliBGfK" role="3cqZAp">
-          <node concept="2YIFZM" id="2QSgdliBGfL" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2QSgdliBGfM" role="37wK5m">
-              <node concept="2WthIp" id="2QSgdliBGfN" role="2Oq$k0" />
-              <node concept="2XshWL" id="2QSgdliBGfO" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2QSgdliBGfP" role="2XxRq1">
-                  <node concept="ZC_QK" id="2QSgdliBGjL" role="2tJFKM">
-                    <ref role="2aWVGs" to="f6t6:2U6QFnZujaA" resolve="Sample2" />
+        <node concept="2Hmddi" id="27bTNFfbxmS" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxmT" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxmU" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfc3Mz" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfc3M$" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfc3M_" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfc3MA" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfc3MB" role="2tJFKM">
+                      <ref role="2aWVGs" to="f6t6:2U6QFnZujaA" resolve="Sample2" />
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfc3Oy" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxmX" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="2QSgdliBGfR" role="37wK5m" />
           </node>
         </node>
       </node>
@@ -265,22 +275,27 @@
       <property role="TrG5h" value="Variance" />
       <node concept="3cqZAl" id="5DSQNPPS8E9" role="3clF45" />
       <node concept="3clFbS" id="5DSQNPPS8Ea" role="3clF47">
-        <node concept="2Hmddi" id="2QSgdliBGyl" role="3cqZAp">
-          <node concept="2YIFZM" id="2QSgdliBGym" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2QSgdliBGyn" role="37wK5m">
-              <node concept="2WthIp" id="2QSgdliBGyo" role="2Oq$k0" />
-              <node concept="2XshWL" id="2QSgdliBGyp" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2QSgdliBGyq" role="2XxRq1">
-                  <node concept="ZC_QK" id="2QSgdliBGAp" role="2tJFKM">
-                    <ref role="2aWVGs" to="f6t6:3yhgKRJ29Qs" resolve="Variance" />
+        <node concept="2Hmddi" id="27bTNFfbxnq" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxnr" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxns" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfc3Qp" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfc3Qq" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfc3Qr" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfc3Qs" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfc3Qt" role="2tJFKM">
+                      <ref role="2aWVGs" to="f6t6:3yhgKRJ29Qs" resolve="Variance" />
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfc3So" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxnv" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="2QSgdliBGys" role="37wK5m" />
           </node>
         </node>
       </node>
@@ -292,22 +307,27 @@
       <property role="TrG5h" value="Recursion" />
       <node concept="3cqZAl" id="19nQ_7V2D9V" role="3clF45" />
       <node concept="3clFbS" id="19nQ_7V2D9W" role="3clF47">
-        <node concept="2Hmddi" id="2QSgdliBGA$" role="3cqZAp">
-          <node concept="2YIFZM" id="2QSgdliBGA_" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2QSgdliBGAA" role="37wK5m">
-              <node concept="2WthIp" id="2QSgdliBGAB" role="2Oq$k0" />
-              <node concept="2XshWL" id="2QSgdliBGAC" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2QSgdliBGAD" role="2XxRq1">
-                  <node concept="ZC_QK" id="2QSgdliBGE_" role="2tJFKM">
-                    <ref role="2aWVGs" to="f6t6:7w387SKGv4P" resolve="Recursion" />
+        <node concept="2Hmddi" id="27bTNFfbxnW" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxnX" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxnY" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfc3Uf" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfc3Ug" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfc3Uh" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfc3Ui" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfc3Uj" role="2tJFKM">
+                      <ref role="2aWVGs" to="f6t6:7w387SKGv4P" resolve="Recursion" />
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfc3We" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxo1" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="2QSgdliBGAF" role="37wK5m" />
           </node>
         </node>
       </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps
index c0f5516f..564ff242 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps
@@ -241,22 +241,27 @@
       <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
         <node concept="3clFbJ" id="2rIdnPwwKoc" role="3cqZAp">
           <node concept="3clFbS" id="2rIdnPwwKoe" role="3clFbx">
-            <node concept="2Hmddi" id="4BHjwwGPMah" role="3cqZAp">
-              <node concept="2YIFZM" id="4BHjwwGPMdn" role="2Hmdds">
-                <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-                <node concept="2OqwBi" id="2QSgdliBFSp" role="37wK5m">
-                  <node concept="2WthIp" id="2QSgdliBFNX" role="2Oq$k0" />
-                  <node concept="2XshWL" id="2QSgdliBFZs" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="2QSgdliBFZv" role="2XxRq1">
-                      <node concept="ZC_QK" id="2QSgdlj8a_0" role="2tJFKM">
-                        <ref role="2aWVGs" to="hwt6:3489cc5$luO" resolve="Thinlet" />
+            <node concept="2Hmddi" id="27bTNFfbxko" role="3cqZAp">
+              <node concept="2OqwBi" id="27bTNFfbxkp" role="2Hmdds">
+                <node concept="2YIFZM" id="27bTNFfbxkq" role="2Oq$k0">
+                  <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                  <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                  <node concept="2OqwBi" id="27bTNFfc4bs" role="37wK5m">
+                    <node concept="2WthIp" id="27bTNFfc4bt" role="2Oq$k0" />
+                    <node concept="2XshWL" id="27bTNFfc4bu" role="2OqNvi">
+                      <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                      <node concept="2tJFMh" id="27bTNFfc4bv" role="2XxRq1">
+                        <node concept="ZC_QK" id="27bTNFfc4bw" role="2tJFKM">
+                          <ref role="2aWVGs" to="hwt6:3489cc5$luO" resolve="Thinlet" />
+                        </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="1jxXqW" id="27bTNFfc4ds" role="37wK5m" />
+                </node>
+                <node concept="liA8E" id="27bTNFfbxkt" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
                 </node>
-                <node concept="1jxXqW" id="4BHjwwGPMdp" role="37wK5m" />
               </node>
             </node>
             <node concept="3clFbH" id="2rIdnPwwLWI" role="3cqZAp" />
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps
index 1f1e1358..c257a758 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps
@@ -70,6 +70,12 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
+        <property id="6329021646629104958" name="text" index="3SKdUp" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
+      </concept>
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
@@ -205,22 +211,27 @@
       <property role="TrG5h" value="intByteConversion" />
       <node concept="3cqZAl" id="5s5QomKHHK2" role="3clF45" />
       <node concept="3clFbS" id="5s5QomKHHK6" role="3clF47">
-        <node concept="2Hmddi" id="4BHjwwGPNaW" role="3cqZAp">
-          <node concept="2YIFZM" id="4BHjwwGPNe3" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="35YJGAJT$tF" role="37wK5m">
-              <node concept="2WthIp" id="35YJGAJT$tI" role="2Oq$k0" />
-              <node concept="2XshWL" id="35YJGAJT$tK" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="35YJGAJT$tQ" role="2XxRq1">
-                  <node concept="ZC_QK" id="35YJGAJT$tR" role="2tJFKM">
-                    <ref role="2aWVGs" to="96nh:5s5QomKHFub" resolve="IntByteConversion" />
+        <node concept="2Hmddi" id="27bTNFfbxdu" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxdv" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxdw" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfc0ig" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfc0ih" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfc0ii" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfc0ij" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfc0ik" role="2tJFKM">
+                      <ref role="2aWVGs" to="96nh:5s5QomKHFub" resolve="IntByteConversion" />
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfc0kf" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxdz" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="4BHjwwGPNe5" role="37wK5m" />
           </node>
         </node>
       </node>
@@ -229,22 +240,27 @@
       <property role="TrG5h" value="charConversion" />
       <node concept="3cqZAl" id="2HYHa0WIt70" role="3clF45" />
       <node concept="3clFbS" id="2HYHa0WIt71" role="3clF47">
-        <node concept="2Hmddi" id="2HYHa0WIt72" role="3cqZAp">
-          <node concept="2YIFZM" id="2HYHa0WIt73" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2HYHa0WIt74" role="37wK5m">
-              <node concept="2WthIp" id="2HYHa0WIt75" role="2Oq$k0" />
-              <node concept="2XshWL" id="2HYHa0WIt76" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2HYHa0WIt77" role="2XxRq1">
-                  <node concept="ZC_QK" id="2HYHa0WIt7D" role="2tJFKM">
-                    <ref role="2aWVGs" to="96nh:3Cu2imBSO5x" resolve="CharConversion" />
+        <node concept="2Hmddi" id="27bTNFfbxe0" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxe1" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxe2" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfc0DT" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfc0DU" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfc0DV" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfc0DW" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfc0DX" role="2tJFKM">
+                      <ref role="2aWVGs" to="96nh:3Cu2imBSO5x" resolve="CharConversion" />
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfc0FS" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxe5" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="2HYHa0WIt79" role="37wK5m" />
           </node>
         </node>
       </node>
@@ -253,22 +269,27 @@
       <property role="TrG5h" value="shortConversion" />
       <node concept="3cqZAl" id="6EY0p2ym72q" role="3clF45" />
       <node concept="3clFbS" id="6EY0p2ym72r" role="3clF47">
-        <node concept="2Hmddi" id="6EY0p2ym72s" role="3cqZAp">
-          <node concept="2YIFZM" id="6EY0p2ym72t" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="6EY0p2ym72u" role="37wK5m">
-              <node concept="2WthIp" id="6EY0p2ym72v" role="2Oq$k0" />
-              <node concept="2XshWL" id="6EY0p2ym72w" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="6EY0p2ym72x" role="2XxRq1">
-                  <node concept="ZC_QK" id="6EY0p2ym73r" role="2tJFKM">
-                    <ref role="2aWVGs" to="96nh:6EY0p2ylujy" resolve="IntShortConversion" />
+        <node concept="2Hmddi" id="27bTNFfbxey" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxez" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxe$" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfc0HJ" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfc0HK" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfc0HL" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfc0HM" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfc0HN" role="2tJFKM">
+                      <ref role="2aWVGs" to="96nh:6EY0p2ylujy" resolve="IntShortConversion" />
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfc0JI" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxeB" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="6EY0p2ym72z" role="37wK5m" />
           </node>
         </node>
       </node>
@@ -277,22 +298,37 @@
       <property role="TrG5h" value="genericNewExpression" />
       <node concept="3cqZAl" id="5moyjRHyVve" role="3clF45" />
       <node concept="3clFbS" id="5moyjRHyVvf" role="3clF47">
-        <node concept="2Hmddi" id="5moyjRHyVvg" role="3cqZAp">
-          <node concept="2YIFZM" id="5moyjRHyVvh" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="5moyjRHyVvi" role="37wK5m">
-              <node concept="2WthIp" id="5moyjRHyVvj" role="2Oq$k0" />
-              <node concept="2XshWL" id="5moyjRHyVvk" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="5moyjRHyVvl" role="2XxRq1">
-                  <node concept="ZC_QK" id="5moyjRHz1DP" role="2tJFKM">
-                    <ref role="2aWVGs" to="96nh:2HYHa0WUDvm" resolve="GenericNewExpression" />
+        <node concept="3SKdUt" id="2hrSdN96hGO" role="3cqZAp">
+          <node concept="3SKdUq" id="2hrSdN96hGQ" role="3SKWNk">
+            <property role="3SKdUp" value="error types are ignored on purpose" />
+          </node>
+        </node>
+        <node concept="2Hmddi" id="27bTNFfbxf4" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxf5" role="2Hmdds">
+            <node concept="2OqwBi" id="2hrSdN96b_y" role="2Oq$k0">
+              <node concept="2YIFZM" id="27bTNFfbxf6" role="2Oq$k0">
+                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+                <node concept="2OqwBi" id="27bTNFfc0L_" role="37wK5m">
+                  <node concept="2WthIp" id="27bTNFfc0LA" role="2Oq$k0" />
+                  <node concept="2XshWL" id="27bTNFfc0LB" role="2OqNvi">
+                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                    <node concept="2tJFMh" id="27bTNFfc0LC" role="2XxRq1">
+                      <node concept="ZC_QK" id="27bTNFfc0LD" role="2tJFKM">
+                        <ref role="2aWVGs" to="96nh:2HYHa0WUDvm" resolve="GenericNewExpression" />
+                      </node>
+                    </node>
                   </node>
                 </node>
+                <node concept="1jxXqW" id="27bTNFfc0N$" role="37wK5m" />
+              </node>
+              <node concept="liA8E" id="2hrSdN96hEW" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
             </node>
-            <node concept="1jxXqW" id="5moyjRHyVvn" role="37wK5m" />
+            <node concept="liA8E" id="27bTNFfbxf9" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
           </node>
         </node>
       </node>
@@ -301,22 +337,27 @@
       <property role="TrG5h" value="instanceMethod" />
       <node concept="3cqZAl" id="6EY0p2x_00k" role="3clF45" />
       <node concept="3clFbS" id="6EY0p2x_00l" role="3clF47">
-        <node concept="2Hmddi" id="6EY0p2x_00m" role="3cqZAp">
-          <node concept="2YIFZM" id="6EY0p2x_00n" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="6EY0p2x_00o" role="37wK5m">
-              <node concept="2WthIp" id="6EY0p2x_00p" role="2Oq$k0" />
-              <node concept="2XshWL" id="6EY0p2x_00q" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="6EY0p2x_00r" role="2XxRq1">
-                  <node concept="ZC_QK" id="6EY0p2x_01j" role="2tJFKM">
-                    <ref role="2aWVGs" to="96nh:6EY0p2wAiyu" resolve="InstanceMethod" />
+        <node concept="2Hmddi" id="27bTNFfbxfA" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxfB" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxfC" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfc0Pr" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfc0Ps" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfc0Pt" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfc0Pu" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfc0Pv" role="2tJFKM">
+                      <ref role="2aWVGs" to="96nh:6EY0p2wAiyu" resolve="InstanceMethod" />
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfc0Rq" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxfF" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="6EY0p2x_00t" role="37wK5m" />
           </node>
         </node>
       </node>
@@ -325,22 +366,27 @@
       <property role="TrG5h" value="staticMethod" />
       <node concept="3cqZAl" id="6EY0p2yyMKp" role="3clF45" />
       <node concept="3clFbS" id="6EY0p2yyMKq" role="3clF47">
-        <node concept="2Hmddi" id="6EY0p2yyMKr" role="3cqZAp">
-          <node concept="2YIFZM" id="6EY0p2yyMKs" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="6EY0p2yyMKt" role="37wK5m">
-              <node concept="2WthIp" id="6EY0p2yyMKu" role="2Oq$k0" />
-              <node concept="2XshWL" id="6EY0p2yyMKv" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="6EY0p2yyMKw" role="2XxRq1">
-                  <node concept="ZC_QK" id="6EY0p2yyMLI" role="2tJFKM">
-                    <ref role="2aWVGs" to="96nh:6EY0p2ymmj_" resolve="StaticMethod" />
+        <node concept="2Hmddi" id="27bTNFfbxg8" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxg9" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxga" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfc188" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfc189" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfc18a" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfc18b" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfc18c" role="2tJFKM">
+                      <ref role="2aWVGs" to="96nh:6EY0p2ymmj_" resolve="StaticMethod" />
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfc1a7" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxgd" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="6EY0p2yyMKy" role="37wK5m" />
           </node>
         </node>
       </node>
@@ -349,22 +395,27 @@
       <property role="TrG5h" value="primitiveTypes" />
       <node concept="3cqZAl" id="7AyqXCdNg70" role="3clF45" />
       <node concept="3clFbS" id="7AyqXCdNg71" role="3clF47">
-        <node concept="2Hmddi" id="7AyqXCdNg72" role="3cqZAp">
-          <node concept="2YIFZM" id="7AyqXCdNg73" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="7AyqXCdNg74" role="37wK5m">
-              <node concept="2WthIp" id="7AyqXCdNg75" role="2Oq$k0" />
-              <node concept="2XshWL" id="7AyqXCdNg76" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="7AyqXCdNg77" role="2XxRq1">
-                  <node concept="ZC_QK" id="7AyqXCdNg8n" role="2tJFKM">
-                    <ref role="2aWVGs" to="96nh:5XJPBczwaPg" resolve="PrimitiveTypes" />
+        <node concept="2Hmddi" id="27bTNFfbxgE" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxgF" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxgG" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfc1bY" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfc1bZ" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfc1c0" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfc1c1" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfc1c2" role="2tJFKM">
+                      <ref role="2aWVGs" to="96nh:5XJPBczwaPg" resolve="PrimitiveTypes" />
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfc1dX" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxgJ" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="7AyqXCdNg79" role="37wK5m" />
           </node>
         </node>
       </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
index 550c7fd0..35631959 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
@@ -11,7 +11,6 @@
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="bs09" ref="r:28026be8-9bf8-4f54-9319-0ca8a6d1299d(typechecking.samples.baseLanguage.helloWorld)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
@@ -23,6 +22,7 @@
       <concept id="1225467090849" name="jetbrains.mps.lang.test.structure.ProjectExpression" flags="nn" index="1jxXqW" />
       <concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
         <property id="6339244025081158986" name="needsNoWriteAction" index="3OwPAg" />
+        <child id="1216993439383" name="methods" index="1qtyYc" />
         <child id="1217501895093" name="testMethods" index="1SL9yI" />
       </concept>
       <concept id="1225978065297" name="jetbrains.mps.lang.test.structure.SimpleNodeTest" flags="ng" index="1LZb2c" />
@@ -43,6 +43,7 @@
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
@@ -50,6 +51,7 @@
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
         <child id="1164879685961" name="throwsItem" index="Sfmx6" />
         <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
@@ -70,6 +72,10 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
       <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
@@ -84,6 +90,16 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
+      <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+        <reference id="1205756909548" name="member" index="2WH_rO" />
+      </concept>
+      <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
+      <concept id="1205769149993" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodCallOperation" flags="nn" index="2XshWL">
+        <child id="1205770614681" name="actualArgument" index="2XxRq1" />
+      </concept>
+    </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
       <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
         <reference id="7256306938026143658" name="target" index="2aWVGs" />
@@ -98,16 +114,18 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
+      <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
+      <concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
+        <child id="3648723375513868575" name="repositoryArg" index="Vysub" />
+      </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
-      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
-        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
-      </concept>
+      <concept id="3648723375513868532" name="jetbrains.mps.lang.smodel.structure.NodePointer_ResolveOperation" flags="ng" index="Vyspw" />
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
@@ -125,68 +143,94 @@
   <node concept="1lH9Xt" id="1N_0WA5DT3k">
     <property role="TrG5h" value="Typechecking" />
     <property role="3OwPAg" value="true" />
-    <node concept="1LZb2c" id="1N_0WA5DT8G" role="1SL9yI">
-      <property role="TrG5h" value="HelloWorld" />
-      <node concept="3cqZAl" id="1N_0WA5DT8H" role="3clF45" />
-      <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
-        <node concept="3cpWs8" id="4BHjwwGJQYe" role="3cqZAp">
-          <node concept="3cpWsn" id="4BHjwwGJQYf" role="3cpWs9">
+    <node concept="2XrIbr" id="35YJGAJTxCf" role="1qtyYc">
+      <property role="TrG5h" value="resolve" />
+      <node concept="37vLTG" id="35YJGAJTxCF" role="3clF46">
+        <property role="TrG5h" value="ref" />
+        <node concept="2sp9CU" id="35YJGAJTxCR" role="1tU5fm" />
+      </node>
+      <node concept="3Tqbb2" id="35YJGAJTxCp" role="3clF45">
+        <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+      </node>
+      <node concept="3clFbS" id="35YJGAJTxCh" role="3clF47">
+        <node concept="3cpWs8" id="35YJGAJT$34" role="3cqZAp">
+          <node concept="3cpWsn" id="35YJGAJT$35" role="3cpWs9">
             <property role="TrG5h" value="cls" />
-            <node concept="3Tqbb2" id="4BHjwwGJQYb" role="1tU5fm">
+            <node concept="3Tqbb2" id="35YJGAJT$2Z" role="1tU5fm">
               <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
             </node>
           </node>
         </node>
-        <node concept="1QHqEK" id="4BHjwwGJZh0" role="3cqZAp">
-          <node concept="1QHqEC" id="4BHjwwGJZh2" role="1QHqEI">
-            <node concept="3clFbS" id="4BHjwwGJZh4" role="1bW5cS">
-              <node concept="3clFbF" id="4BHjwwGPBsp" role="3cqZAp">
-                <node concept="37vLTI" id="4BHjwwGPBsr" role="3clFbG">
-                  <node concept="1PxgMI" id="4BHjwwGJT1y" role="37vLTx">
-                    <node concept="chp4Y" id="4BHjwwGJTcC" role="3oSUPX">
+        <node concept="1QHqEK" id="35YJGAJTxLm" role="3cqZAp">
+          <node concept="1QHqEC" id="35YJGAJTxLn" role="1QHqEI">
+            <node concept="3clFbS" id="35YJGAJTxLo" role="1bW5cS">
+              <node concept="3clFbF" id="35YJGAJT$eE" role="3cqZAp">
+                <node concept="37vLTI" id="35YJGAJT$eG" role="3clFbG">
+                  <node concept="1PxgMI" id="35YJGAJT$36" role="37vLTx">
+                    <node concept="chp4Y" id="35YJGAJT$37" role="3oSUPX">
                       <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
                     </node>
-                    <node concept="2OqwBi" id="4BHjwwGJRwn" role="1m5AlR">
-                      <node concept="2JrnkZ" id="3BqfYtgCQik" role="2Oq$k0">
-                        <node concept="2tJFMh" id="3BqfYtgCQij" role="2JrQYb">
-                          <node concept="ZC_QK" id="3BqfYtgCQii" role="2tJFKM">
-                            <ref role="2aWVGs" to="bs09:3Qp4N06bAlL" resolve="HelloWorld" />
-                          </node>
-                        </node>
+                    <node concept="2OqwBi" id="35YJGAJT$38" role="1m5AlR">
+                      <node concept="37vLTw" id="35YJGAJT$39" role="2Oq$k0">
+                        <ref role="3cqZAo" node="35YJGAJTxCF" resolve="ref" />
                       </node>
-                      <node concept="liA8E" id="4BHjwwGJRIX" role="2OqNvi">
-                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
-                        <node concept="2OqwBi" id="4BHjwwGJS8O" role="37wK5m">
-                          <node concept="1jxXqW" id="4BHjwwGJRMu" role="2Oq$k0" />
-                          <node concept="liA8E" id="4BHjwwGJSNJ" role="2OqNvi">
+                      <node concept="Vyspw" id="35YJGAJT$3a" role="2OqNvi">
+                        <node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
+                          <node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
+                          <node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
                             <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="37vLTw" id="4BHjwwGPBsv" role="37vLTJ">
-                    <ref role="3cqZAo" node="4BHjwwGJQYf" resolve="cls" />
+                  <node concept="37vLTw" id="35YJGAJT$eK" role="37vLTJ">
+                    <ref role="3cqZAo" node="35YJGAJT$35" resolve="cls" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="4BHjwwGJZO2" role="ukAjM">
-            <node concept="1jxXqW" id="4BHjwwGJZt5" role="2Oq$k0" />
-            <node concept="liA8E" id="4BHjwwGK0mv" role="2OqNvi">
+          <node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
+            <node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
+            <node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
               <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
         </node>
-        <node concept="2Hmddi" id="4BHjwwGPNOR" role="3cqZAp">
-          <node concept="2YIFZM" id="4BHjwwGPNRH" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-            <node concept="37vLTw" id="4BHjwwGPNRI" role="37wK5m">
-              <ref role="3cqZAo" node="4BHjwwGJQYf" resolve="cls" />
+        <node concept="3clFbF" id="35YJGAJTyJo" role="3cqZAp">
+          <node concept="37vLTw" id="35YJGAJT$3e" role="3clFbG">
+            <ref role="3cqZAo" node="35YJGAJT$35" resolve="cls" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="35YJGAJTxCl" role="1B3o_S" />
+    </node>
+    <node concept="1LZb2c" id="1N_0WA5DT8G" role="1SL9yI">
+      <property role="TrG5h" value="HelloWorld" />
+      <node concept="3cqZAl" id="1N_0WA5DT8H" role="3clF45" />
+      <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
+        <node concept="2Hmddi" id="27bTNFfbxkQ" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxkR" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxkS" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfc5Qu" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfc5Qx" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfc5Qz" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfc5Se" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfc5Sf" role="2tJFKM">
+                      <ref role="2aWVGs" to="bs09:3Qp4N06bAlL" resolve="HelloWorld" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1jxXqW" id="27bTNFfc4fk" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxkV" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="4BHjwwGPNRJ" role="37wK5m" />
           </node>
         </node>
       </node>
@@ -198,66 +242,29 @@
       <property role="TrG5h" value="TestInheritance" />
       <node concept="3cqZAl" id="7$Xw2YtL_l1" role="3clF45" />
       <node concept="3clFbS" id="7$Xw2YtL_l2" role="3clF47">
-        <node concept="3cpWs8" id="4BHjwwGK4Of" role="3cqZAp">
-          <node concept="3cpWsn" id="4BHjwwGK4Og" role="3cpWs9">
-            <property role="TrG5h" value="cls" />
-            <node concept="3Tqbb2" id="4BHjwwGK4Oh" role="1tU5fm">
-              <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
-            </node>
-          </node>
-        </node>
-        <node concept="1QHqEK" id="4BHjwwGK4Oc" role="3cqZAp">
-          <node concept="1QHqEC" id="4BHjwwGK4Od" role="1QHqEI">
-            <node concept="3clFbS" id="4BHjwwGK4Oe" role="1bW5cS">
-              <node concept="3clFbF" id="4BHjwwGPBWB" role="3cqZAp">
-                <node concept="37vLTI" id="4BHjwwGPBWD" role="3clFbG">
-                  <node concept="1PxgMI" id="4BHjwwGK4Oi" role="37vLTx">
-                    <node concept="chp4Y" id="4BHjwwGK4Oj" role="3oSUPX">
-                      <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+        <node concept="2Hmddi" id="27bTNFfbxlk" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxll" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxlm" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfc6bq" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfc6bt" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfc6bv" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfc6da" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfc6db" role="2tJFKM">
+                      <ref role="2aWVGs" to="bs09:4$OyT8IR$52" resolve="TestInheritance" />
                     </node>
-                    <node concept="2OqwBi" id="4BHjwwGK4Ok" role="1m5AlR">
-                      <node concept="2JrnkZ" id="3BqfYtgCQhW" role="2Oq$k0">
-                        <node concept="2tJFMh" id="3BqfYtgCQhV" role="2JrQYb">
-                          <node concept="ZC_QK" id="3BqfYtgCQhU" role="2tJFKM">
-                            <ref role="2aWVGs" to="bs09:4$OyT8IR$52" resolve="TestInheritance" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="4BHjwwGK4Om" role="2OqNvi">
-                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
-                        <node concept="2OqwBi" id="4BHjwwGK4On" role="37wK5m">
-                          <node concept="1jxXqW" id="4BHjwwGK4Oo" role="2Oq$k0" />
-                          <node concept="liA8E" id="4BHjwwGK4Op" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="37vLTw" id="4BHjwwGPBWH" role="37vLTJ">
-                    <ref role="3cqZAo" node="4BHjwwGK4Og" resolve="cls" />
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfc4oU" role="37wK5m" />
             </node>
-          </node>
-          <node concept="2OqwBi" id="4BHjwwGK4Ov" role="ukAjM">
-            <node concept="1jxXqW" id="4BHjwwGK4Ow" role="2Oq$k0" />
-            <node concept="liA8E" id="4BHjwwGK4Ox" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+            <node concept="liA8E" id="27bTNFfbxlp" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
         </node>
-        <node concept="2Hmddi" id="4BHjwwGPNX0" role="3cqZAp">
-          <node concept="2YIFZM" id="4BHjwwGPNX1" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-            <node concept="37vLTw" id="4BHjwwGPOa3" role="37wK5m">
-              <ref role="3cqZAo" node="4BHjwwGK4Og" resolve="cls" />
-            </node>
-            <node concept="1jxXqW" id="4BHjwwGPNX3" role="37wK5m" />
-          </node>
-        </node>
       </node>
       <node concept="3uibUv" id="4BHjwwGPChM" role="Sfmx6">
         <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps
index 72199351..08465533 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps
@@ -210,22 +210,27 @@
       <property role="TrG5h" value="SimpleGenerics" />
       <node concept="3cqZAl" id="1N_0WA5DT8H" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
-        <node concept="2Hmddi" id="4BHjwwGPNaW" role="3cqZAp">
-          <node concept="2YIFZM" id="4BHjwwGPNe3" role="2Hmdds">
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <node concept="2OqwBi" id="35YJGAJT$tF" role="37wK5m">
-              <node concept="2WthIp" id="35YJGAJT$tI" role="2Oq$k0" />
-              <node concept="2XshWL" id="35YJGAJT$tK" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="35YJGAJT$tQ" role="2XxRq1">
-                  <node concept="ZC_QK" id="2QSgdlj8bda" role="2tJFKM">
-                    <ref role="2aWVGs" to="waaz:3Qp4N06bAlL" resolve="SimpleGenerics" />
+        <node concept="2Hmddi" id="27bTNFfbxhc" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxhd" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxhe" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfbX4L" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfbX4M" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfbX4N" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfbX4O" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfbX4P" role="2tJFKM">
+                      <ref role="2aWVGs" to="waaz:3Qp4N06bAlL" resolve="SimpleGenerics" />
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfbX6K" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxhh" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="4BHjwwGPNe5" role="37wK5m" />
           </node>
         </node>
       </node>
@@ -237,22 +242,27 @@
       <property role="TrG5h" value="SimpleGenerics2" />
       <node concept="3cqZAl" id="1N_0WA5JFrO" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5JFrP" role="3clF47">
-        <node concept="2Hmddi" id="2QSgdlj8bog" role="3cqZAp">
-          <node concept="2YIFZM" id="2QSgdlj8boh" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7smgEqg8sZP" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2QSgdlj8boi" role="37wK5m">
-              <node concept="2WthIp" id="2QSgdlj8boj" role="2Oq$k0" />
-              <node concept="2XshWL" id="2QSgdlj8bok" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2QSgdlj8bol" role="2XxRq1">
-                  <node concept="ZC_QK" id="2QSgdlj8b$d" role="2tJFKM">
-                    <ref role="2aWVGs" to="waaz:623frvF_qs8" resolve="SimpleGenerics2" />
+        <node concept="2Hmddi" id="27bTNFfbxhI" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxhJ" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxhK" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfbX8B" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfbX8C" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfbX8D" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfbX8E" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfbX8F" role="2tJFKM">
+                      <ref role="2aWVGs" to="waaz:623frvF_qs8" resolve="SimpleGenerics2" />
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfbXaA" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxhN" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="2QSgdlj8bon" role="37wK5m" />
           </node>
         </node>
       </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps
index c447ae03..a42f829b 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps
@@ -210,22 +210,27 @@
       <property role="TrG5h" value="ComplexTypeErasure" />
       <node concept="3cqZAl" id="1N_0WA5DT8H" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
-        <node concept="2Hmddi" id="4BHjwwGPMah" role="3cqZAp">
-          <node concept="2YIFZM" id="4BHjwwGPMdn" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2QSgdliBFSp" role="37wK5m">
-              <node concept="2WthIp" id="2QSgdliBFNX" role="2Oq$k0" />
-              <node concept="2XshWL" id="2QSgdliBFZs" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2QSgdliBFZv" role="2XxRq1">
-                  <node concept="ZC_QK" id="2QSgdlj87fZ" role="2tJFKM">
-                    <ref role="2aWVGs" to="9oqm:61vfVfpb5w1" resolve="ComplexTypeErasure" />
+        <node concept="2Hmddi" id="27bTNFfbxig" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxih" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxii" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfc4Cj" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfc4Ck" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfc4Cl" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfc4Cm" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfc4Cn" role="2tJFKM">
+                      <ref role="2aWVGs" to="9oqm:61vfVfpb5w1" resolve="ComplexTypeErasure" />
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfc4Ei" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxil" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="4BHjwwGPMdp" role="37wK5m" />
           </node>
         </node>
       </node>
@@ -237,22 +242,27 @@
       <property role="TrG5h" value="GenericSubst" />
       <node concept="3cqZAl" id="1N_0WA5JGiw" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5JGix" role="3clF47">
-        <node concept="2Hmddi" id="2QSgdlj87ga" role="3cqZAp">
-          <node concept="2YIFZM" id="2QSgdlj87gb" role="2Hmdds">
-            <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-            <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-            <node concept="2OqwBi" id="2QSgdlj87gc" role="37wK5m">
-              <node concept="2WthIp" id="2QSgdlj87gd" role="2Oq$k0" />
-              <node concept="2XshWL" id="2QSgdlj87ge" role="2OqNvi">
-                <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                <node concept="2tJFMh" id="2QSgdlj87gf" role="2XxRq1">
-                  <node concept="ZC_QK" id="2QSgdlj87h0" role="2tJFKM">
-                    <ref role="2aWVGs" to="9oqm:61vfVfp6EBu" resolve="GenericSubst" />
+        <node concept="2Hmddi" id="27bTNFfbxiM" role="3cqZAp">
+          <node concept="2OqwBi" id="27bTNFfbxiN" role="2Hmdds">
+            <node concept="2YIFZM" id="27bTNFfbxiO" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
+              <node concept="2OqwBi" id="27bTNFfc4G9" role="37wK5m">
+                <node concept="2WthIp" id="27bTNFfc4Ga" role="2Oq$k0" />
+                <node concept="2XshWL" id="27bTNFfc4Gb" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="27bTNFfc4Gc" role="2XxRq1">
+                    <node concept="ZC_QK" id="27bTNFfc4Gd" role="2tJFKM">
+                      <ref role="2aWVGs" to="9oqm:61vfVfp6EBu" resolve="GenericSubst" />
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="1jxXqW" id="27bTNFfc4I8" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="27bTNFfbxiR" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="1jxXqW" id="2QSgdlj87gh" role="37wK5m" />
           </node>
         </node>
       </node>