From 0282f28a5cae88401f90d352fa124def461b7381 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Thu, 25 Oct 2018 12:30:52 +0200
Subject: [PATCH] Bring reporting in line with MPS core reporting facilities.
 Cleanup the API.

---
 .../generator/template/main@generator.mps     |  240 ++-
 .../models/plugin.mps                         |  360 ++--
 .../models/service.mps                        |   79 +-
 .../models/plugin.mps                         |   22 +-
 .../models/service.mps                        |  276 ++-
 .../jetbrains.mps.lang.coderules.program.mps  |   14 +-
 .../jetbrains.mps.lang.coderules.template.mps |    7 -
 .../jetbrains.mps.reporting.runtime.msd       |    2 +
 ...tbrains.mps.lang.typesystem2.reporting.mps |   14 +-
 .../jetbrains.mps.typechecking.build.mps      |    6 +
 .../jetbrains.mps.typechecking@tests.mps      |   43 +-
 .../models/ui.plugin.mps                      |   22 +-
 .../jetbrains.mps.typechecking.msd            |    1 +
 .../models/jetbrains.mps.typechecking.mps     | 1641 +++++++++++++----
 .../models/plugin.mps                         |   76 +-
 .../models/service.mps                        | 1134 +++++-------
 16 files changed, 2407 insertions(+), 1530 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 8aebfe4b..9d937c17 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -57,6 +57,7 @@
     <import index="z8tp" ref="r:5bfbd177-208e-4d27-b74c-2ebd2a92eb80(jetbrains.mps.lang.smodel.types.structure)" />
     <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
   </imports>
   <registry>
@@ -564,6 +565,9 @@
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
+      <concept id="1138676077309" name="jetbrains.mps.lang.smodel.structure.EnumMemberReference" flags="nn" index="uoxfO">
+        <reference id="1138676095763" name="enumMember" index="uo_Cq" />
+      </concept>
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
@@ -607,6 +611,9 @@
         <child id="6039268229364358388" name="body" index="1pnPq1" />
         <child id="6039268229364358387" name="concept" index="1pnPq6" />
       </concept>
+      <concept id="1146171026731" name="jetbrains.mps.lang.smodel.structure.Property_HasValue_Enum" flags="nn" index="3t7uKx">
+        <child id="1146171026732" name="value" index="3t7uKA" />
+      </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" />
@@ -14018,6 +14025,7 @@
   </node>
   <node concept="bUwia" id="oI9YrdoXd">
     <property role="TrG5h" value="reporting" />
+    <property role="3GE5qa" value="reporting" />
     <node concept="3aamgX" id="oI9YrDh3R" role="3acgRq">
       <ref role="30HIoZ" to="z8tp:6nJA6bpveD5" resolve="SNodeTypeOperation" />
       <node concept="b5Tf3" id="oI9YrDhNx" role="1lVwrX" />
@@ -14053,6 +14061,10 @@
           <node concept="1Koe21" id="oI9Ys2xiM" role="150oIE">
             <node concept="3clFb_" id="oI9Ys2xiN" role="1Koe22">
               <property role="TrG5h" value="context" />
+              <node concept="37vLTG" id="1FOQehwQxOt" role="3clF46">
+                <property role="TrG5h" value="operand" />
+                <node concept="3Tqbb2" id="1FOQehwQy99" role="1tU5fm" />
+              </node>
               <node concept="3Tm6S6" id="oI9Ys2xiO" role="1B3o_S" />
               <node concept="3cqZAl" id="oI9Ys2xiP" role="3clF45" />
               <node concept="3clFbS" id="oI9Ys2xiQ" role="3clF47">
@@ -14073,15 +14085,18 @@
                     </node>
                     <node concept="liA8E" id="oI9Ys2xiX" role="2OqNvi">
                       <ref role="37wK5l" to="9x2e:oI9Ys2ypk" resolve="report" />
-                      <node concept="10Nm6u" id="oI9Ys2xiY" role="37wK5m">
-                        <node concept="29HgVG" id="oI9Ys2xiZ" role="lGtFl">
-                          <node concept="3NFfHV" id="oI9Ys2xj0" role="3NFExx">
-                            <node concept="3clFbS" id="oI9Ys2xj1" role="2VODD2">
-                              <node concept="3clFbF" id="oI9Ys2xj2" role="3cqZAp">
-                                <node concept="2OqwBi" id="oI9Ys2xj6" role="3clFbG">
-                                  <node concept="30H73N" id="oI9Ys2xj7" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="oI9Ys2xj8" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                      <node concept="Rm8GO" id="1FOQehwoRqu" role="37wK5m">
+                        <ref role="Rm8GQ" to="2gg1:~MessageStatus.OK" resolve="OK" />
+                        <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                        <node concept="1sPUBX" id="1FOQehwwtLS" role="lGtFl">
+                          <ref role="v9R2y" node="1FOQehwoVSb" resolve="ReportKind_MessageStatus" />
+                          <node concept="3NFfHV" id="1FOQehwwum9" role="1sPUBK">
+                            <node concept="3clFbS" id="1FOQehwwuma" role="2VODD2">
+                              <node concept="3clFbF" id="1FOQehwwuCr" role="3cqZAp">
+                                <node concept="2OqwBi" id="1FOQehwwuO4" role="3clFbG">
+                                  <node concept="30H73N" id="1FOQehwwuCq" role="2Oq$k0" />
+                                  <node concept="3TrEf2" id="1FOQehwwvv7" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
                                   </node>
                                 </node>
                               </node>
@@ -14089,30 +14104,24 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Xl_RD" id="oI9Ys2Cw5" role="37wK5m">
-                        <property role="Xl_RC" value="" />
-                        <node concept="17Uvod" id="oI9Ys2CHr" role="lGtFl">
-                          <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                          <property role="2qtEX9" value="value" />
-                          <node concept="3zFVjK" id="oI9Ys2CHs" role="3zH0cK">
-                            <node concept="3clFbS" id="oI9Ys2CHt" role="2VODD2">
-                              <node concept="3clFbF" id="oI9Ys2CRv" role="3cqZAp">
-                                <node concept="2OqwBi" id="oI9Ys2Biv" role="3clFbG">
-                                  <node concept="1PxgMI" id="oI9Ys2AX7" role="2Oq$k0">
-                                    <property role="1BlNFB" value="true" />
-                                    <node concept="chp4Y" id="oI9Ys2B3k" role="3oSUPX">
-                                      <ref role="cht4Q" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
-                                    </node>
-                                    <node concept="2OqwBi" id="oI9Ys2_2a" role="1m5AlR">
-                                      <node concept="30H73N" id="oI9Ys2$QF" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="oI9Ys2An6" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                      <node concept="2OqwBi" id="1FOQehwQzuX" role="37wK5m">
+                        <node concept="liA8E" id="1FOQehwQzWd" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                        </node>
+                        <node concept="2JrnkZ" id="1FOQehwQzv2" role="2Oq$k0">
+                          <node concept="37vLTw" id="1FOQehwQy9N" role="2JrQYb">
+                            <ref role="3cqZAo" node="1FOQehwQxOt" resolve="operand" />
+                            <node concept="29HgVG" id="1FOQehwQ$FF" role="lGtFl">
+                              <node concept="3NFfHV" id="1FOQehwQ_1w" role="3NFExx">
+                                <node concept="3clFbS" id="1FOQehwQ_1x" role="2VODD2">
+                                  <node concept="3clFbF" id="1FOQehwQ_nG" role="3cqZAp">
+                                    <node concept="2OqwBi" id="1FOQehwQ_nI" role="3clFbG">
+                                      <node concept="30H73N" id="1FOQehwQ_nJ" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="1FOQehwQ_nK" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="3TrcHB" id="oI9Ys2B$c" role="2OqNvi">
-                                    <ref role="3TsBF5" to="wq2x:oI9Ys1lGD" resolve="kind" />
-                                  </node>
                                 </node>
                               </node>
                             </node>
@@ -14162,6 +14171,10 @@
                 <ref role="3uigEE" to="6pyv:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
               </node>
             </node>
+            <node concept="37vLTG" id="1FOQehwQCqe" role="3clF46">
+              <property role="TrG5h" value="operand" />
+              <node concept="3Tqbb2" id="1FOQehwQCIr" role="1tU5fm" />
+            </node>
             <node concept="3Tm6S6" id="oI9Ys2xjr" role="1B3o_S" />
             <node concept="3cqZAl" id="oI9Ys2xjs" role="3clF45" />
             <node concept="3clFbS" id="oI9Ys2xjt" role="3clF47">
@@ -14203,15 +14216,18 @@
                   <node concept="raruj" id="oI9Ys2xk7" role="lGtFl" />
                   <node concept="liA8E" id="oI9Ys2EaM" role="2OqNvi">
                     <ref role="37wK5l" to="9x2e:oI9Ys2ypk" resolve="report" />
-                    <node concept="10Nm6u" id="oI9Ys2EaN" role="37wK5m">
-                      <node concept="29HgVG" id="oI9Ys2EaO" role="lGtFl">
-                        <node concept="3NFfHV" id="oI9Ys2EaP" role="3NFExx">
-                          <node concept="3clFbS" id="oI9Ys2EaQ" role="2VODD2">
-                            <node concept="3clFbF" id="oI9Ys2EaR" role="3cqZAp">
-                              <node concept="2OqwBi" id="oI9Ys2EaS" role="3clFbG">
-                                <node concept="30H73N" id="oI9Ys2EaT" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="oI9Ys2EaU" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                    <node concept="Rm8GO" id="1FOQehwwvIu" role="37wK5m">
+                      <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                      <ref role="Rm8GQ" to="2gg1:~MessageStatus.OK" resolve="OK" />
+                      <node concept="1sPUBX" id="1FOQehwwvIv" role="lGtFl">
+                        <ref role="v9R2y" node="1FOQehwoVSb" resolve="ReportKind_MessageStatus" />
+                        <node concept="3NFfHV" id="1FOQehwwvIw" role="1sPUBK">
+                          <node concept="3clFbS" id="1FOQehwwvIx" role="2VODD2">
+                            <node concept="3clFbF" id="1FOQehwwvIy" role="3cqZAp">
+                              <node concept="2OqwBi" id="1FOQehwwvIz" role="3clFbG">
+                                <node concept="30H73N" id="1FOQehwwvI$" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="1FOQehwwvI_" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
                                 </node>
                               </node>
                             </node>
@@ -14219,30 +14235,24 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="Xl_RD" id="oI9Ys2EaV" role="37wK5m">
-                      <property role="Xl_RC" value="" />
-                      <node concept="17Uvod" id="oI9Ys2EaW" role="lGtFl">
-                        <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                        <property role="2qtEX9" value="value" />
-                        <node concept="3zFVjK" id="oI9Ys2EaX" role="3zH0cK">
-                          <node concept="3clFbS" id="oI9Ys2EaY" role="2VODD2">
-                            <node concept="3clFbF" id="oI9Ys2EaZ" role="3cqZAp">
-                              <node concept="2OqwBi" id="oI9Ys2Eb0" role="3clFbG">
-                                <node concept="1PxgMI" id="oI9Ys2Eb1" role="2Oq$k0">
-                                  <property role="1BlNFB" value="true" />
-                                  <node concept="chp4Y" id="oI9Ys2Eb2" role="3oSUPX">
-                                    <ref role="cht4Q" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
-                                  </node>
-                                  <node concept="2OqwBi" id="oI9Ys2Eb3" role="1m5AlR">
-                                    <node concept="30H73N" id="oI9Ys2Eb4" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="oI9Ys2Eb5" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                    <node concept="2OqwBi" id="1FOQehwQB0Z" role="37wK5m">
+                      <node concept="liA8E" id="1FOQehwQB10" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                      </node>
+                      <node concept="2JrnkZ" id="1FOQehwQB11" role="2Oq$k0">
+                        <node concept="37vLTw" id="1FOQehwQB12" role="2JrQYb">
+                          <ref role="3cqZAo" node="1FOQehwQCqe" resolve="operand" />
+                          <node concept="29HgVG" id="1FOQehwQB13" role="lGtFl">
+                            <node concept="3NFfHV" id="1FOQehwQB14" role="3NFExx">
+                              <node concept="3clFbS" id="1FOQehwQB15" role="2VODD2">
+                                <node concept="3clFbF" id="1FOQehwQB16" role="3cqZAp">
+                                  <node concept="2OqwBi" id="1FOQehwQB17" role="3clFbG">
+                                    <node concept="30H73N" id="1FOQehwQB18" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="1FOQehwQB19" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="3TrcHB" id="oI9Ys2Eb6" role="2OqNvi">
-                                  <ref role="3TsBF5" to="wq2x:oI9Ys1lGD" resolve="kind" />
-                                </node>
                               </node>
                             </node>
                           </node>
@@ -14446,13 +14456,6 @@
           <ref role="3uigEE" to="i348:7P_FdVQ_k3b" resolve="QueryTemplate.QueryObservable" />
         </node>
       </node>
-      <node concept="37vLTG" id="7P_FdVPsJk7" role="3clF46">
-        <property role="TrG5h" value="parameters" />
-        <node concept="3uibUv" id="3IIf9OAgMw$" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3qTvmN" id="3IIf9OAm5Tq" role="11_B2D" />
-        </node>
-      </node>
       <node concept="3uibUv" id="7P_FdVPsJka" role="3clF45">
         <ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
       </node>
@@ -15399,5 +15402,108 @@
       </node>
     </node>
   </node>
+  <node concept="jVnub" id="1FOQehwoVSb">
+    <property role="3GE5qa" value="reporting" />
+    <property role="TrG5h" value="ReportKind_MessageStatus" />
+    <node concept="3aamgX" id="1FOQehwoVTh" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
+      <node concept="14YyZ8" id="1FOQehwoWyC" role="1lVwrX">
+        <node concept="14ZrTv" id="1FOQehwoWyI" role="14ZwWg">
+          <node concept="30G5F_" id="1FOQehwoWyJ" role="150hEN">
+            <node concept="3clFbS" id="1FOQehwoWyK" role="2VODD2">
+              <node concept="3clFbF" id="1FOQehwoYWo" role="3cqZAp">
+                <node concept="2OqwBi" id="1FOQehwp0sg" role="3clFbG">
+                  <node concept="2OqwBi" id="1FOQehwoZ9C" role="2Oq$k0">
+                    <node concept="30H73N" id="1FOQehwoYWn" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="1FOQehwoZIb" role="2OqNvi">
+                      <ref role="3TsBF5" to="wq2x:oI9Ys1lGD" resolve="kind" />
+                    </node>
+                  </node>
+                  <node concept="3t7uKx" id="1FOQehwp18E" role="2OqNvi">
+                    <node concept="uoxfO" id="1FOQehwp18G" role="3t7uKA">
+                      <ref role="uo_Cq" to="wq2x:oI9Ys1lFi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="1FOQehwp1AY" role="150oIE">
+            <node concept="Rm8GO" id="1FOQehwp1L3" role="gfFT$">
+              <ref role="Rm8GQ" to="2gg1:~MessageStatus.OK" resolve="OK" />
+              <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+            </node>
+          </node>
+        </node>
+        <node concept="14ZrTv" id="1FOQehwp1Lh" role="14ZwWg">
+          <node concept="30G5F_" id="1FOQehwp1Li" role="150hEN">
+            <node concept="3clFbS" id="1FOQehwp1Lj" role="2VODD2">
+              <node concept="3clFbF" id="1FOQehwp1Lk" role="3cqZAp">
+                <node concept="2OqwBi" id="1FOQehwp1Ll" role="3clFbG">
+                  <node concept="2OqwBi" id="1FOQehwp1Lm" role="2Oq$k0">
+                    <node concept="30H73N" id="1FOQehwp1Ln" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="1FOQehwp1Lo" role="2OqNvi">
+                      <ref role="3TsBF5" to="wq2x:oI9Ys1lGD" resolve="kind" />
+                    </node>
+                  </node>
+                  <node concept="3t7uKx" id="1FOQehwp1Lp" role="2OqNvi">
+                    <node concept="uoxfO" id="1FOQehwp1Lq" role="3t7uKA">
+                      <ref role="uo_Cq" to="wq2x:oI9Ys1lFj" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="1FOQehwp1Lr" role="150oIE">
+            <node concept="Rm8GO" id="1FOQehwp2do" role="gfFT$">
+              <ref role="Rm8GQ" to="2gg1:~MessageStatus.WARNING" resolve="WARNING" />
+              <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+            </node>
+          </node>
+        </node>
+        <node concept="14ZrTv" id="1FOQehwp2dF" role="14ZwWg">
+          <node concept="30G5F_" id="1FOQehwp2dG" role="150hEN">
+            <node concept="3clFbS" id="1FOQehwp2dH" role="2VODD2">
+              <node concept="3clFbF" id="1FOQehwp2dI" role="3cqZAp">
+                <node concept="2OqwBi" id="1FOQehwp2dJ" role="3clFbG">
+                  <node concept="2OqwBi" id="1FOQehwp2dK" role="2Oq$k0">
+                    <node concept="30H73N" id="1FOQehwp2dL" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="1FOQehwp2dM" role="2OqNvi">
+                      <ref role="3TsBF5" to="wq2x:oI9Ys1lGD" resolve="kind" />
+                    </node>
+                  </node>
+                  <node concept="3t7uKx" id="1FOQehwp2dN" role="2OqNvi">
+                    <node concept="uoxfO" id="1FOQehwp2dO" role="3t7uKA">
+                      <ref role="uo_Cq" to="wq2x:oI9Ys1lFm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="1FOQehwp2dP" role="150oIE">
+            <node concept="Rm8GO" id="1FOQehwp2Ey" role="gfFT$">
+              <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
+              <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+            </node>
+          </node>
+        </node>
+        <node concept="j$LIH" id="1FOQehwp3v1" role="14YRTM">
+          <node concept="1lLz0L" id="1FOQehwp3DE" role="1lHHLF">
+            <property role="1lMjX7" value="error" />
+            <property role="1lLB17" value="unsupported report kind" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="j$LIH" id="1FOQehwp307" role="jxRDz">
+      <node concept="1lLz0L" id="1FOQehwp3aL" role="1lHHLF">
+        <property role="1lMjX7" value="error" />
+        <property role="1lLB17" value="invalid switch usage" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index 6f8cdd18..5162dd15 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -818,118 +818,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="3mz2_dYD2C2" role="jymVt" />
-    <node concept="2YIFZL" id="5lxnBcTU7J1" role="jymVt">
-      <property role="TrG5h" value="scheduleMarkTypesAndErrors" />
-      <node concept="37vLTG" id="5lxnBcTUdcU" role="3clF46">
-        <property role="TrG5h" value="mpsProject" />
-        <node concept="3uibUv" id="5lxnBcTUdcV" role="1tU5fm">
-          <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5lxnBcTUdcW" role="3clF46">
-        <property role="TrG5h" value="editorComponent" />
-        <node concept="3uibUv" id="5lxnBcTUdcX" role="1tU5fm">
-          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5lxnBcTUdcY" role="3clF46">
-        <property role="TrG5h" value="root" />
-        <node concept="3Tqbb2" id="5lxnBcTUdcZ" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="5lxnBcTUdd0" role="3clF46">
-        <property role="TrG5h" value="typeNodes" />
-        <node concept="3uibUv" id="5lxnBcTUdd1" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-          <node concept="3uibUv" id="5lxnBcTUdd2" role="11_B2D">
-            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-          </node>
-          <node concept="3Tqbb2" id="5lxnBcTUdd3" role="11_B2D" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5lxnBcTUdd4" role="3clF46">
-        <property role="TrG5h" value="errors" />
-        <node concept="3uibUv" id="5lxnBcTUdd5" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-          <node concept="3uibUv" id="5lxnBcTUdd6" role="11_B2D">
-            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-          </node>
-          <node concept="17QB3L" id="5lxnBcTUdd7" role="11_B2D" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5lxnBcTUdd8" role="3clF46">
-        <property role="TrG5h" value="traceTabs" />
-        <node concept="_YKpA" id="5lxnBcTUdd9" role="1tU5fm">
-          <node concept="3uibUv" id="5lxnBcTUdda" role="_ZDj9">
-            <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="5lxnBcTZ$Eq" role="3clF46">
-        <property role="TrG5h" value="subscribeScheduler" />
-        <node concept="3uibUv" id="5lxnBcTZ$Zz" role="1tU5fm">
-          <ref role="3uigEE" to="unkn:~Scheduler" resolve="Scheduler" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="5lxnBcTUcR8" role="3clF45">
-        <ref role="3uigEE" to="unkn:~Completable" resolve="Completable" />
-      </node>
-      <node concept="3Tm1VV" id="5lxnBcTU7J4" role="1B3o_S" />
-      <node concept="3clFbS" id="5lxnBcTU7J5" role="3clF47">
-        <node concept="3clFbF" id="5lxnBcTZ$b9" role="3cqZAp">
-          <node concept="2OqwBi" id="5lxnBcTZ$ba" role="3clFbG">
-            <node concept="2YIFZM" id="5lxnBcTZ$bb" role="2Oq$k0">
-              <ref role="37wK5l" node="3mz2_dYD3JK" resolve="get" />
-              <ref role="1Pybhc" node="41ox5VnpFrR" resolve="HighlightingPlugin" />
-              <node concept="37vLTw" id="5lxnBcTZ$bc" role="37wK5m">
-                <ref role="3cqZAo" node="5lxnBcTUdcU" resolve="mpsProject" />
-              </node>
-            </node>
-            <node concept="liA8E" id="5lxnBcTZ$bd" role="2OqNvi">
-              <ref role="37wK5l" node="41ox5VnqGYM" resolve="doSchedule" />
-              <node concept="2OqwBi" id="78H58oeVNNQ" role="37wK5m">
-                <node concept="2OqwBi" id="78H58oeVMVa" role="2Oq$k0">
-                  <node concept="2OqwBi" id="78H58oeVMny" role="2Oq$k0">
-                    <node concept="2ShNRf" id="78H58oeV$X9" role="2Oq$k0">
-                      <node concept="1pGfFk" id="78H58oeVM8w" role="2ShVmc">
-                        <ref role="37wK5l" node="78H58oeTywK" resolve="HighlightingTask" />
-                        <node concept="37vLTw" id="5lxnBcTZ$bf" role="37wK5m">
-                          <ref role="3cqZAo" node="5lxnBcTUdcY" resolve="root" />
-                        </node>
-                        <node concept="37vLTw" id="5lxnBcTZ$be" role="37wK5m">
-                          <ref role="3cqZAo" node="5lxnBcTUdcW" resolve="editorComponent" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="78H58oeVMGT" role="2OqNvi">
-                      <ref role="37wK5l" node="78H58oeTnR1" resolve="withMessages" />
-                      <node concept="37vLTw" id="5lxnBcTZ$bg" role="37wK5m">
-                        <ref role="3cqZAo" node="5lxnBcTUdd0" resolve="typeNodes" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="78H58oeVNme" role="2OqNvi">
-                    <ref role="37wK5l" node="78H58oeToTl" resolve="withErrors" />
-                    <node concept="37vLTw" id="5lxnBcTZ$bh" role="37wK5m">
-                      <ref role="3cqZAo" node="5lxnBcTUdd4" resolve="errors" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="78H58oeVOyO" role="2OqNvi">
-                  <ref role="37wK5l" node="78H58oeTpjT" resolve="withTracetabs" />
-                  <node concept="37vLTw" id="5lxnBcTZ$bi" role="37wK5m">
-                    <ref role="3cqZAo" node="5lxnBcTUdd8" resolve="traceTabs" />
-                  </node>
-                </node>
-              </node>
-              <node concept="37vLTw" id="5lxnBcTZ_qs" role="37wK5m">
-                <ref role="3cqZAo" node="5lxnBcTZ$Eq" resolve="subscribeScheduler" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5lxnBcTTFV3" role="jymVt" />
     <node concept="2YIFZL" id="78H58of26Si" role="jymVt">
       <property role="TrG5h" value="scheduleHighlighting" />
       <node concept="37vLTG" id="78H58of26Sj" role="3clF46">
@@ -1447,85 +1335,143 @@
                                   <property role="TrG5h" value="e" />
                                 </node>
                               </node>
-                              <node concept="2Gpval" id="78H58oeV3lB" role="3cqZAp">
-                                <node concept="3clFbS" id="5lxnBcTZ0TO" role="2LFqv$">
-                                  <node concept="3cpWs8" id="5lxnBcTZ0TP" role="3cqZAp">
-                                    <node concept="3cpWsn" id="5lxnBcTZ0TQ" role="3cpWs9">
-                                      <property role="TrG5h" value="node" />
-                                      <node concept="3uibUv" id="5lxnBcTZ0TR" role="1tU5fm">
-                                        <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                                      </node>
-                                      <node concept="2OqwBi" id="5lxnBcTZ0TS" role="33vP2m">
-                                        <node concept="2OqwBi" id="78H58oeVi72" role="2Oq$k0">
-                                          <node concept="2GrUjf" id="78H58oeV3o9" role="2Oq$k0">
-                                            <ref role="2Gs0qQ" node="78H58oeV3o7" resolve="e" />
+                              <node concept="3clFbH" id="1FOQehx16pS" role="3cqZAp" />
+                              <node concept="1DcWWT" id="1FOQehx1cWH" role="3cqZAp">
+                                <node concept="3clFbS" id="1FOQehx1cWK" role="2LFqv$">
+                                  <node concept="3clFbJ" id="1FOQehx1ubh" role="3cqZAp">
+                                    <node concept="3clFbS" id="1FOQehx1ubj" role="3clFbx">
+                                      <node concept="3cpWs8" id="1FOQehx1Lkl" role="3cqZAp">
+                                        <node concept="3cpWsn" id="1FOQehx1Lkm" role="3cpWs9">
+                                          <property role="TrG5h" value="nri" />
+                                          <node concept="3uibUv" id="1FOQehx1Lkn" role="1tU5fm">
+                                            <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
                                           </node>
-                                          <node concept="3AY5_j" id="78H58oeVjWC" role="2OqNvi" />
-                                        </node>
-                                        <node concept="liA8E" id="5lxnBcTZ0TW" 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="5lxnBcTZ0TX" role="37wK5m">
-                                            <node concept="2JrnkZ" id="5lxnBcTZ0TY" role="2Oq$k0">
-                                              <node concept="37vLTw" id="5lxnBcTZ0TZ" role="2JrQYb">
-                                                <ref role="3cqZAo" node="5lxnBcTZ0SY" resolve="mdl" />
+                                          <node concept="1eOMI4" id="1FOQehx1TRz" role="33vP2m">
+                                            <node concept="10QFUN" id="1FOQehx1TRw" role="1eOMHV">
+                                              <node concept="3uibUv" id="1FOQehx1TR_" role="10QFUM">
+                                                <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+                                              </node>
+                                              <node concept="37vLTw" id="1FOQehx1TRA" role="10QFUP">
+                                                <ref role="3cqZAo" node="1FOQehx1cWL" resolve="it" />
                                               </node>
                                             </node>
-                                            <node concept="liA8E" id="5lxnBcTZ0U0" role="2OqNvi">
-                                              <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="3cpWs8" id="5lxnBcTZ0TP" role="3cqZAp">
+                                        <node concept="3cpWsn" id="5lxnBcTZ0TQ" role="3cpWs9">
+                                          <property role="TrG5h" value="node" />
+                                          <node concept="3uibUv" id="5lxnBcTZ0TR" role="1tU5fm">
+                                            <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                                          </node>
+                                          <node concept="2OqwBi" id="5lxnBcTZ0TS" role="33vP2m">
+                                            <node concept="2OqwBi" id="1FOQehx1qi8" role="2Oq$k0">
+                                              <node concept="37vLTw" id="1FOQehx22o1" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="1FOQehx1Lkm" resolve="nri" />
+                                              </node>
+                                              <node concept="liA8E" id="1FOQehx24jI" role="2OqNvi">
+                                                <ref role="37wK5l" to="d6hs:~NodeFlavouredItem.getNode():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getNode" />
+                                              </node>
+                                            </node>
+                                            <node concept="liA8E" id="5lxnBcTZ0TW" 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="5lxnBcTZ0TX" role="37wK5m">
+                                                <node concept="2JrnkZ" id="5lxnBcTZ0TY" role="2Oq$k0">
+                                                  <node concept="37vLTw" id="5lxnBcTZ0TZ" role="2JrQYb">
+                                                    <ref role="3cqZAo" node="5lxnBcTZ0SY" resolve="mdl" />
+                                                  </node>
+                                                </node>
+                                                <node concept="liA8E" id="5lxnBcTZ0U0" role="2OqNvi">
+                                                  <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                                </node>
+                                              </node>
                                             </node>
                                           </node>
                                         </node>
                                       </node>
+                                      <node concept="3clFbJ" id="5lxnBcTZ0U1" role="3cqZAp">
+                                        <node concept="3y3z36" id="5lxnBcTZ0U2" role="3clFbw">
+                                          <node concept="37vLTw" id="5lxnBcTZ0U3" role="3uHU7B">
+                                            <ref role="3cqZAo" node="5lxnBcTZ0TQ" resolve="node" />
+                                          </node>
+                                          <node concept="10Nm6u" id="5lxnBcTZ0U4" role="3uHU7w" />
+                                        </node>
+                                        <node concept="3clFbS" id="5lxnBcTZ0U5" role="3clFbx">
+                                          <node concept="3clFbJ" id="1FOQehx2gvv" role="3cqZAp">
+                                            <node concept="3clFbS" id="1FOQehx2gvx" role="3clFbx">
+                                              <node concept="3clFbF" id="5lxnBcTZ0U6" role="3cqZAp">
+                                                <node concept="2OqwBi" id="5lxnBcTZ0U7" role="3clFbG">
+                                                  <node concept="37vLTw" id="5lxnBcTZ0U8" role="2Oq$k0">
+                                                    <ref role="3cqZAo" node="5lxnBcTZ0T4" resolve="messageList" />
+                                                  </node>
+                                                  <node concept="TSZUe" id="5lxnBcTZ0U9" role="2OqNvi">
+                                                    <node concept="2OqwBi" id="5lxnBcTZ0Ua" role="25WWJ7">
+                                                      <node concept="37vLTw" id="5lxnBcTZ0Ub" role="2Oq$k0">
+                                                        <ref role="3cqZAo" node="52a_GfIDucr" resolve="messageDisplay" />
+                                                      </node>
+                                                      <node concept="liA8E" id="5lxnBcTZ0Uc" role="2OqNvi">
+                                                        <ref role="37wK5l" node="4vBwiiVsgIX" resolve="errorMessage" />
+                                                        <node concept="37vLTw" id="5lxnBcTZ0Ud" role="37wK5m">
+                                                          <ref role="3cqZAo" node="5lxnBcTZ0TQ" resolve="node" />
+                                                        </node>
+                                                        <node concept="2OqwBi" id="1FOQehx2B9O" role="37wK5m">
+                                                          <node concept="37vLTw" id="1FOQehx2_bF" role="2Oq$k0">
+                                                            <ref role="3cqZAo" node="1FOQehx1Lkm" resolve="nri" />
+                                                          </node>
+                                                          <node concept="liA8E" id="1FOQehx2Dl8" role="2OqNvi">
+                                                            <ref role="37wK5l" to="d6hs:~ReportItem.getMessage():java.lang.String" resolve="getMessage" />
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                            <node concept="3clFbC" id="1FOQehx2mse" role="3clFbw">
+                                              <node concept="2OqwBi" id="1FOQehx2qlw" role="3uHU7w">
+                                                <node concept="37vLTw" id="1FOQehx2onP" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="1FOQehx1Lkm" resolve="nri" />
+                                                </node>
+                                                <node concept="liA8E" id="1FOQehx2spE" role="2OqNvi">
+                                                  <ref role="37wK5l" to="d6hs:~ReportItem.getSeverity():jetbrains.mps.errors.MessageStatus" resolve="getSeverity" />
+                                                </node>
+                                              </node>
+                                              <node concept="Rm8GO" id="1FOQehx2kl_" role="3uHU7B">
+                                                <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
+                                                <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="3clFbH" id="1FOQehx27FW" role="3cqZAp" />
+                                    </node>
+                                    <node concept="2ZW3vV" id="1FOQehx1$n8" role="3clFbw">
+                                      <node concept="3uibUv" id="1FOQehx1Air" role="2ZW6by">
+                                        <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+                                      </node>
+                                      <node concept="37vLTw" id="1FOQehx1urd" role="2ZW6bz">
+                                        <ref role="3cqZAo" node="1FOQehx1cWL" resolve="it" />
+                                      </node>
                                     </node>
                                   </node>
-                                  <node concept="3clFbJ" id="5lxnBcTZ0U1" role="3cqZAp">
-                                    <node concept="3y3z36" id="5lxnBcTZ0U2" role="3clFbw">
-                                      <node concept="37vLTw" id="5lxnBcTZ0U3" role="3uHU7B">
-                                        <ref role="3cqZAo" node="5lxnBcTZ0TQ" resolve="node" />
-                                      </node>
-                                      <node concept="10Nm6u" id="5lxnBcTZ0U4" role="3uHU7w" />
-                                    </node>
-                                    <node concept="3clFbS" id="5lxnBcTZ0U5" role="3clFbx">
-                                      <node concept="3clFbF" id="5lxnBcTZ0U6" role="3cqZAp">
-                                        <node concept="2OqwBi" id="5lxnBcTZ0U7" role="3clFbG">
-                                          <node concept="37vLTw" id="5lxnBcTZ0U8" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="5lxnBcTZ0T4" resolve="messageList" />
-                                          </node>
-                                          <node concept="TSZUe" id="5lxnBcTZ0U9" role="2OqNvi">
-                                            <node concept="2OqwBi" id="5lxnBcTZ0Ua" role="25WWJ7">
-                                              <node concept="37vLTw" id="5lxnBcTZ0Ub" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="52a_GfIDucr" resolve="messageDisplay" />
-                                              </node>
-                                              <node concept="liA8E" id="5lxnBcTZ0Uc" role="2OqNvi">
-                                                <ref role="37wK5l" node="4vBwiiVsgIX" resolve="errorMessage" />
-                                                <node concept="37vLTw" id="5lxnBcTZ0Ud" role="37wK5m">
-                                                  <ref role="3cqZAo" node="5lxnBcTZ0TQ" resolve="node" />
-                                                </node>
-                                                <node concept="2OqwBi" id="78H58oeVtd5" role="37wK5m">
-                                                  <node concept="2GrUjf" id="78H58oeV3ob" role="2Oq$k0">
-                                                    <ref role="2Gs0qQ" node="78H58oeV3o7" resolve="e" />
-                                                  </node>
-                                                  <node concept="3AV6Ez" id="78H58oeVvfN" role="2OqNvi" />
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
+                                  <node concept="3clFbH" id="1FOQehx1s9E" role="3cqZAp" />
+                                </node>
+                                <node concept="3cpWsn" id="1FOQehx1cWL" role="1Duv9x">
+                                  <property role="TrG5h" value="it" />
+                                  <node concept="3uibUv" id="1FOQehx1cWP" role="1tU5fm">
+                                    <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
                                   </node>
                                 </node>
-                                <node concept="2OqwBi" id="78H58oeUzS0" role="2GsD0m">
-                                  <node concept="37vLTw" id="78H58oeUwOI" role="2Oq$k0">
+                                <node concept="2OqwBi" id="1FOQehx1cWQ" role="1DdaDG">
+                                  <node concept="37vLTw" id="1FOQehx1cWR" role="2Oq$k0">
                                     <ref role="3cqZAo" node="78H58oeTHIN" resolve="task" />
                                   </node>
-                                  <node concept="2OwXpG" id="78H58oeUA8d" role="2OqNvi">
-                                    <ref role="2Oxat5" node="78H58oeTtbF" resolve="errors" />
+                                  <node concept="2OwXpG" id="1FOQehx1cWS" role="2OqNvi">
+                                    <ref role="2Oxat5" node="1FOQehx0XQm" resolve="reportItems" />
                                   </node>
                                 </node>
-                                <node concept="2GrKxI" id="78H58oeV3o7" role="2Gsz3X">
-                                  <property role="TrG5h" value="e" />
-                                </node>
                               </node>
                             </node>
                           </node>
@@ -2041,41 +1987,40 @@
       </node>
     </node>
     <node concept="2tJIrI" id="78H58oeToXj" role="jymVt" />
-    <node concept="3clFb_" id="78H58oeToTl" role="jymVt">
-      <property role="TrG5h" value="withErrors" />
-      <node concept="37vLTG" id="78H58oeToTm" role="3clF46">
-        <property role="TrG5h" value="errors" />
-        <node concept="3rvAFt" id="78H58of1A9C" role="1tU5fm">
-          <node concept="3uibUv" id="78H58of1AWv" role="3rvQeY">
-            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+    <node concept="3clFb_" id="1FOQehx0V$P" role="jymVt">
+      <property role="TrG5h" value="withReportItems" />
+      <node concept="37vLTG" id="1FOQehx0V$Q" role="3clF46">
+        <property role="TrG5h" value="reportItems" />
+        <node concept="3vKaQO" id="1FOQehx0WAl" role="1tU5fm">
+          <node concept="3uibUv" id="1FOQehx0X5a" role="3O5elw">
+            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
           </node>
-          <node concept="17QB3L" id="78H58of1BoY" role="3rvSg0" />
         </node>
       </node>
-      <node concept="3uibUv" id="78H58oeToTq" role="3clF45">
+      <node concept="3uibUv" id="1FOQehx0V$U" role="3clF45">
         <ref role="3uigEE" node="78H58oeT9Hs" resolve="HighlightingTask" />
       </node>
-      <node concept="3Tm1VV" id="78H58oeToTr" role="1B3o_S" />
-      <node concept="3clFbS" id="78H58oeToTs" role="3clF47">
-        <node concept="3clFbF" id="78H58oeTtbL" role="3cqZAp">
-          <node concept="37vLTI" id="78H58oeTtbN" role="3clFbG">
-            <node concept="2OqwBi" id="78H58oeTtIH" role="37vLTJ">
-              <node concept="Xjq3P" id="78H58oeTu7o" role="2Oq$k0" />
-              <node concept="2OwXpG" id="78H58oeTtIK" role="2OqNvi">
-                <ref role="2Oxat5" node="78H58oeTtbF" resolve="errors" />
+      <node concept="3Tm1VV" id="1FOQehx0V$V" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehx0V$W" role="3clF47">
+        <node concept="3clFbF" id="1FOQehx0XQr" role="3cqZAp">
+          <node concept="37vLTI" id="1FOQehx0XQt" role="3clFbG">
+            <node concept="2OqwBi" id="1FOQehx0Y$0" role="37vLTJ">
+              <node concept="Xjq3P" id="1FOQehx0YHE" role="2Oq$k0" />
+              <node concept="2OwXpG" id="1FOQehx0Y$3" role="2OqNvi">
+                <ref role="2Oxat5" node="1FOQehx0XQm" resolve="reportItems" />
               </node>
             </node>
-            <node concept="37vLTw" id="78H58oeTtbR" role="37vLTx">
-              <ref role="3cqZAo" node="78H58oeToTm" resolve="errors" />
+            <node concept="37vLTw" id="1FOQehx0XQx" role="37vLTx">
+              <ref role="3cqZAo" node="1FOQehx0V$Q" resolve="reportItems" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="78H58oeTuMd" role="3cqZAp">
-          <node concept="Xjq3P" id="78H58oeTuMb" role="3clFbG" />
+        <node concept="3clFbF" id="1FOQehx0V_3" role="3cqZAp">
+          <node concept="Xjq3P" id="1FOQehx0V_4" role="3clFbG" />
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="78H58oeTpnV" role="jymVt" />
+    <node concept="2tJIrI" id="1FOQehx0V$O" role="jymVt" />
     <node concept="3clFb_" id="78H58oeTpjT" role="jymVt">
       <property role="TrG5h" value="withTracetabs" />
       <node concept="37vLTG" id="78H58oeTpjU" role="3clF46">
@@ -2121,16 +2066,6 @@
         <node concept="3Tqbb2" id="78H58of1BCf" role="3rvSg0" />
       </node>
     </node>
-    <node concept="312cEg" id="78H58oeTtbF" role="jymVt">
-      <property role="TrG5h" value="errors" />
-      <node concept="3Tmbuc" id="78H58oeTxCw" role="1B3o_S" />
-      <node concept="3rvAFt" id="78H58of1C77" role="1tU5fm">
-        <node concept="3uibUv" id="78H58of1C78" role="3rvQeY">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-        <node concept="17QB3L" id="78H58of1C79" role="3rvSg0" />
-      </node>
-    </node>
     <node concept="312cEg" id="78H58oeTuSP" role="jymVt">
       <property role="TrG5h" value="ttabs" />
       <node concept="3Tmbuc" id="78H58oeTxG0" role="1B3o_S" />
@@ -2152,6 +2087,15 @@
         <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
       </node>
     </node>
+    <node concept="312cEg" id="1FOQehx0XQm" role="jymVt">
+      <property role="TrG5h" value="reportItems" />
+      <node concept="3Tmbuc" id="1FOQehx0Z5q" role="1B3o_S" />
+      <node concept="3vKaQO" id="1FOQehx0XQp" role="1tU5fm">
+        <node concept="3uibUv" id="1FOQehx0XQq" role="3O5elw">
+          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="4vBwiiVsgHb">
     <property role="3GE5qa" value="highlighting" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index cd3902f5..8c5b3be3 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -33,6 +33,7 @@
     <import index="e0w6" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.observers(jetbrains.mps.coderules/)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
+    <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -1494,52 +1495,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="3F6vMxq$Y7S" role="jymVt" />
-    <node concept="3clFbW" id="3IIf9OAgFCl" role="jymVt">
-      <node concept="3cqZAl" id="3IIf9OAgFCm" role="3clF45" />
-      <node concept="3Tm1VV" id="3IIf9OAgFCn" role="1B3o_S" />
-      <node concept="3clFbS" id="3IIf9OAgFCo" role="3clF47">
-        <node concept="3clFbF" id="3IIf9OAgFCp" role="3cqZAp">
-          <node concept="37vLTI" id="3IIf9OAgFCq" role="3clFbG">
-            <node concept="2OqwBi" id="3IIf9OAgFCr" role="37vLTJ">
-              <node concept="Xjq3P" id="3IIf9OAgFCs" role="2Oq$k0" />
-              <node concept="2OwXpG" id="3IIf9OAgFCt" role="2OqNvi">
-                <ref role="2Oxat5" node="443LGHBSt7P" resolve="repository" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="3IIf9OAgFCu" role="37vLTx">
-              <ref role="3cqZAo" node="3IIf9OAgFCv" resolve="repository" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3IIf9OAgHRc" role="3cqZAp">
-          <node concept="37vLTI" id="3IIf9OAgHRe" role="3clFbG">
-            <node concept="2OqwBi" id="3IIf9OAgJUJ" role="37vLTJ">
-              <node concept="Xjq3P" id="3IIf9OAgJZk" role="2Oq$k0" />
-              <node concept="2OwXpG" id="3IIf9OAgJUM" role="2OqNvi">
-                <ref role="2Oxat5" node="3IIf9OAgHR7" resolve="parameter" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="3IIf9OAgHRi" role="37vLTx">
-              <ref role="3cqZAo" node="3IIf9OAgHzP" resolve="parameter" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="3IIf9OAgFCv" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="3IIf9OAgFCw" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="3IIf9OAgHzP" role="3clF46">
-        <property role="TrG5h" value="parameter" />
-        <node concept="3uibUv" id="3IIf9OAgO$P" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3qTvmN" id="3IIf9OAm23N" role="11_B2D" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3IIf9OAgFCk" role="jymVt" />
     <node concept="3clFb_" id="1pPth$lMSHK" role="jymVt">
       <property role="TrG5h" value="info" />
       <property role="1EzhhJ" value="false" />
@@ -1553,7 +1508,7 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="3F6vMxq_0xa" role="jymVt" />
+    <node concept="2tJIrI" id="1FOQehwo8s$" role="jymVt" />
     <node concept="3clFb_" id="55Q$YFtJK$_" role="jymVt">
       <property role="TrG5h" value="schedule" />
       <property role="1EzhhJ" value="false" />
@@ -1862,9 +1817,6 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="37vLTw" id="3IIf9OAgKDg" role="37wK5m">
-                                  <ref role="3cqZAo" node="3IIf9OAgHR7" resolve="parameter" />
-                                </node>
                               </node>
                             </node>
                             <node concept="10Nm6u" id="7WKNeR9$atX" role="3K4GZi" />
@@ -2558,14 +2510,6 @@
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
     </node>
-    <node concept="312cEg" id="3IIf9OAgHR7" role="jymVt">
-      <property role="TrG5h" value="parameter" />
-      <node concept="3Tm6S6" id="3IIf9OAgHR8" role="1B3o_S" />
-      <node concept="3uibUv" id="3IIf9OAgPa_" role="1tU5fm">
-        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3qTvmN" id="3IIf9OAm4oj" role="11_B2D" />
-      </node>
-    </node>
   </node>
   <node concept="312cEu" id="7nPD14NbIif">
     <property role="TrG5h" value="MultiTrace" />
@@ -4968,5 +4912,24 @@
       </node>
     </node>
   </node>
+  <node concept="3HP615" id="5KrJ7UHMRRs">
+    <property role="TrG5h" value="ReportSink" />
+    <node concept="2tJIrI" id="5KrJ7UHMRRU" role="jymVt" />
+    <node concept="3clFb_" id="5KrJ7UHMRSa" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="report" />
+      <node concept="37vLTG" id="5KrJ7UHMRTK" role="3clF46">
+        <property role="TrG5h" value="reportItem" />
+        <node concept="3uibUv" id="5KrJ7UHMVA7" role="1tU5fm">
+          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="5KrJ7UHMRSc" role="3clF45" />
+      <node concept="3Tm1VV" id="5KrJ7UHMRSd" role="1B3o_S" />
+      <node concept="3clFbS" id="5KrJ7UHMRSe" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="5KrJ7UHMRRZ" role="jymVt" />
+    <node concept="3Tm1VV" id="5KrJ7UHMRRt" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
index d07040ae..4eac99a9 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
@@ -1237,25 +1237,25 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="78H58of3nRc" role="3cqZAp">
-                    <node concept="37vLTI" id="78H58of3nRd" role="3clFbG">
-                      <node concept="2OqwBi" id="78H58of3nRe" role="37vLTx">
-                        <node concept="37vLTw" id="78H58of3nRf" role="2Oq$k0">
+                  <node concept="3clFbF" id="1FOQehx4mRi" role="3cqZAp">
+                    <node concept="37vLTI" id="1FOQehx4mRj" role="3clFbG">
+                      <node concept="2OqwBi" id="1FOQehx4mRk" role="37vLTx">
+                        <node concept="37vLTw" id="1FOQehx4mRl" role="2Oq$k0">
                           <ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
                         </node>
-                        <node concept="liA8E" id="78H58of3fKp" role="2OqNvi">
-                          <ref role="37wK5l" to="o35r:78H58oeToTl" resolve="withErrors" />
-                          <node concept="2OqwBi" id="78H58of3fKq" role="37wK5m">
-                            <node concept="37vLTw" id="78H58of3fKr" role="2Oq$k0">
+                        <node concept="liA8E" id="1FOQehx4mRm" role="2OqNvi">
+                          <ref role="37wK5l" to="o35r:1FOQehx0V$P" resolve="withReportItems" />
+                          <node concept="2OqwBi" id="1FOQehx4mRn" role="37wK5m">
+                            <node concept="37vLTw" id="1FOQehx4mRo" role="2Oq$k0">
                               <ref role="3cqZAo" node="5lxnBcU09rm" resolve="prev" />
                             </node>
-                            <node concept="liA8E" id="78H58of3fKs" role="2OqNvi">
-                              <ref role="37wK5l" to="fjx4:7lt0LtQA50U" resolve="getErrors" />
+                            <node concept="liA8E" id="1FOQehx4mRp" role="2OqNvi">
+                              <ref role="37wK5l" to="fjx4:1FOQehx4yMT" resolve="getReportItems" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="37vLTw" id="78H58of3nRk" role="37vLTJ">
+                      <node concept="37vLTw" id="1FOQehx4mRq" role="37vLTJ">
                         <ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
                       </node>
                     </node>
diff --git a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
index 49b7068a..07b48546 100644
--- a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
@@ -23,6 +23,8 @@
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
     <import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" />
+    <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
+    <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -75,7 +77,6 @@
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -127,7 +128,6 @@
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
@@ -160,9 +160,7 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
-        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
-      </concept>
+      <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -171,6 +169,9 @@
       </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
+        <child id="540871147943773366" name="argument" index="25WWJ7" />
+      </concept>
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
@@ -178,17 +179,10 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
-      <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
-        <child id="1197683466920" name="keyType" index="3rvQeY" />
-        <child id="1197683475734" name="valueType" index="3rvSg0" />
-      </concept>
-      <concept id="1197686869805" name="jetbrains.mps.baseLanguage.collections.structure.HashMapCreator" flags="nn" index="3rGOSV">
-        <child id="1197687026896" name="keyType" index="3rHrn6" />
-        <child id="1197687035757" name="valueType" index="3rHtpV" />
-      </concept>
-      <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
-        <child id="1197932505799" name="map" index="3ElQJh" />
-        <child id="1197932525128" name="key" index="3ElVtu" />
+      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
+      <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
+      <concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
+        <child id="5686963296372573084" name="elementType" index="3O5elw" />
       </concept>
     </language>
   </registry>
@@ -383,35 +377,7 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="7lt0LtQ_OM3" role="jymVt" />
-    <node concept="3clFb_" id="oI9Ys2yFM" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="report" />
-      <node concept="37vLTG" id="oI9Ys2yFN" role="3clF46">
-        <property role="TrG5h" value="target" />
-        <node concept="3Tqbb2" id="oI9Ys2yFO" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="oI9Ys2yFP" role="3clF46">
-        <property role="TrG5h" value="kind" />
-        <node concept="3uibUv" id="oI9Ys2yFQ" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="oI9Ys2yFR" role="3clF46">
-        <property role="TrG5h" value="text" />
-        <node concept="17QB3L" id="oI9Ys2yFS" role="1tU5fm" />
-      </node>
-      <node concept="10P_77" id="oI9Ys2yFT" role="3clF45" />
-      <node concept="3Tm1VV" id="oI9Ys2yFU" role="1B3o_S" />
-      <node concept="3clFbS" id="oI9Ys2yFX" role="3clF47">
-        <node concept="3clFbF" id="oI9Ys2yG0" role="3cqZAp">
-          <node concept="3clFbT" id="oI9Ys2yFZ" role="3clFbG" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="oI9Ys2yFY" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
+    <node concept="2tJIrI" id="1FOQehvIsJr" role="jymVt" />
     <node concept="3Tm1VV" id="7lt0LtQ_OIT" role="1B3o_S" />
     <node concept="3uibUv" id="7lt0LtQ_OLT" role="1zkMxy">
       <ref role="3uigEE" to="cxk7:3F6vMxqo13Y" resolve="DefaultSessionSolver" />
@@ -441,36 +407,6 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="78H58oeu9$M" role="jymVt" />
-    <node concept="3clFbW" id="78H58oeu9xt" role="jymVt">
-      <node concept="37vLTG" id="78H58oeu9xu" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="78H58oeu9xv" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="78H58oeu9xw" role="3clF46">
-        <property role="TrG5h" value="params" />
-        <node concept="3uibUv" id="78H58oeu9xx" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3qTvmN" id="78H58oeu9xy" role="11_B2D" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="78H58oeu9xz" role="3clF45" />
-      <node concept="3Tm1VV" id="78H58oeu9x$" role="1B3o_S" />
-      <node concept="3clFbS" id="78H58oeu9x_" role="3clF47">
-        <node concept="XkiVB" id="78H58oeu9xA" role="3cqZAp">
-          <ref role="37wK5l" to="1yqb:3IIf9OAgFCl" resolve="EvaluateRulesStep" />
-          <node concept="37vLTw" id="78H58oeu9xB" role="37wK5m">
-            <ref role="3cqZAo" node="78H58oeu9xu" resolve="repository" />
-          </node>
-          <node concept="37vLTw" id="78H58oeu9xC" role="37wK5m">
-            <ref role="3cqZAo" node="78H58oeu9xw" resolve="params" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="78H58oeu6Qq" role="jymVt" />
     <node concept="2tJIrI" id="6Yb9hAqJRts" role="jymVt" />
     <node concept="3clFb_" id="6Yb9hAqJSaM" role="jymVt">
       <property role="TrG5h" value="scheduleWithTrace" />
@@ -566,16 +502,16 @@
                 <node concept="3clFb_" id="78H58oeuats" role="jymVt">
                   <property role="1EzhhJ" value="false" />
                   <property role="TrG5h" value="report" />
-                  <node concept="37vLTG" id="78H58oeuatt" role="3clF46">
-                    <property role="TrG5h" value="target" />
-                    <node concept="3Tqbb2" id="78H58oeuatu" role="1tU5fm" />
-                  </node>
                   <node concept="37vLTG" id="78H58oeuatv" role="3clF46">
                     <property role="TrG5h" value="kind" />
-                    <node concept="3uibUv" id="78H58oeuatw" role="1tU5fm">
-                      <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                    <node concept="3uibUv" id="1FOQehwpupN" role="1tU5fm">
+                      <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
                     </node>
                   </node>
+                  <node concept="37vLTG" id="78H58oeuatt" role="3clF46">
+                    <property role="TrG5h" value="target" />
+                    <node concept="2sp9CU" id="1FOQehwMiYP" role="1tU5fm" />
+                  </node>
                   <node concept="37vLTG" id="78H58oeuatx" role="3clF46">
                     <property role="TrG5h" value="text" />
                     <node concept="17QB3L" id="78H58oeuaty" role="1tU5fm" />
@@ -586,51 +522,32 @@
                     <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                   <node concept="3clFbS" id="78H58oeuatE" role="3clF47">
-                    <node concept="3clFbJ" id="oI9Ysbre7" role="3cqZAp">
-                      <node concept="2OqwBi" id="oI9YsbrVU" role="3clFbw">
-                        <node concept="Xl_RD" id="oI9Ysbruj" role="2Oq$k0">
-                          <property role="Xl_RC" value="error" />
+                    <node concept="3clFbF" id="1FOQehx4EW8" role="3cqZAp">
+                      <node concept="2OqwBi" id="1FOQehx4Gp2" role="3clFbG">
+                        <node concept="37vLTw" id="1FOQehx4EW6" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1FOQehx4tIV" resolve="reportItems" />
                         </node>
-                        <node concept="liA8E" id="oI9Ysbsor" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
-                          <node concept="37vLTw" id="oI9YsbsD8" role="37wK5m">
-                            <ref role="3cqZAo" node="78H58oeuatv" resolve="kind" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbS" id="oI9Ysbre9" role="3clFbx">
-                        <node concept="3clFbF" id="oI9Ysbt3k" role="3cqZAp">
-                          <node concept="37vLTI" id="oI9YsbvTv" role="3clFbG">
-                            <node concept="37vLTw" id="oI9YsbwpJ" role="37vLTx">
-                              <ref role="3cqZAo" node="78H58oeuatx" resolve="text" />
-                            </node>
-                            <node concept="3EllGN" id="oI9YsbtHt" role="37vLTJ">
-                              <node concept="2OqwBi" id="oI9YsbuMb" role="3ElVtu">
-                                <node concept="2JrnkZ" id="oI9YsbuyC" role="2Oq$k0">
-                                  <node concept="37vLTw" id="oI9Ysbu8v" role="2JrQYb">
-                                    <ref role="3cqZAo" node="78H58oeuatt" resolve="target" />
-                                  </node>
-                                </node>
-                                <node concept="liA8E" id="oI9Ysbv9O" role="2OqNvi">
-                                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
-                                </node>
+                        <node concept="TSZUe" id="1FOQehx4HQH" role="2OqNvi">
+                          <node concept="2ShNRf" id="1FOQehx4If8" role="25WWJ7">
+                            <node concept="1pGfFk" id="1FOQehx4Jls" role="2ShVmc">
+                              <ref role="37wK5l" node="1FOQehwow5Q" resolve="ControlflowReportItem" />
+                              <node concept="37vLTw" id="1FOQehx47KN" role="37wK5m">
+                                <ref role="3cqZAo" node="78H58oeuatv" resolve="kind" />
                               </node>
-                              <node concept="37vLTw" id="oI9Ysbt3j" role="3ElQJh">
-                                <ref role="3cqZAo" node="7lt0LtQ_XxI" resolve="errors" />
+                              <node concept="37vLTw" id="1FOQehx47KO" role="37wK5m">
+                                <ref role="3cqZAo" node="78H58oeuatt" resolve="target" />
+                              </node>
+                              <node concept="37vLTw" id="1FOQehx47KP" role="37wK5m">
+                                <ref role="3cqZAo" node="78H58oeuatx" resolve="text" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="3cpWs6" id="oI9YsbwWO" role="3cqZAp">
-                          <node concept="3clFbT" id="oI9Ysbxg1" role="3cqZAk">
-                            <property role="3clFbU" value="true" />
-                          </node>
-                        </node>
                       </node>
                     </node>
                     <node concept="3cpWs6" id="oI9Ysby3S" role="3cqZAp">
-                      <node concept="3clFbT" id="oI9Ysbyzu" role="3cqZAk">
-                        <property role="3clFbU" value="false" />
+                      <node concept="3clFbT" id="1FOQehxPxp2" role="3cqZAk">
+                        <property role="3clFbU" value="true" />
                       </node>
                     </node>
                   </node>
@@ -664,24 +581,23 @@
       </node>
     </node>
     <node concept="2tJIrI" id="78H58oeubmD" role="jymVt" />
-    <node concept="3clFb_" id="7lt0LtQA50U" role="jymVt">
-      <property role="TrG5h" value="getErrors" />
-      <node concept="3rvAFt" id="7lt0LtQA50V" role="3clF45">
-        <node concept="17QB3L" id="7lt0LtQA50W" role="3rvSg0" />
-        <node concept="3uibUv" id="7lt0LtQA50X" role="3rvQeY">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7lt0LtQA50Y" role="1B3o_S" />
-      <node concept="3clFbS" id="7lt0LtQA50Z" role="3clF47">
-        <node concept="3clFbF" id="7lt0LtQA510" role="3cqZAp">
-          <node concept="37vLTw" id="7lt0LtQA511" role="3clFbG">
-            <ref role="3cqZAo" node="7lt0LtQ_XxI" resolve="errors" />
+    <node concept="3clFb_" id="1FOQehx4yMT" role="jymVt">
+      <property role="TrG5h" value="getReportItems" />
+      <node concept="3Tm1VV" id="1FOQehx4yMX" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehx4yMY" role="3clF47">
+        <node concept="3clFbF" id="1FOQehx4BDl" role="3cqZAp">
+          <node concept="37vLTw" id="1FOQehx4BDk" role="3clFbG">
+            <ref role="3cqZAo" node="1FOQehx4tIV" resolve="reportItems" />
           </node>
         </node>
       </node>
+      <node concept="3vKaQO" id="1FOQehx4$tY" role="3clF45">
+        <node concept="3uibUv" id="1FOQehx4_l3" role="3O5elw">
+          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+        </node>
+      </node>
     </node>
-    <node concept="2tJIrI" id="6Yb9hAqJXrR" role="jymVt" />
+    <node concept="2tJIrI" id="1FOQehx4yMS" role="jymVt" />
     <node concept="3clFb_" id="6kREIVl0T6j" role="jymVt">
       <property role="TrG5h" value="getTraceTabComponents" />
       <node concept="_YKpA" id="6kREIVl0T6k" role="3clF45">
@@ -699,25 +615,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="78H58oeuecU" role="jymVt" />
-    <node concept="312cEg" id="7lt0LtQ_XxI" role="jymVt">
-      <property role="TrG5h" value="errors" />
-      <property role="3TUv4t" value="false" />
-      <node concept="3Tm6S6" id="7lt0LtQ_XxJ" role="1B3o_S" />
-      <node concept="3rvAFt" id="7lt0LtQ_XxK" role="1tU5fm">
-        <node concept="17QB3L" id="7lt0LtQ_XxL" role="3rvSg0" />
-        <node concept="3uibUv" id="7lt0LtQ_XxM" role="3rvQeY">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="7lt0LtQ_XxN" role="33vP2m">
-        <node concept="3rGOSV" id="7lt0LtQ_XxO" role="2ShVmc">
-          <node concept="3uibUv" id="7lt0LtQ_XxP" role="3rHrn6">
-            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-          </node>
-          <node concept="17QB3L" id="7lt0LtQ_XxQ" role="3rHtpV" />
-        </node>
-      </node>
-    </node>
     <node concept="312cEg" id="6IQb_RxsBvb" role="jymVt">
       <property role="TrG5h" value="traceTabComponents" />
       <node concept="3Tmbuc" id="78H58of7l2T" role="1B3o_S" />
@@ -734,11 +631,88 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="78H58oeubno" role="jymVt" />
+    <node concept="312cEg" id="1FOQehx4tIV" role="jymVt">
+      <property role="TrG5h" value="reportItems" />
+      <node concept="3Tm6S6" id="1FOQehx4tIW" role="1B3o_S" />
+      <node concept="_YKpA" id="1FOQehx4wLX" role="1tU5fm">
+        <node concept="3uibUv" id="1FOQehx4x9c" role="_ZDj9">
+          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="1FOQehx4yzm" role="33vP2m">
+        <node concept="Tc6Ow" id="1FOQehx4yv6" role="2ShVmc">
+          <node concept="3uibUv" id="1FOQehx4yv7" role="HW$YZ">
+            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="3Tm1VV" id="78H58oeu6dH" role="1B3o_S" />
     <node concept="3uibUv" id="78H58oeu6eG" role="1zkMxy">
       <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
     </node>
   </node>
+  <node concept="312cEu" id="1FOQehwovmW">
+    <property role="TrG5h" value="ControlflowReportItem" />
+    <node concept="2tJIrI" id="1FOQehwov_X" role="jymVt" />
+    <node concept="3clFbW" id="1FOQehwow5Q" role="jymVt">
+      <node concept="37vLTG" id="1FOQehwownE" role="3clF46">
+        <property role="TrG5h" value="stat" />
+        <node concept="3uibUv" id="1FOQehwozrM" role="1tU5fm">
+          <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1FOQehwozse" role="3clF46">
+        <property role="TrG5h" value="nodeRef" />
+        <node concept="3uibUv" id="1FOQehwozyA" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1FOQehwozzD" role="3clF46">
+        <property role="TrG5h" value="message" />
+        <node concept="17QB3L" id="1FOQehwozKs" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="1FOQehwow5S" role="3clF45" />
+      <node concept="3Tm1VV" id="1FOQehwow5T" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehwow5U" role="3clF47">
+        <node concept="XkiVB" id="1FOQehwozvf" role="3cqZAp">
+          <ref role="37wK5l" to="d6hs:~NodeReportItemBase.&lt;init&gt;(jetbrains.mps.errors.MessageStatus,org.jetbrains.mps.openapi.model.SNodeReference,java.lang.String)" resolve="NodeReportItemBase" />
+          <node concept="37vLTw" id="1FOQehwozDB" role="37wK5m">
+            <ref role="3cqZAo" node="1FOQehwownE" resolve="stat" />
+          </node>
+          <node concept="37vLTw" id="1FOQehwozGd" role="37wK5m">
+            <ref role="3cqZAo" node="1FOQehwozse" resolve="nodeRef" />
+          </node>
+          <node concept="37vLTw" id="1FOQehwozJ1" role="37wK5m">
+            <ref role="3cqZAo" node="1FOQehwozzD" resolve="message" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehwowbp" role="jymVt" />
+    <node concept="3Tm1VV" id="1FOQehwovmX" role="1B3o_S" />
+    <node concept="3uibUv" id="1FOQehwovnW" role="1zkMxy">
+      <ref role="3uigEE" to="d6hs:~NodeReportItemBase" resolve="NodeReportItemBase" />
+    </node>
+    <node concept="3clFb_" id="1FOQehwovo1" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="getIssueKind" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3Tm1VV" id="1FOQehwovo2" role="1B3o_S" />
+      <node concept="17QB3L" id="1FOQehwozNz" role="3clF45" />
+      <node concept="3clFbS" id="1FOQehwovoe" role="3clF47">
+        <node concept="3clFbF" id="1FOQehwovF_" role="3cqZAp">
+          <node concept="Xl_RD" id="1FOQehx4DGR" role="3clFbG">
+            <property role="Xl_RC" value="control flow" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="1FOQehwovof" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehwovCw" role="jymVt" />
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps
index 3a9baa9a..6ff4518c 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps
@@ -20,6 +20,7 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
+    <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -258,6 +259,7 @@
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -3211,16 +3213,16 @@
     <node concept="3clFb_" id="oI9Ys3m9o" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="report" />
-      <node concept="37vLTG" id="oI9Ys3m9p" role="3clF46">
-        <property role="TrG5h" value="target" />
-        <node concept="3Tqbb2" id="oI9Ys3m9q" role="1tU5fm" />
-      </node>
       <node concept="37vLTG" id="oI9Ys3m9r" role="3clF46">
         <property role="TrG5h" value="kind" />
-        <node concept="3uibUv" id="oI9Ys3m9s" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        <node concept="3uibUv" id="1FOQehwpsz0" role="1tU5fm">
+          <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
         </node>
       </node>
+      <node concept="37vLTG" id="oI9Ys3m9p" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="2sp9CU" id="1FOQehwMiYP" role="1tU5fm" />
+      </node>
       <node concept="37vLTG" id="oI9Ys3m9t" role="3clF46">
         <property role="TrG5h" value="text" />
         <node concept="17QB3L" id="oI9Ys3m9u" role="1tU5fm" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index e3543624..e2f6314b 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -1126,13 +1126,6 @@
           <ref role="3uigEE" node="7P_FdVQ_k3b" resolve="QueryTemplate.QueryObservable" />
         </node>
       </node>
-      <node concept="37vLTG" id="7P_FdVPsGBf" role="3clF46">
-        <property role="TrG5h" value="parameters" />
-        <node concept="3uibUv" id="3IIf9OAgMKI" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3qTvmN" id="3IIf9OAm5rX" role="11_B2D" />
-        </node>
-      </node>
       <node concept="3uibUv" id="7P_FdVPsDNI" role="3clF45">
         <ref role="3uigEE" node="7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
       </node>
diff --git a/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd b/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd
index 38cd8498..5c66bfae 100644
--- a/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd
+++ b/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd
@@ -9,6 +9,7 @@
   <dependencies>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
+    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -23,6 +24,7 @@
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps b/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
index 66f9cd7f..b0887d4b 100644
--- a/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
+++ b/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
@@ -11,6 +11,7 @@
   <imports>
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -112,6 +113,7 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -158,16 +160,16 @@
     <node concept="3clFb_" id="oI9Ys2ypk" role="jymVt">
       <property role="1EzhhJ" value="true" />
       <property role="TrG5h" value="report" />
-      <node concept="37vLTG" id="oI9Ys2yue" role="3clF46">
-        <property role="TrG5h" value="target" />
-        <node concept="3Tqbb2" id="oI9Ys2yvH" role="1tU5fm" />
-      </node>
       <node concept="37vLTG" id="oI9Ys2y$v" role="3clF46">
         <property role="TrG5h" value="kind" />
-        <node concept="3uibUv" id="oI9Ys2yAc" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        <node concept="3uibUv" id="1FOQehwp95V" role="1tU5fm">
+          <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
         </node>
       </node>
+      <node concept="37vLTG" id="oI9Ys2yue" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="2sp9CU" id="1FOQehwMiYP" role="1tU5fm" />
+      </node>
       <node concept="37vLTG" id="oI9Ys2yxf" role="3clF46">
         <property role="TrG5h" value="text" />
         <node concept="17QB3L" id="oI9Ys2yyP" role="1tU5fm" />
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 3b5f07be..7a315e6b 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
@@ -2158,6 +2158,12 @@
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
           </node>
         </node>
+        <node concept="1SiIV0" id="1FOQehws5Z7" role="3bR37C">
+          <node concept="3bR9La" id="1FOQehws5Z8" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2sgV4H" id="7Ant4WkHLmd" role="1l3spa">
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 d876e31d..0bd153ca 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
@@ -50,6 +50,7 @@
     <import index="sppd" ref="r:0e60ac07-77c3-4d5c-b40d-73e8fd128592(jetbrains.mps.typechecking.testlang.sandbox.test)" />
     <import index="qulx" ref="r:ec0979fb-ae37-4823-9eaa-8550d9f5c6fd(jetbrains.mps.typechecking.testlang.structure)" />
     <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
+    <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@@ -125,6 +126,7 @@
       </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="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -261,6 +263,7 @@
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
+      <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
       <concept id="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
         <child id="1138662048170" name="value" index="tz02z" />
       </concept>
@@ -448,8 +451,8 @@
               <node concept="3cpWs8" id="6QH_LDtdVHj" role="3cqZAp">
                 <node concept="3cpWsn" id="6QH_LDtdVHk" role="3cpWs9">
                   <property role="TrG5h" value="typesCache" />
-                  <node concept="3uibUv" id="443LGHByist" role="1tU5fm">
-                    <ref role="3uigEE" to="qox2:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
+                  <node concept="3uibUv" id="1FOQehxeuXN" role="1tU5fm">
+                    <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
                   </node>
                   <node concept="2OqwBi" id="6QH_LDtdVHl" role="33vP2m">
                     <node concept="37vLTw" id="6QH_LDtdVHm" role="2Oq$k0">
@@ -482,8 +485,8 @@
                   <node concept="3cpWs8" id="6QH_LDtdXLJ" role="3cqZAp">
                     <node concept="3cpWsn" id="6QH_LDtdXLK" role="3cpWs9">
                       <property role="TrG5h" value="typeCache2" />
-                      <node concept="3uibUv" id="443LGHBynwC" role="1tU5fm">
-                        <ref role="3uigEE" to="qox2:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
+                      <node concept="3uibUv" id="1FOQehxevl5" role="1tU5fm">
+                        <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
                       </node>
                       <node concept="2OqwBi" id="6QH_LDtdXLL" role="33vP2m">
                         <node concept="37vLTw" id="6QH_LDtdXLM" role="2Oq$k0">
@@ -677,8 +680,8 @@
                   <node concept="3cpWs8" id="6QH_LDtdZNt" role="3cqZAp">
                     <node concept="3cpWsn" id="6QH_LDtdZNu" role="3cpWs9">
                       <property role="TrG5h" value="typesCache3" />
-                      <node concept="3uibUv" id="443LGHByr8Z" role="1tU5fm">
-                        <ref role="3uigEE" to="qox2:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
+                      <node concept="3uibUv" id="1FOQehxesGr" role="1tU5fm">
+                        <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
                       </node>
                       <node concept="2OqwBi" id="6QH_LDtdZNv" role="33vP2m">
                         <node concept="37vLTw" id="6QH_LDtdZNw" role="2Oq$k0">
@@ -1065,6 +1068,34 @@
                                 <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                               </node>
                             </node>
+                            <node concept="3clFb_" id="1FOQehvP35a" role="jymVt">
+                              <property role="1EzhhJ" value="false" />
+                              <property role="TrG5h" value="report" />
+                              <node concept="37vLTG" id="1FOQehvP35d" role="3clF46">
+                                <property role="TrG5h" value="kind" />
+                                <node concept="3uibUv" id="1FOQehwpwXb" role="1tU5fm">
+                                  <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                                </node>
+                              </node>
+                              <node concept="37vLTG" id="1FOQehvP35b" role="3clF46">
+                                <property role="TrG5h" value="target" />
+                                <node concept="2sp9CU" id="1FOQehwMiYP" role="1tU5fm" />
+                              </node>
+                              <node concept="37vLTG" id="1FOQehvP35f" role="3clF46">
+                                <property role="TrG5h" value="text" />
+                                <node concept="17QB3L" id="1FOQehvP35g" role="1tU5fm" />
+                              </node>
+                              <node concept="10P_77" id="1FOQehvP35h" role="3clF45" />
+                              <node concept="3Tm1VV" id="1FOQehvP35i" role="1B3o_S" />
+                              <node concept="3clFbS" id="1FOQehvP35o" role="3clF47">
+                                <node concept="3clFbF" id="1FOQehvP35r" role="3cqZAp">
+                                  <node concept="3clFbT" id="1FOQehvP35q" role="3clFbG" />
+                                </node>
+                              </node>
+                              <node concept="2AHcQZ" id="1FOQehvP35p" role="2AJF6D">
+                                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
diff --git a/coderules/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps b/coderules/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
index 0e82ec20..c4273ac5 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
@@ -1462,25 +1462,25 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="78H58of3nRc" role="3cqZAp">
-                    <node concept="37vLTI" id="78H58of3nRd" role="3clFbG">
-                      <node concept="2OqwBi" id="78H58of3nRe" role="37vLTx">
-                        <node concept="37vLTw" id="78H58of3nRf" role="2Oq$k0">
+                  <node concept="3clFbF" id="1FOQehx4b_Y" role="3cqZAp">
+                    <node concept="37vLTI" id="1FOQehx4b_Z" role="3clFbG">
+                      <node concept="2OqwBi" id="1FOQehx4bA0" role="37vLTx">
+                        <node concept="37vLTw" id="1FOQehx4bA1" role="2Oq$k0">
                           <ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
                         </node>
-                        <node concept="liA8E" id="78H58of3fKp" role="2OqNvi">
-                          <ref role="37wK5l" to="o35r:78H58oeToTl" resolve="withErrors" />
-                          <node concept="2OqwBi" id="78H58of3fKq" role="37wK5m">
-                            <node concept="37vLTw" id="78H58of3fKr" role="2Oq$k0">
+                        <node concept="liA8E" id="1FOQehx4bA2" role="2OqNvi">
+                          <ref role="37wK5l" to="o35r:1FOQehx0V$P" resolve="withReportItems" />
+                          <node concept="2OqwBi" id="1FOQehx4bA3" role="37wK5m">
+                            <node concept="37vLTw" id="1FOQehx4bA4" role="2Oq$k0">
                               <ref role="3cqZAo" node="5lxnBcU09rm" resolve="prev" />
                             </node>
-                            <node concept="liA8E" id="78H58of3fKs" role="2OqNvi">
-                              <ref role="37wK5l" to="tj24:7lt0LtQA50U" resolve="getErrors" />
+                            <node concept="liA8E" id="1FOQehx4bA5" role="2OqNvi">
+                              <ref role="37wK5l" to="tj24:1FOQehx3WGd" resolve="getReportItems" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="37vLTw" id="78H58of3nRk" role="37vLTJ">
+                      <node concept="37vLTw" id="1FOQehx4bA6" role="37vLTJ">
                         <ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
                       </node>
                     </node>
diff --git a/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd b/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd
index 0e3ce611..93fca573 100644
--- a/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd
+++ b/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd
@@ -32,6 +32,7 @@
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="2" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="11" />
+    <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps b/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
index 24cf9b09..d949ab21 100644
--- a/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
@@ -23,9 +23,14 @@
     <import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="u46i" ref="r:c2760840-3210-4ad4-9e64-a2dfd53620e1(jetbrains.mps.lang.typechecking.aspect)" />
+    <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/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
+        <child id="1219921048460" name="componentType" index="8Xvag" />
+      </concept>
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
@@ -48,6 +53,10 @@
       <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
         <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
       </concept>
+      <concept id="1083260308424" name="jetbrains.mps.baseLanguage.structure.EnumConstantReference" flags="nn" index="Rm8GO">
+        <reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
+        <reference id="1144432896254" name="enumClass" index="1Px2BO" />
+      </concept>
       <concept id="1164879751025" name="jetbrains.mps.baseLanguage.structure.TryCatchStatement" flags="nn" index="SfApY">
         <child id="1164879758292" name="body" index="SfCbr" />
         <child id="1164903496223" name="catchClause" index="TEbGg" />
@@ -203,12 +212,6 @@
         <child id="2034914114981261755" name="throwable" index="RRSow" />
         <child id="2034914114981261753" name="message" index="RRSoy" />
       </concept>
-      <concept id="1167227138527" name="jetbrains.mps.baseLanguage.logging.structure.LogStatement" flags="nn" index="34ab3g">
-        <property id="1167228628751" name="hasException" index="34fQS0" />
-        <property id="1167245565795" name="severity" index="35gtTG" />
-        <child id="1167227463056" name="logExpression" index="34bqiv" />
-        <child id="1167227561449" name="exception" index="34bMjA" />
-      </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
@@ -229,9 +232,6 @@
       </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
-        <child id="1151688676805" name="elementType" index="_ZDj9" />
-      </concept>
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
@@ -245,9 +245,17 @@
         <child id="1197683466920" name="keyType" index="3rvQeY" />
         <child id="1197683475734" name="valueType" index="3rvSg0" />
       </concept>
+      <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
       <concept id="1240824834947" name="jetbrains.mps.baseLanguage.collections.structure.ValueAccessOperation" flags="nn" index="3AV6Ez" />
       <concept id="1240825616499" name="jetbrains.mps.baseLanguage.collections.structure.KeyAccessOperation" flags="nn" index="3AY5_j" />
       <concept id="1240854379201" name="jetbrains.mps.baseLanguage.collections.structure.MappingsSetOperation" flags="nn" index="3CFNJx" />
+      <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
+        <child id="1197932505799" name="map" index="3ElQJh" />
+        <child id="1197932525128" name="key" index="3ElVtu" />
+      </concept>
+      <concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
+        <child id="5686963296372573084" name="elementType" index="3O5elw" />
+      </concept>
     </language>
   </registry>
   <node concept="312cEu" id="7kaxm0sEy3e">
@@ -347,7 +355,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="2BZXJecYNsX" role="3cqZAp" />
           </node>
           <node concept="3y3z36" id="2BZXJecYFsX" role="3clFbw">
             <node concept="2OqwBi" id="2BZXJecYNcX" role="3uHU7w">
@@ -368,6 +375,32 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="1FOQehxpElQ" role="3cqZAp" />
+        <node concept="3SKdUt" id="1FOQehxpDnl" role="3cqZAp">
+          <node concept="3SKdUq" id="1FOQehxpDnm" role="3SKWNk">
+            <property role="3SKdUp" value="ensure we can read the model" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="1FOQehxpDnn" role="3cqZAp">
+          <node concept="2OqwBi" id="1FOQehxpDno" role="3clFbG">
+            <node concept="2OqwBi" id="1FOQehxpDnp" role="2Oq$k0">
+              <node concept="2OqwBi" id="1FOQehxpDPn" role="2Oq$k0">
+                <node concept="37vLTw" id="1FOQehxpDCR" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2BZXJecYEPF" resolve="tf1" />
+                </node>
+                <node concept="2OwXpG" id="1FOQehxpEf9" role="2OqNvi">
+                  <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
+                </node>
+              </node>
+              <node concept="liA8E" id="1FOQehxpDnr" role="2OqNvi">
+                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
+              </node>
+            </node>
+            <node concept="liA8E" id="1FOQehxpDns" role="2OqNvi">
+              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess():void" resolve="checkReadAccess" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="2BZXJecYEYT" role="3cqZAp" />
         <node concept="3clFbF" id="2BZXJecYDs_" role="3cqZAp">
           <node concept="2OqwBi" id="2BZXJecYDsA" role="3clFbG">
@@ -375,7 +408,7 @@
               <ref role="3cqZAo" node="2BZXJecYEPF" resolve="tf1" />
             </node>
             <node concept="liA8E" id="2BZXJecYDsD" role="2OqNvi">
-              <ref role="37wK5l" node="3IIf9OAgpFT" resolve="calcIsConverts" />
+              <ref role="37wK5l" node="3IIf9OAgpFT" resolve="calcConverts" />
               <node concept="37vLTw" id="2BZXJecYHdM" role="37wK5m">
                 <ref role="3cqZAo" node="3IIf9OA507H" resolve="from" />
               </node>
@@ -430,68 +463,69 @@
       </node>
     </node>
     <node concept="2tJIrI" id="3IIf9O_Z6oz" role="jymVt" />
-    <node concept="2YIFZL" id="3IIf9O_tL1f" role="jymVt">
-      <property role="TrG5h" value="repository" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="3IIf9O_tJHw" role="3clF47">
-        <node concept="3cpWs8" id="3IIf9O_tJHx" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9O_tJHy" role="3cpWs9">
-            <property role="TrG5h" value="unit" />
-            <node concept="H_c77" id="3IIf9O_tJHz" role="1tU5fm" />
-            <node concept="2OqwBi" id="3IIf9O_tJH$" role="33vP2m">
-              <node concept="37vLTw" id="3IIf9O_tJH_" role="2Oq$k0">
-                <ref role="3cqZAo" node="3IIf9O_tJHs" resolve="node" />
-              </node>
-              <node concept="I4A8Y" id="3IIf9O_tJHA" role="2OqNvi" />
-            </node>
-          </node>
+    <node concept="2YIFZL" id="1FOQehxzbI0" role="jymVt">
+      <property role="TrG5h" value="forRepository" />
+      <node concept="37vLTG" id="1FOQehxzduN" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="1FOQehxzdwb" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
-        <node concept="3clFbJ" id="3IIf9O_tJHD" role="3cqZAp">
-          <node concept="3clFbS" id="3IIf9O_tJHE" role="3clFbx">
-            <node concept="3SKdUt" id="3IIf9O_tRYY" role="3cqZAp">
-              <node concept="3SKdUq" id="3IIf9O_tRZ0" role="3SKWNk">
-                <property role="3SKdUp" value="FIXME the default repository" />
+      </node>
+      <node concept="3uibUv" id="1FOQehxzdlB" role="3clF45">
+        <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingFacade" />
+      </node>
+      <node concept="3Tm1VV" id="1FOQehxzbI3" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehxzbI4" role="3clF47">
+        <node concept="3clFbF" id="1FOQehxzdzZ" role="3cqZAp">
+          <node concept="2ShNRf" id="1FOQehxzdzX" role="3clFbG">
+            <node concept="1pGfFk" id="1FOQehxzdPc" role="2ShVmc">
+              <ref role="37wK5l" node="7kaxm0sEBCn" resolve="TypecheckingFacade" />
+              <node concept="37vLTw" id="1FOQehxzdTQ" role="37wK5m">
+                <ref role="3cqZAo" node="1FOQehxzduN" resolve="repository" />
               </node>
             </node>
-            <node concept="3cpWs6" id="3IIf9O_tJHF" role="3cqZAp">
-              <node concept="2YIFZM" id="3IIf9O_tQ$z" role="3cqZAk">
-                <ref role="1Pybhc" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
-                <ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance():jetbrains.mps.smodel.MPSModuleRepository" resolve="getInstance" />
-              </node>
-            </node>
-            <node concept="3clFbH" id="3IIf9O_tRfg" role="3cqZAp" />
-          </node>
-          <node concept="3clFbC" id="3IIf9O_tJHH" role="3clFbw">
-            <node concept="10Nm6u" id="3IIf9O_tJHI" role="3uHU7w" />
-            <node concept="37vLTw" id="3IIf9O_tJHJ" role="3uHU7B">
-              <ref role="3cqZAo" node="3IIf9O_tJHy" resolve="unit" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3IIf9O_tJHK" role="3cqZAp">
-          <node concept="2OqwBi" id="3IIf9O_tJHL" role="3clFbG">
-            <node concept="2JrnkZ" id="3IIf9O_tJHM" role="2Oq$k0">
-              <node concept="37vLTw" id="3IIf9O_tJHN" role="2JrQYb">
-                <ref role="3cqZAo" node="3IIf9O_tJHy" resolve="unit" />
-              </node>
-            </node>
-            <node concept="liA8E" id="3IIf9O_tJHO" role="2OqNvi">
-              <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-            </node>
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="3IIf9O_tJHs" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <node concept="3Tqbb2" id="3IIf9O_tJHt" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="3IIf9O_tJHu" role="3clF45">
-        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-      </node>
-      <node concept="3Tm6S6" id="3IIf9O_tJHv" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="3IIf9O_Z7tT" role="jymVt" />
+    <node concept="2tJIrI" id="1FOQehxza6I" role="jymVt" />
+    <node concept="3clFb_" id="5KrJ7UHN1Lk" role="jymVt">
+      <property role="TrG5h" value="withReportSink" />
+      <node concept="37vLTG" id="5KrJ7UHN3Ep" role="3clF46">
+        <property role="TrG5h" value="reporter" />
+        <node concept="3uibUv" id="5KrJ7UHN474" role="1tU5fm">
+          <ref role="3uigEE" to="1yqb:5KrJ7UHMRRs" resolve="ReportSink" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="5KrJ7UHN2kK" role="3clF45">
+        <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingFacade" />
+      </node>
+      <node concept="3Tm1VV" id="5KrJ7UHN1Ln" role="1B3o_S" />
+      <node concept="3clFbS" id="5KrJ7UHN1Lo" role="3clF47">
+        <node concept="3SKdUt" id="5KrJ7UHN4OP" role="3cqZAp">
+          <node concept="3SKdUq" id="5KrJ7UHN4OR" role="3SKWNk">
+            <property role="3SKdUp" value="FIXME check the reporter hasn't been set already" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="5KrJ7UHN48u" role="3cqZAp">
+          <node concept="37vLTI" id="5KrJ7UHN4_M" role="3clFbG">
+            <node concept="37vLTw" id="5KrJ7UHN4EN" role="37vLTx">
+              <ref role="3cqZAo" node="5KrJ7UHN3Ep" resolve="reporter" />
+            </node>
+            <node concept="2OqwBi" id="5KrJ7UHN4dA" role="37vLTJ">
+              <node concept="Xjq3P" id="5KrJ7UHN48t" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5KrJ7UHN4pZ" role="2OqNvi">
+                <ref role="2Oxat5" node="5KrJ7UHMZjn" resolve="reportSink" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5KrJ7UHN4Mn" role="3cqZAp">
+          <node concept="Xjq3P" id="5KrJ7UHN4Ml" role="3clFbG" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehwZRKI" role="jymVt" />
     <node concept="3clFb_" id="3IIf9O_tkwF" role="jymVt">
       <property role="TrG5h" value="getTypeOf" />
       <node concept="37vLTG" id="3IIf9O_tkBA" role="3clF46">
@@ -521,7 +555,7 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="3IIf9O_tnms" role="3cqZAp" />
+        <node concept="3clFbH" id="1FOQehxpJtt" role="3cqZAp" />
         <node concept="3cpWs8" id="3IIf9O_tnmt" role="3cqZAp">
           <node concept="3cpWsn" id="3IIf9O_tnmu" role="3cpWs9">
             <property role="TrG5h" value="containingRoot" />
@@ -553,8 +587,8 @@
         <node concept="3cpWs8" id="3IIf9O_tnmN" role="3cqZAp">
           <node concept="3cpWsn" id="3IIf9O_tnmO" role="3cpWs9">
             <property role="TrG5h" value="typesCache" />
-            <node concept="3uibUv" id="3IIf9O_tnmP" role="1tU5fm">
-              <ref role="3uigEE" to="qox2:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
+            <node concept="3uibUv" id="1FOQehxe$yt" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
             </node>
             <node concept="2OqwBi" id="3IIf9O_tnmQ" role="33vP2m">
               <node concept="37vLTw" id="3IIf9O_tnmR" role="2Oq$k0">
@@ -603,14 +637,11 @@
                       <node concept="3clFbS" id="3IIf9O_tnna" role="1bW5cS">
                         <node concept="3clFbF" id="3IIf9O_tnnb" role="3cqZAp">
                           <node concept="1rXfSq" id="3IIf9O_tnnc" role="3clFbG">
-                            <ref role="37wK5l" node="3IIf9O_qVvl" resolve="calcTypecheckingCache" />
+                            <ref role="37wK5l" node="3IIf9O_qVvl" resolve="calcTypeCache" />
                             <node concept="10M0yZ" id="2Mi2iz0OEzQ" role="37wK5m">
                               <ref role="3cqZAo" node="4t7Xo7inNvw" resolve="TYPECHECK" />
                               <ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
                             </node>
-                            <node concept="37vLTw" id="3IIf9O_tnne" role="37wK5m">
-                              <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
-                            </node>
                             <node concept="2ShNRf" id="3IIf9O_tnnf" role="37wK5m">
                               <node concept="Tc6Ow" id="3IIf9O_tnng" role="2ShVmc">
                                 <node concept="3Tqbb2" id="3IIf9O_tnnh" role="HW$YZ" />
@@ -681,204 +712,217 @@
       <node concept="P$JXv" id="3IIf9O_tpzW" role="lGtFl">
         <node concept="TZ5HA" id="3IIf9O_tpzX" role="TZ5H$">
           <node concept="1dT_AC" id="3IIf9O_tpzY" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the type assigned to an expression denoted by `node`, or null." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1FOQehxLudl" role="TZ5H$">
+          <node concept="1dT_AC" id="1FOQehxLudm" role="1dT_Ay">
+            <property role="1dT_AB" value="Uses cache internally." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1FOQehxLucl" role="TZ5H$">
+          <node concept="1dT_AC" id="1FOQehxLucm" role="1dT_Ay">
             <property role="1dT_AB" value="Must be called in a read action." />
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="3IIf9OA6IYd" role="jymVt" />
-    <node concept="3clFb_" id="3IIf9OAgpFT" role="jymVt">
-      <property role="TrG5h" value="calcIsConverts" />
-      <node concept="37vLTG" id="3IIf9OAgpZx" role="3clF46">
-        <property role="TrG5h" value="from" />
-        <node concept="3Tqbb2" id="3IIf9OAgs8v" role="1tU5fm" />
+    <node concept="2tJIrI" id="5KrJ7UHMNU3" role="jymVt" />
+    <node concept="3clFb_" id="1FOQehxdXIx" role="jymVt">
+      <property role="TrG5h" value="checkTypes" />
+      <node concept="37vLTG" id="1FOQehxdZUm" role="3clF46">
+        <property role="TrG5h" value="root" />
+        <node concept="3Tqbb2" id="1FOQehxe0rQ" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="3IIf9OAgs8X" role="3clF46">
-        <property role="TrG5h" value="to" />
-        <node concept="3Tqbb2" id="3IIf9OAgspX" role="1tU5fm" />
+      <node concept="3uibUv" id="1FOQehxe3$g" role="3clF45">
+        <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
       </node>
-      <node concept="10P_77" id="3IIf9OAgqhD" role="3clF45" />
-      <node concept="3Tm1VV" id="3IIf9OAgpFW" role="1B3o_S" />
-      <node concept="3clFbS" id="3IIf9OAgpFX" role="3clF47">
-        <node concept="3SKdUt" id="3IIf9OAgsqm" role="3cqZAp">
-          <node concept="3SKdUq" id="3IIf9OAgsqn" role="3SKWNk">
+      <node concept="3Tm1VV" id="1FOQehxdXI$" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehxdXI_" role="3clF47">
+        <node concept="3SKdUt" id="1FOQehxe0sZ" role="3cqZAp">
+          <node concept="3SKdUq" id="1FOQehxe0t0" role="3SKWNk">
             <property role="3SKdUp" value="ensure we can read the model" />
           </node>
         </node>
-        <node concept="3clFbF" id="3IIf9OAgsqo" role="3cqZAp">
-          <node concept="2OqwBi" id="3IIf9OAgsqp" role="3clFbG">
-            <node concept="2OqwBi" id="3IIf9OAgsqq" role="2Oq$k0">
-              <node concept="37vLTw" id="3IIf9OAgsqr" role="2Oq$k0">
+        <node concept="3clFbF" id="1FOQehxe0t1" role="3cqZAp">
+          <node concept="2OqwBi" id="1FOQehxe0t2" role="3clFbG">
+            <node concept="2OqwBi" id="1FOQehxe0t3" role="2Oq$k0">
+              <node concept="37vLTw" id="1FOQehxe0t4" role="2Oq$k0">
                 <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
               </node>
-              <node concept="liA8E" id="3IIf9OAgsqs" role="2OqNvi">
+              <node concept="liA8E" id="1FOQehxe0t5" role="2OqNvi">
                 <ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
               </node>
             </node>
-            <node concept="liA8E" id="3IIf9OAgsqt" role="2OqNvi">
+            <node concept="liA8E" id="1FOQehxe0t6" role="2OqNvi">
               <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess():void" resolve="checkReadAccess" />
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="3IIf9OAgszp" role="3cqZAp" />
-        <node concept="3cpWs8" id="3IIf9OAm07j" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9OAm07k" role="3cpWs9">
-            <property role="TrG5h" value="nodes" />
-            <node concept="_YKpA" id="3IIf9OAm07d" role="1tU5fm">
-              <node concept="3Tqbb2" id="3IIf9OAm07g" role="_ZDj9" />
-            </node>
-            <node concept="2ShNRf" id="3IIf9OAm07l" role="33vP2m">
-              <node concept="Tc6Ow" id="3IIf9OAm07m" role="2ShVmc">
-                <node concept="3Tqbb2" id="3IIf9OAm07n" role="HW$YZ" />
-                <node concept="37vLTw" id="3IIf9OAm07o" role="HW$Y0">
-                  <ref role="3cqZAo" node="3IIf9OAgpZx" resolve="from" />
-                </node>
-                <node concept="37vLTw" id="3IIf9OAm07p" role="HW$Y0">
-                  <ref role="3cqZAo" node="3IIf9OAgs8X" resolve="to" />
+        <node concept="3clFbH" id="1FOQehxe1WI" role="3cqZAp" />
+        <node concept="3clFbJ" id="1FOQehxe0DU" role="3cqZAp">
+          <node concept="3clFbS" id="1FOQehxe0DW" role="3clFbx">
+            <node concept="YS8fn" id="1FOQehxe1zc" role="3cqZAp">
+              <node concept="2ShNRf" id="1FOQehxe1$D" role="YScLw">
+                <node concept="1pGfFk" id="1FOQehxe1PX" role="2ShVmc">
+                  <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;()" resolve="IllegalArgumentException" />
                 </node>
               </node>
             </node>
           </node>
-        </node>
-        <node concept="3cpWs8" id="3IIf9OAgt3E" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9OAgt3F" role="3cpWs9">
-            <property role="TrG5h" value="applyTemplatesStep" />
-            <node concept="3uibUv" id="3IIf9OAgt3G" role="1tU5fm">
-              <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+          <node concept="3y3z36" id="1FOQehxe14$" role="3clFbw">
+            <node concept="2OqwBi" id="1FOQehxe1db" role="3uHU7w">
+              <node concept="37vLTw" id="1FOQehxe17a" role="2Oq$k0">
+                <ref role="3cqZAo" node="1FOQehxdZUm" resolve="root" />
+              </node>
+              <node concept="2Rxl7S" id="1FOQehxe1xA" role="2OqNvi" />
             </node>
-            <node concept="2ShNRf" id="3IIf9OAgt3H" role="33vP2m">
-              <node concept="1pGfFk" id="3IIf9OAgt3I" role="2ShVmc">
-                <ref role="37wK5l" to="1yqb:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
-                <node concept="2YIFZM" id="78H58oeKQ9V" role="37wK5m">
-                  <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
-                  <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
-                </node>
-                <node concept="37vLTw" id="3IIf9OAm07q" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9OAm07k" resolve="nodes" />
-                </node>
-                <node concept="37vLTw" id="3IIf9OAgt3L" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
-                </node>
-                <node concept="10M0yZ" id="2Mi2iz0Ozas" role="37wK5m">
-                  <ref role="3cqZAo" node="4t7Xo7inO_s" resolve="CONVERT" />
-                  <ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-                </node>
-                <node concept="37vLTw" id="2BZXJed36om" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9OAgpZx" resolve="from" />
-                </node>
-                <node concept="37vLTw" id="2BZXJed36Nj" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9OAgs8X" resolve="to" />
-                </node>
+            <node concept="37vLTw" id="1FOQehxe0GC" role="3uHU7B">
+              <ref role="3cqZAo" node="1FOQehxdZUm" resolve="root" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="1FOQehxe22T" role="3cqZAp">
+          <node concept="3cpWsn" id="1FOQehxe22U" role="3cpWs9">
+            <property role="TrG5h" value="tc" />
+            <node concept="3uibUv" id="1FOQehxe22V" role="1tU5fm">
+              <ref role="3uigEE" to="qox2:4Z$O9mrQIzY" resolve="TypecheckingCache" />
+            </node>
+            <node concept="2YIFZM" id="1FOQehxe22W" role="33vP2m">
+              <ref role="1Pybhc" to="qox2:4Z$O9mrQIzY" resolve="TypecheckingCache" />
+              <ref role="37wK5l" to="qox2:4Z$O9mrQIG1" resolve="get" />
+              <node concept="37vLTw" id="1FOQehxe22X" role="37wK5m">
+                <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="3IIf9OAgt3M" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9OAgt3N" role="3cpWs9">
-            <property role="TrG5h" value="evaluateRulesStep" />
-            <property role="3TUv4t" value="false" />
-            <node concept="3uibUv" id="NKt6yn93w6" role="1tU5fm">
-              <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+        <node concept="3cpWs8" id="1FOQehxe22Y" role="3cqZAp">
+          <node concept="3cpWsn" id="1FOQehxe22Z" role="3cpWs9">
+            <property role="TrG5h" value="typesCache" />
+            <node concept="3uibUv" id="1FOQehxe_aJ" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
             </node>
-            <node concept="2ShNRf" id="3IIf9OAgt3P" role="33vP2m">
-              <node concept="1pGfFk" id="NKt6yn93VV" role="2ShVmc">
-                <ref role="37wK5l" to="tj24:NKt6yn87iq" resolve="TypecheckingStep" />
-                <node concept="37vLTw" id="3IIf9OAgt3R" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
-                </node>
-                <node concept="37vLTw" id="3IIf9OAm0Wh" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9OAm07k" resolve="nodes" />
-                </node>
+            <node concept="2OqwBi" id="1FOQehxe23d" role="33vP2m">
+              <node concept="37vLTw" id="1FOQehxe23e" role="2Oq$k0">
+                <ref role="3cqZAo" node="1FOQehxe22U" resolve="tc" />
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3IIf9OAgszz" role="3cqZAp" />
-        <node concept="3cpWs8" id="3IIf9OAgvDK" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9OAgvDL" role="3cpWs9">
-            <property role="TrG5h" value="helper" />
-            <node concept="3uibUv" id="3IIf9OAgvDM" role="1tU5fm">
-              <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
-            </node>
-            <node concept="2ShNRf" id="3IIf9OAgvDN" role="33vP2m">
-              <node concept="1pGfFk" id="3IIf9OAgvDO" role="2ShVmc">
-                <ref role="37wK5l" to="1yqb:443LGHBiDEV" resolve="CoderulesHelper" />
-                <node concept="37vLTw" id="3IIf9OAgvDP" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9OAgt3F" resolve="applyTemplatesStep" />
-                </node>
-                <node concept="37vLTw" id="3IIf9OAgvDQ" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9OAgt3N" resolve="evaluateRulesStep" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="2BZXJecZOHq" role="3cqZAp" />
-        <node concept="SfApY" id="2BZXJecZP8N" role="3cqZAp">
-          <node concept="3clFbS" id="2BZXJecZP8P" role="SfCbr">
-            <node concept="3cpWs8" id="3IIf9OAgx7T" role="3cqZAp">
-              <node concept="3cpWsn" id="3IIf9OAgx7U" role="3cpWs9">
-                <property role="TrG5h" value="lastStep" />
-                <node concept="3uibUv" id="3IIf9OAgx74" role="1tU5fm">
-                  <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
-                  <node concept="3qTvmN" id="3IIf9OAgx77" role="11_B2D" />
-                </node>
-                <node concept="2OqwBi" id="3IIf9OAgx7V" role="33vP2m">
-                  <node concept="2OqwBi" id="3IIf9OAgx7W" role="2Oq$k0">
-                    <node concept="37vLTw" id="3IIf9OAgx7X" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3IIf9OAgvDL" resolve="helper" />
+              <node concept="liA8E" id="1FOQehxe23f" role="2OqNvi">
+                <ref role="37wK5l" to="qox2:6QH_LDtbsGz" resolve="updateCachedTypes" />
+                <node concept="2OqwBi" id="1FOQehxe23g" role="37wK5m">
+                  <node concept="2JrnkZ" id="1FOQehxe23h" role="2Oq$k0">
+                    <node concept="37vLTw" id="1FOQehxe2If" role="2JrQYb">
+                      <ref role="3cqZAo" node="1FOQehxdZUm" resolve="root" />
                     </node>
-                    <node concept="liA8E" id="3IIf9OAgx7Y" role="2OqNvi">
-                      <ref role="37wK5l" to="1yqb:2mbQB8J5m$l" resolve="scheduleExecute" />
-                      <node concept="2YIFZM" id="NKt6yn9ky3" role="37wK5m">
-                        <ref role="37wK5l" to="1yqb:3KwBCAA_erO" resolve="blocking" />
-                        <ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
+                  </node>
+                  <node concept="liA8E" id="1FOQehxe23j" role="2OqNvi">
+                    <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                  </node>
+                </node>
+                <node concept="1bVj0M" id="1FOQehxe23k" role="37wK5m">
+                  <node concept="3clFbS" id="1FOQehxe23l" role="1bW5cS">
+                    <node concept="3clFbF" id="1FOQehxe23m" role="3cqZAp">
+                      <node concept="1rXfSq" id="1FOQehxe23n" role="3clFbG">
+                        <ref role="37wK5l" node="3IIf9O_qVvl" resolve="calcTypeCache" />
+                        <node concept="10M0yZ" id="1FOQehxe23o" role="37wK5m">
+                          <ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+                          <ref role="3cqZAo" node="4t7Xo7inNvw" resolve="TYPECHECK" />
+                        </node>
+                        <node concept="2ShNRf" id="1FOQehxe23q" role="37wK5m">
+                          <node concept="Tc6Ow" id="1FOQehxe23r" role="2ShVmc">
+                            <node concept="3Tqbb2" id="1FOQehxe23s" role="HW$YZ" />
+                            <node concept="37vLTw" id="1FOQehxe2Oq" role="HW$Y0">
+                              <ref role="3cqZAo" node="1FOQehxdZUm" resolve="root" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
-                  </node>
-                  <node concept="liA8E" id="3IIf9OAgx80" role="2OqNvi">
-                    <ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
+                    <node concept="3clFbH" id="1FOQehxe23u" role="3cqZAp" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3cpWs6" id="2BZXJecZTz9" role="3cqZAp">
-              <node concept="3clFbT" id="2BZXJecZTXe" role="3cqZAk">
-                <property role="3clFbU" value="true" />
-              </node>
-            </node>
-            <node concept="3clFbH" id="2BZXJecZUj8" role="3cqZAp" />
           </node>
-          <node concept="TDmWw" id="2BZXJecZP8Q" role="TEbGg">
-            <node concept="3cpWsn" id="2BZXJecZP8S" role="TDEfY">
-              <property role="TrG5h" value="ignore" />
-              <node concept="3uibUv" id="2BZXJecZPm3" role="1tU5fm">
-                <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
-              </node>
-            </node>
-            <node concept="3clFbS" id="2BZXJecZP8W" role="TDEfX">
-              <node concept="34ab3g" id="2BZXJed2IvJ" role="3cqZAp">
-                <property role="35gtTG" value="warn" />
-                <property role="34fQS0" value="true" />
-                <node concept="Xl_RD" id="2BZXJed2IvL" role="34bqiv">
-                  <property role="Xl_RC" value="error evaluating rules" />
-                </node>
-                <node concept="37vLTw" id="2BZXJed2IvN" role="34bMjA">
-                  <ref role="3cqZAo" node="2BZXJecZP8S" resolve="ignore" />
-                </node>
-              </node>
-              <node concept="3clFbH" id="2BZXJed2I7p" role="3cqZAp" />
-              <node concept="3cpWs6" id="2BZXJecZP$A" role="3cqZAp">
-                <node concept="3clFbT" id="2BZXJecZPVl" role="3cqZAk">
-                  <property role="3clFbU" value="false" />
-                </node>
-              </node>
-            </node>
+        </node>
+        <node concept="3clFbF" id="1FOQehxegwZ" role="3cqZAp">
+          <node concept="37vLTw" id="1FOQehxegwX" role="3clFbG">
+            <ref role="3cqZAo" node="1FOQehxe22Z" resolve="typesCache" />
+          </node>
+        </node>
+      </node>
+      <node concept="P$JXv" id="1FOQehxnndd" role="lGtFl">
+        <node concept="TZ5HA" id="1FOQehxnnde" role="TZ5H$">
+          <node concept="1dT_AC" id="1FOQehxnndf" role="1dT_Ay">
+            <property role="1dT_AB" value="Checks all types within a root." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1FOQehxLwLl" role="TZ5H$">
+          <node concept="1dT_AC" id="1FOQehxLwLm" role="1dT_Ay">
+            <property role="1dT_AB" value="Clears the cache before execution." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1FOQehxLwIa" role="TZ5H$">
+          <node concept="1dT_AC" id="1FOQehxLwIb" role="1dT_Ay">
+            <property role="1dT_AB" value="Must be called in a read action. " />
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="3IIf9OAgpnk" role="jymVt" />
+    <node concept="2tJIrI" id="1FOQehxnwar" role="jymVt" />
+    <node concept="3clFb_" id="1FOQehxpov2" role="jymVt">
+      <property role="TrG5h" value="getTypeLocally" />
+      <node concept="37vLTG" id="1FOQehxpyuZ" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="1FOQehxpzJG" role="1tU5fm" />
+      </node>
+      <node concept="3Tqbb2" id="1FOQehxpsm7" role="3clF45" />
+      <node concept="3Tm1VV" id="1FOQehxpov5" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehxpov6" role="3clF47">
+        <node concept="3SKdUt" id="1FOQehxnAVA" role="3cqZAp">
+          <node concept="3SKdUq" id="1FOQehxnAVB" role="3SKWNk">
+            <property role="3SKdUp" value="ensure we can read the model" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="1FOQehxnAVC" role="3cqZAp">
+          <node concept="2OqwBi" id="1FOQehxnAVD" role="3clFbG">
+            <node concept="2OqwBi" id="1FOQehxnAVE" role="2Oq$k0">
+              <node concept="37vLTw" id="1FOQehxnAVF" role="2Oq$k0">
+                <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+              <node concept="liA8E" id="1FOQehxnAVG" role="2OqNvi">
+                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
+              </node>
+            </node>
+            <node concept="liA8E" id="1FOQehxnAVH" role="2OqNvi">
+              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess():void" resolve="checkReadAccess" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1FOQehxnB32" role="3cqZAp" />
+        <node concept="3clFbF" id="1FOQehxpAiY" role="3cqZAp">
+          <node concept="1rXfSq" id="1FOQehxpAiX" role="3clFbG">
+            <ref role="37wK5l" node="1FOQehxnxRH" resolve="calcTypeLocally" />
+            <node concept="37vLTw" id="1FOQehxpApw" role="37wK5m">
+              <ref role="3cqZAo" node="1FOQehxpyuZ" resolve="node" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="P$JXv" id="1FOQehxyOx8" role="lGtFl">
+        <node concept="TZ5HA" id="1FOQehxyOx9" role="TZ5H$">
+          <node concept="1dT_AC" id="1FOQehxyOxa" role="1dT_Ay">
+            <property role="1dT_AB" value="Gets the type using &quot;local&quot; inference. Doesn't build or use any caches." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1FOQehxLwMj" role="TZ5H$">
+          <node concept="1dT_AC" id="1FOQehxLwMk" role="1dT_Ay">
+            <property role="1dT_AB" value="Must be called in a read action." />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehxpn35" role="jymVt" />
     <node concept="3clFbW" id="7kaxm0sEBCn" role="jymVt">
       <node concept="37vLTG" id="3IIf9O_u8h8" role="3clF46">
         <property role="TrG5h" value="repository" />
@@ -904,9 +948,262 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="3IIf9O_qYyg" role="jymVt" />
+    <node concept="2tJIrI" id="5KrJ7UHMYFT" role="jymVt" />
+    <node concept="3clFbW" id="5KrJ7UHMY7K" role="jymVt">
+      <node concept="37vLTG" id="5KrJ7UHMY7L" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="5KrJ7UHMY7M" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5KrJ7UHMZgn" role="3clF46">
+        <property role="TrG5h" value="reporter" />
+        <node concept="3uibUv" id="5KrJ7UHMZgo" role="1tU5fm">
+          <ref role="3uigEE" to="1yqb:5KrJ7UHMRRs" resolve="ReportSink" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="5KrJ7UHMY7N" role="3clF45" />
+      <node concept="3Tmbuc" id="5KrJ7UHMY7O" role="1B3o_S" />
+      <node concept="3clFbS" id="5KrJ7UHMY7P" role="3clF47">
+        <node concept="3clFbF" id="5KrJ7UHMY7Q" role="3cqZAp">
+          <node concept="37vLTI" id="5KrJ7UHMY7R" role="3clFbG">
+            <node concept="2OqwBi" id="5KrJ7UHMY7S" role="37vLTJ">
+              <node concept="Xjq3P" id="5KrJ7UHMY7T" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5KrJ7UHMY7U" role="2OqNvi">
+                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="5KrJ7UHMY7V" role="37vLTx">
+              <ref role="3cqZAo" node="5KrJ7UHMY7L" resolve="repository" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5KrJ7UHMZjr" role="3cqZAp">
+          <node concept="37vLTI" id="5KrJ7UHMZjt" role="3clFbG">
+            <node concept="2OqwBi" id="5KrJ7UHMZU7" role="37vLTJ">
+              <node concept="Xjq3P" id="5KrJ7UHMZVl" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5KrJ7UHMZUa" role="2OqNvi">
+                <ref role="2Oxat5" node="5KrJ7UHMZjn" resolve="reportSink" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="5KrJ7UHMZjx" role="37vLTx">
+              <ref role="3cqZAo" node="5KrJ7UHMZgn" resolve="reporter" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehwZVz0" role="jymVt" />
+    <node concept="3clFb_" id="1FOQehxnxRH" role="jymVt">
+      <property role="TrG5h" value="calcTypeLocally" />
+      <node concept="37vLTG" id="1FOQehxnAn0" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="1FOQehxnB50" role="1tU5fm" />
+      </node>
+      <node concept="3Tqbb2" id="1FOQehxoNPI" role="3clF45" />
+      <node concept="3Tm6S6" id="1FOQehxoGRJ" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehxnxRL" role="3clF47">
+        <node concept="3cpWs8" id="1FOQehxoMr3" role="3cqZAp">
+          <node concept="3cpWsn" id="1FOQehxoMr4" role="3cpWs9">
+            <property role="TrG5h" value="helper" />
+            <node concept="3uibUv" id="1FOQehxoMr5" role="1tU5fm">
+              <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
+            </node>
+            <node concept="1rXfSq" id="1FOQehxoMr6" role="33vP2m">
+              <ref role="37wK5l" node="1FOQehxnBew" resolve="helper" />
+              <node concept="2ShNRf" id="1FOQehxoMr7" role="37wK5m">
+                <node concept="Tc6Ow" id="1FOQehxoMr8" role="2ShVmc">
+                  <node concept="3Tqbb2" id="1FOQehxoMr9" role="HW$YZ" />
+                  <node concept="37vLTw" id="1FOQehxoMTH" role="HW$Y0">
+                    <ref role="3cqZAo" node="1FOQehxnAn0" resolve="node" />
+                  </node>
+                </node>
+              </node>
+              <node concept="10M0yZ" id="1FOQehxoN18" role="37wK5m">
+                <ref role="3cqZAo" node="4t7Xo7inNvw" resolve="TYPECHECK" />
+                <ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1FOQehxoMns" role="3cqZAp" />
+        <node concept="SfApY" id="1FOQehxoN4w" role="3cqZAp">
+          <node concept="3clFbS" id="1FOQehxoN4x" role="SfCbr">
+            <node concept="3cpWs8" id="1FOQehxoN4y" role="3cqZAp">
+              <node concept="3cpWsn" id="1FOQehxoN4z" role="3cpWs9">
+                <property role="TrG5h" value="lastStep" />
+                <node concept="3uibUv" id="1FOQehxoN4$" role="1tU5fm">
+                  <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
+                  <node concept="3qTvmN" id="1FOQehxoN4_" role="11_B2D" />
+                </node>
+                <node concept="2OqwBi" id="1FOQehxoN4A" role="33vP2m">
+                  <node concept="2OqwBi" id="1FOQehxoN4B" role="2Oq$k0">
+                    <node concept="37vLTw" id="1FOQehxoN4C" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1FOQehxoMr4" resolve="helper" />
+                    </node>
+                    <node concept="liA8E" id="1FOQehxoN4D" role="2OqNvi">
+                      <ref role="37wK5l" to="1yqb:2mbQB8J5m$l" resolve="scheduleExecute" />
+                      <node concept="2YIFZM" id="1FOQehxoN4E" role="37wK5m">
+                        <ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
+                        <ref role="37wK5l" to="1yqb:3KwBCAA_erO" resolve="blocking" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="1FOQehxoN4F" role="2OqNvi">
+                    <ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="1FOQehxoN4G" role="3cqZAp">
+              <node concept="3clFbS" id="1FOQehxoN4H" role="3clFbx">
+                <node concept="3cpWs8" id="1FOQehxoN4I" role="3cqZAp">
+                  <node concept="3cpWsn" id="1FOQehxoN4J" role="3cpWs9">
+                    <property role="TrG5h" value="step" />
+                    <node concept="3uibUv" id="1FOQehxoN4K" role="1tU5fm">
+                      <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                    </node>
+                    <node concept="1eOMI4" id="1FOQehxoN4L" role="33vP2m">
+                      <node concept="10QFUN" id="1FOQehxoN4M" role="1eOMHV">
+                        <node concept="3uibUv" id="1FOQehxoN4N" role="10QFUM">
+                          <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                        </node>
+                        <node concept="37vLTw" id="1FOQehxoN4O" role="10QFUP">
+                          <ref role="3cqZAo" node="1FOQehxoN4z" resolve="lastStep" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="1FOQehxoN4P" role="3cqZAp">
+                  <node concept="1rXfSq" id="1FOQehxoN4Q" role="3clFbG">
+                    <ref role="37wK5l" node="1FOQehxolKb" resolve="forwardReportItems" />
+                    <node concept="2OqwBi" id="1FOQehxoN4R" role="37wK5m">
+                      <node concept="37vLTw" id="1FOQehxoN4S" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1FOQehxoN4J" resolve="step" />
+                      </node>
+                      <node concept="liA8E" id="1FOQehxoN4T" role="2OqNvi">
+                        <ref role="37wK5l" to="tj24:1FOQehx3WGd" resolve="getReportItems" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="1FOQehxoQvt" role="3cqZAp" />
+                <node concept="3cpWs8" id="2Qe6u2c8pS7" role="3cqZAp">
+                  <node concept="3cpWsn" id="2Qe6u2c8pS8" role="3cpWs9">
+                    <property role="TrG5h" value="localType" />
+                    <node concept="3Tqbb2" id="2Qe6u2c8pRu" role="1tU5fm" />
+                    <node concept="3EllGN" id="1FOQehxoT1P" role="33vP2m">
+                      <node concept="2OqwBi" id="1FOQehxoUTh" role="3ElVtu">
+                        <node concept="2JrnkZ" id="1FOQehxoUAZ" role="2Oq$k0">
+                          <node concept="37vLTw" id="1FOQehxoTH7" role="2JrQYb">
+                            <ref role="3cqZAo" node="1FOQehxnAn0" resolve="node" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="1FOQehxoVgF" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="2Qe6u2c8pSd" role="3ElQJh">
+                        <node concept="1eOMI4" id="2Qe6u2c8pSe" role="2Oq$k0">
+                          <node concept="10QFUN" id="2Qe6u2c8pSf" role="1eOMHV">
+                            <node concept="3uibUv" id="78H58of7KjA" role="10QFUM">
+                              <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                            </node>
+                            <node concept="37vLTw" id="1FOQehxoRYf" role="10QFUP">
+                              <ref role="3cqZAo" node="1FOQehxoN4z" resolve="lastStep" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="2Qe6u2c8pSi" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:7lt0LtQA50L" resolve="getTypeNodes" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs6" id="1FOQehxp3nN" role="3cqZAp">
+                  <node concept="37vLTw" id="1FOQehxp4Rg" role="3cqZAk">
+                    <ref role="3cqZAo" node="2Qe6u2c8pS8" resolve="localType" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2ZW3vV" id="1FOQehxoN4U" role="3clFbw">
+                <node concept="3uibUv" id="1FOQehxoN4V" role="2ZW6by">
+                  <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                </node>
+                <node concept="37vLTw" id="1FOQehxoN4W" role="2ZW6bz">
+                  <ref role="3cqZAo" node="1FOQehxoN4z" resolve="lastStep" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="1FOQehxoN50" role="3cqZAp" />
+          </node>
+          <node concept="TDmWw" id="1FOQehxoN51" role="TEbGg">
+            <node concept="3cpWsn" id="1FOQehxoN52" role="TDEfY">
+              <property role="TrG5h" value="ex" />
+              <node concept="3uibUv" id="1FOQehxoN53" role="1tU5fm">
+                <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
+              </node>
+            </node>
+            <node concept="3clFbS" id="1FOQehxoN54" role="TDEfX">
+              <node concept="3clFbJ" id="1FOQehxyuTj" role="3cqZAp">
+                <node concept="3clFbS" id="1FOQehxyuTk" role="3clFbx">
+                  <node concept="3clFbF" id="1FOQehxyuTl" role="3cqZAp">
+                    <node concept="2OqwBi" id="1FOQehxyuTm" role="3clFbG">
+                      <node concept="37vLTw" id="1FOQehxyuTn" role="2Oq$k0">
+                        <ref role="3cqZAo" node="5KrJ7UHMZjn" resolve="reportSink" />
+                      </node>
+                      <node concept="liA8E" id="1FOQehxyuTo" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:5KrJ7UHMRSa" resolve="report" />
+                        <node concept="2ShNRf" id="1FOQehxyuTp" role="37wK5m">
+                          <node concept="1pGfFk" id="1FOQehxyuTq" role="2ShVmc">
+                            <ref role="37wK5l" node="1FOQehxyAYy" resolve="LaunchProblemReportItem" />
+                            <node concept="Rm8GO" id="1FOQehxyuTr" role="37wK5m">
+                              <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                              <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
+                            </node>
+                            <node concept="Xl_RD" id="1FOQehxyuTs" role="37wK5m">
+                              <property role="Xl_RC" value="error launching typechecking" />
+                            </node>
+                            <node concept="37vLTw" id="1FOQehxyEh6" role="37wK5m">
+                              <ref role="3cqZAo" node="1FOQehxoN52" resolve="ex" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3y3z36" id="1FOQehxyuTt" role="3clFbw">
+                  <node concept="10Nm6u" id="1FOQehxyuTu" role="3uHU7w" />
+                  <node concept="37vLTw" id="1FOQehxyuTv" role="3uHU7B">
+                    <ref role="3cqZAo" node="5KrJ7UHMZjn" resolve="reportSink" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="1FOQehxyuTe" role="3cqZAp" />
+              <node concept="RRSsy" id="1FOQehxoN55" role="3cqZAp">
+                <property role="RRSoG" value="warn" />
+                <node concept="Xl_RD" id="1FOQehxoN56" role="RRSoy">
+                  <property role="Xl_RC" value="error launching typechecking" />
+                </node>
+                <node concept="37vLTw" id="1FOQehxoN57" role="RRSow">
+                  <ref role="3cqZAo" node="1FOQehxoN52" resolve="ex" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1FOQehxpgxp" role="3cqZAp" />
+        <node concept="3cpWs6" id="1FOQehxoN59" role="3cqZAp">
+          <node concept="10Nm6u" id="1FOQehxp7wR" role="3cqZAk" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehxdWhp" role="jymVt" />
     <node concept="3clFb_" id="3IIf9O_qVvl" role="jymVt">
-      <property role="TrG5h" value="calcTypecheckingCache" />
+      <property role="TrG5h" value="calcTypeCache" />
       <node concept="3Tm6S6" id="3IIf9O_qVvm" role="1B3o_S" />
       <node concept="3uibUv" id="3IIf9O_qZis" role="3clF45">
         <ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="ModelTypeCache" />
@@ -917,12 +1214,6 @@
           <ref role="3uigEE" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
         </node>
       </node>
-      <node concept="37vLTG" id="3IIf9O_qVvb" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="3IIf9O_qVvc" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
       <node concept="37vLTG" id="3IIf9O_qVvd" role="3clF46">
         <property role="TrG5h" value="nodes" />
         <node concept="2I9FWS" id="3IIf9O_rcZS" role="1tU5fm" />
@@ -941,70 +1232,23 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="3IIf9O_qVtF" role="3cqZAp" />
-        <node concept="3cpWs8" id="3IIf9O_qVtG" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9O_qVtH" role="3cpWs9">
-            <property role="TrG5h" value="applyTemplatesStep" />
-            <node concept="3uibUv" id="3IIf9O_qVtI" role="1tU5fm">
-              <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-            </node>
-            <node concept="2ShNRf" id="3IIf9O_qVtJ" role="33vP2m">
-              <node concept="1pGfFk" id="3IIf9O_qVtK" role="2ShVmc">
-                <ref role="37wK5l" to="1yqb:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
-                <node concept="2YIFZM" id="78H58oeKRUy" role="37wK5m">
-                  <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
-                  <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
-                </node>
-                <node concept="37vLTw" id="3IIf9O_qVvh" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_qVvd" resolve="nodes" />
-                </node>
-                <node concept="37vLTw" id="3IIf9O_qVvf" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_qVvb" resolve="repository" />
-                </node>
-                <node concept="37vLTw" id="2Mi2iz0ODA$" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_r1EB" resolve="queryKind" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3IIf9O_qVtN" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9O_qVtO" role="3cpWs9">
-            <property role="TrG5h" value="evaluateRulesStep" />
-            <property role="3TUv4t" value="false" />
-            <node concept="3uibUv" id="NKt6yn8yik" role="1tU5fm">
-              <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
-            </node>
-            <node concept="2ShNRf" id="3IIf9O_qVtQ" role="33vP2m">
-              <node concept="1pGfFk" id="NKt6yn8wC2" role="2ShVmc">
-                <ref role="37wK5l" to="tj24:NKt6yn84NI" resolve="TypecheckingStep" />
-                <node concept="37vLTw" id="3IIf9O_qVvg" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_qVvb" resolve="repository" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3cpWs8" id="3IIf9O_qVtZ" role="3cqZAp">
           <node concept="3cpWsn" id="3IIf9O_qVu0" role="3cpWs9">
             <property role="TrG5h" value="helper" />
             <node concept="3uibUv" id="3IIf9O_qVu1" role="1tU5fm">
               <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
             </node>
-            <node concept="2ShNRf" id="3IIf9O_qVu2" role="33vP2m">
-              <node concept="1pGfFk" id="3IIf9O_qVu3" role="2ShVmc">
-                <ref role="37wK5l" to="1yqb:443LGHBiDEV" resolve="CoderulesHelper" />
-                <node concept="37vLTw" id="3IIf9O_qVu4" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_qVtH" resolve="applyTemplatesStep" />
-                </node>
-                <node concept="37vLTw" id="3IIf9O_qVu5" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_qVtO" resolve="evaluateRulesStep" />
-                </node>
+            <node concept="1rXfSq" id="1FOQehxnBeA" role="33vP2m">
+              <ref role="37wK5l" node="1FOQehxnBew" resolve="helper" />
+              <node concept="37vLTw" id="1FOQehxnBez" role="37wK5m">
+                <ref role="3cqZAo" node="3IIf9O_qVvd" resolve="nodes" />
+              </node>
+              <node concept="37vLTw" id="1FOQehxnBe_" role="37wK5m">
+                <ref role="3cqZAo" node="3IIf9O_r1EB" resolve="queryKind" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="3IIf9O_qVu7" role="3cqZAp" />
         <node concept="SfApY" id="2BZXJed2JyW" role="3cqZAp">
           <node concept="3clFbS" id="2BZXJed2JyY" role="SfCbr">
             <node concept="3cpWs8" id="3IIf9O_qVu8" role="3cqZAp">
@@ -1036,6 +1280,38 @@
             <node concept="3clFbH" id="3IIf9O_qVui" role="3cqZAp" />
             <node concept="3clFbJ" id="3IIf9O_qVuj" role="3cqZAp">
               <node concept="3clFbS" id="3IIf9O_qVuk" role="3clFbx">
+                <node concept="3cpWs8" id="1FOQehx0HKq" role="3cqZAp">
+                  <node concept="3cpWsn" id="1FOQehx0HKr" role="3cpWs9">
+                    <property role="TrG5h" value="step" />
+                    <node concept="3uibUv" id="1FOQehx0HKo" role="1tU5fm">
+                      <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                    </node>
+                    <node concept="1eOMI4" id="1FOQehx0HKs" role="33vP2m">
+                      <node concept="10QFUN" id="1FOQehx0HKt" role="1eOMHV">
+                        <node concept="3uibUv" id="1FOQehx0HKu" role="10QFUM">
+                          <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                        </node>
+                        <node concept="37vLTw" id="1FOQehx0HKv" role="10QFUP">
+                          <ref role="3cqZAo" node="3IIf9O_qVu9" resolve="lastStep" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="1FOQehxolKg" role="3cqZAp">
+                  <node concept="1rXfSq" id="1FOQehxolKf" role="3clFbG">
+                    <ref role="37wK5l" node="1FOQehxolKb" resolve="forwardReportItems" />
+                    <node concept="2OqwBi" id="1FOQehxoCZl" role="37wK5m">
+                      <node concept="37vLTw" id="1FOQehxolKe" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1FOQehx0HKr" resolve="step" />
+                      </node>
+                      <node concept="liA8E" id="1FOQehxoDzz" role="2OqNvi">
+                        <ref role="37wK5l" to="tj24:1FOQehx3WGd" resolve="getReportItems" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="1FOQehxokEH" role="3cqZAp" />
                 <node concept="3cpWs8" id="3IIf9O_qVul" role="3cqZAp">
                   <node concept="3cpWsn" id="3IIf9O_qVum" role="3cpWs9">
                     <property role="TrG5h" value="typesModelOwner" />
@@ -1043,15 +1319,8 @@
                       <ref role="3uigEE" to="qox2:2zU3cYq$91A" resolve="TypesModelManager.ModelOwner" />
                     </node>
                     <node concept="2OqwBi" id="3IIf9O_qVuo" role="33vP2m">
-                      <node concept="1eOMI4" id="3IIf9O_qVup" role="2Oq$k0">
-                        <node concept="10QFUN" id="3IIf9O_qVuq" role="1eOMHV">
-                          <node concept="3uibUv" id="78H58of7_aH" role="10QFUM">
-                            <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
-                          </node>
-                          <node concept="37vLTw" id="3IIf9O_qVus" role="10QFUP">
-                            <ref role="3cqZAo" node="3IIf9O_qVu9" resolve="lastStep" />
-                          </node>
-                        </node>
+                      <node concept="37vLTw" id="1FOQehx0HKw" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1FOQehx0HKr" resolve="step" />
                       </node>
                       <node concept="liA8E" id="3IIf9O_qVut" role="2OqNvi">
                         <ref role="37wK5l" to="tj24:78H58of7_Sp" resolve="getTypesModelOwner" />
@@ -1059,6 +1328,11 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3SKdUt" id="1FOQehxL6mi" role="3cqZAp">
+                  <node concept="3SKdUq" id="1FOQehxL6mk" role="3SKWNk">
+                    <property role="3SKdUp" value="TODO WTF is with this register/unregister business?" />
+                  </node>
+                </node>
                 <node concept="3clFbF" id="3IIf9O_qVuu" role="3cqZAp">
                   <node concept="2OqwBi" id="3IIf9O_qVuv" role="3clFbG">
                     <node concept="37vLTw" id="3IIf9O_qVuw" role="2Oq$k0">
@@ -1082,6 +1356,7 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3clFbH" id="1FOQehxL5dz" role="3cqZAp" />
                 <node concept="3cpWs8" id="3IIf9O_qVuB" role="3cqZAp">
                   <node concept="3cpWsn" id="3IIf9O_qVuC" role="3cpWs9">
                     <property role="TrG5h" value="typeNodes" />
@@ -1092,15 +1367,8 @@
                       </node>
                     </node>
                     <node concept="2OqwBi" id="3IIf9O_qVuG" role="33vP2m">
-                      <node concept="1eOMI4" id="3IIf9O_qVuH" role="2Oq$k0">
-                        <node concept="10QFUN" id="3IIf9O_qVuI" role="1eOMHV">
-                          <node concept="3uibUv" id="78H58of7CX5" role="10QFUM">
-                            <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
-                          </node>
-                          <node concept="37vLTw" id="3IIf9O_qVuK" role="10QFUP">
-                            <ref role="3cqZAo" node="3IIf9O_qVu9" resolve="lastStep" />
-                          </node>
-                        </node>
+                      <node concept="37vLTw" id="1FOQehx0HKx" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1FOQehx0HKr" resolve="step" />
                       </node>
                       <node concept="liA8E" id="3IIf9O_qVuL" role="2OqNvi">
                         <ref role="37wK5l" to="tj24:7lt0LtQA50L" resolve="getTypeNodes" />
@@ -1163,19 +1431,55 @@
           </node>
           <node concept="TDmWw" id="2BZXJed2JyZ" role="TEbGg">
             <node concept="3cpWsn" id="2BZXJed2Jz1" role="TDEfY">
-              <property role="TrG5h" value="ignore" />
+              <property role="TrG5h" value="ex" />
               <node concept="3uibUv" id="2BZXJed2V4h" role="1tU5fm">
                 <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
               </node>
             </node>
             <node concept="3clFbS" id="2BZXJed2Jz5" role="TDEfX">
+              <node concept="3clFbJ" id="1FOQehxys3D" role="3cqZAp">
+                <node concept="3clFbS" id="1FOQehxys3F" role="3clFbx">
+                  <node concept="3clFbF" id="1FOQehxys$J" role="3cqZAp">
+                    <node concept="2OqwBi" id="1FOQehxysJu" role="3clFbG">
+                      <node concept="37vLTw" id="1FOQehxys$H" role="2Oq$k0">
+                        <ref role="3cqZAo" node="5KrJ7UHMZjn" resolve="reportSink" />
+                      </node>
+                      <node concept="liA8E" id="1FOQehxysVs" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:5KrJ7UHMRSa" resolve="report" />
+                        <node concept="2ShNRf" id="1FOQehxyt7n" role="37wK5m">
+                          <node concept="1pGfFk" id="1FOQehxytwY" role="2ShVmc">
+                            <ref role="37wK5l" node="1FOQehxyAYy" resolve="LaunchProblemReportItem" />
+                            <node concept="Rm8GO" id="1FOQehxytTo" role="37wK5m">
+                              <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
+                              <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                            </node>
+                            <node concept="Xl_RD" id="1FOQehxyu81" role="37wK5m">
+                              <property role="Xl_RC" value="error launching typechecking" />
+                            </node>
+                            <node concept="37vLTw" id="1FOQehxyDZh" role="37wK5m">
+                              <ref role="3cqZAo" node="2BZXJed2Jz1" resolve="ex" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3y3z36" id="1FOQehxysmv" role="3clFbw">
+                  <node concept="10Nm6u" id="1FOQehxystb" role="3uHU7w" />
+                  <node concept="37vLTw" id="1FOQehxysao" role="3uHU7B">
+                    <ref role="3cqZAo" node="5KrJ7UHMZjn" resolve="reportSink" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="1FOQehxyrYK" role="3cqZAp" />
               <node concept="RRSsy" id="4cvvxaYh9pT" role="3cqZAp">
                 <property role="RRSoG" value="warn" />
                 <node concept="Xl_RD" id="2BZXJed2VqB" role="RRSoy">
-                  <property role="Xl_RC" value="error evaluating rules" />
+                  <property role="Xl_RC" value="error launching typechecking" />
                 </node>
                 <node concept="37vLTw" id="2BZXJed2VqC" role="RRSow">
-                  <ref role="3cqZAo" node="2BZXJed2Jz1" resolve="ignore" />
+                  <ref role="3cqZAo" node="2BZXJed2Jz1" resolve="ex" />
                 </node>
               </node>
             </node>
@@ -1189,7 +1493,427 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="1FOQehxonMc" role="jymVt" />
+    <node concept="3clFb_" id="3IIf9OAgpFT" role="jymVt">
+      <property role="TrG5h" value="calcConverts" />
+      <node concept="37vLTG" id="3IIf9OAgpZx" role="3clF46">
+        <property role="TrG5h" value="from" />
+        <node concept="3Tqbb2" id="3IIf9OAgs8v" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3IIf9OAgs8X" role="3clF46">
+        <property role="TrG5h" value="to" />
+        <node concept="3Tqbb2" id="3IIf9OAgspX" role="1tU5fm" />
+      </node>
+      <node concept="10P_77" id="3IIf9OAgqhD" role="3clF45" />
+      <node concept="3Tm6S6" id="1FOQehwZSVN" role="1B3o_S" />
+      <node concept="3clFbS" id="3IIf9OAgpFX" role="3clF47">
+        <node concept="3cpWs8" id="3IIf9OAgvDK" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9OAgvDL" role="3cpWs9">
+            <property role="TrG5h" value="helper" />
+            <node concept="3uibUv" id="3IIf9OAgvDM" role="1tU5fm">
+              <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
+            </node>
+            <node concept="1rXfSq" id="1FOQehxo9Cz" role="33vP2m">
+              <ref role="37wK5l" node="1FOQehxnBew" resolve="helper" />
+              <node concept="2ShNRf" id="1FOQehxocJV" role="37wK5m">
+                <node concept="Tc6Ow" id="1FOQehxocJW" role="2ShVmc">
+                  <node concept="3Tqbb2" id="1FOQehxocJX" role="HW$YZ" />
+                  <node concept="37vLTw" id="1FOQehxocJY" role="HW$Y0">
+                    <ref role="3cqZAo" node="3IIf9OAgpZx" resolve="from" />
+                  </node>
+                  <node concept="37vLTw" id="1FOQehxocJZ" role="HW$Y0">
+                    <ref role="3cqZAo" node="3IIf9OAgs8X" resolve="to" />
+                  </node>
+                </node>
+              </node>
+              <node concept="10M0yZ" id="1FOQehxo9MY" role="37wK5m">
+                <ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+                <ref role="3cqZAo" node="4t7Xo7inO_s" resolve="CONVERT" />
+              </node>
+              <node concept="37vLTw" id="1FOQehxo9Nn" role="37wK5m">
+                <ref role="3cqZAo" node="3IIf9OAgpZx" resolve="from" />
+              </node>
+              <node concept="37vLTw" id="1FOQehxo9No" role="37wK5m">
+                <ref role="3cqZAo" node="3IIf9OAgs8X" resolve="to" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="SfApY" id="2BZXJecZP8N" role="3cqZAp">
+          <node concept="3clFbS" id="2BZXJecZP8P" role="SfCbr">
+            <node concept="3cpWs8" id="3IIf9OAgx7T" role="3cqZAp">
+              <node concept="3cpWsn" id="3IIf9OAgx7U" role="3cpWs9">
+                <property role="TrG5h" value="lastStep" />
+                <node concept="3uibUv" id="3IIf9OAgx74" role="1tU5fm">
+                  <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
+                  <node concept="3qTvmN" id="3IIf9OAgx77" role="11_B2D" />
+                </node>
+                <node concept="2OqwBi" id="3IIf9OAgx7V" role="33vP2m">
+                  <node concept="2OqwBi" id="3IIf9OAgx7W" role="2Oq$k0">
+                    <node concept="37vLTw" id="3IIf9OAgx7X" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3IIf9OAgvDL" resolve="helper" />
+                    </node>
+                    <node concept="liA8E" id="3IIf9OAgx7Y" role="2OqNvi">
+                      <ref role="37wK5l" to="1yqb:2mbQB8J5m$l" resolve="scheduleExecute" />
+                      <node concept="2YIFZM" id="NKt6yn9ky3" role="37wK5m">
+                        <ref role="37wK5l" to="1yqb:3KwBCAA_erO" resolve="blocking" />
+                        <ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="3IIf9OAgx80" role="2OqNvi">
+                    <ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="1FOQehxogBv" role="3cqZAp">
+              <node concept="3clFbS" id="1FOQehxogBx" role="3clFbx">
+                <node concept="3cpWs8" id="1FOQehxoi4t" role="3cqZAp">
+                  <node concept="3cpWsn" id="1FOQehxoi4u" role="3cpWs9">
+                    <property role="TrG5h" value="step" />
+                    <node concept="3uibUv" id="1FOQehxoi4v" role="1tU5fm">
+                      <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                    </node>
+                    <node concept="1eOMI4" id="1FOQehxoi4w" role="33vP2m">
+                      <node concept="10QFUN" id="1FOQehxoi4x" role="1eOMHV">
+                        <node concept="3uibUv" id="1FOQehxoi4y" role="10QFUM">
+                          <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                        </node>
+                        <node concept="37vLTw" id="1FOQehxoi4z" role="10QFUP">
+                          <ref role="3cqZAo" node="3IIf9OAgx7U" resolve="lastStep" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="1FOQehxovvR" role="3cqZAp">
+                  <node concept="1rXfSq" id="1FOQehxovvS" role="3clFbG">
+                    <ref role="37wK5l" node="1FOQehxolKb" resolve="forwardReportItems" />
+                    <node concept="2OqwBi" id="1FOQehxoC0S" role="37wK5m">
+                      <node concept="37vLTw" id="1FOQehxovvT" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1FOQehxoi4u" resolve="step" />
+                      </node>
+                      <node concept="liA8E" id="1FOQehxoCzL" role="2OqNvi">
+                        <ref role="37wK5l" to="tj24:1FOQehx3WGd" resolve="getReportItems" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2ZW3vV" id="1FOQehxoi2C" role="3clFbw">
+                <node concept="3uibUv" id="1FOQehxoi2D" role="2ZW6by">
+                  <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+                </node>
+                <node concept="37vLTw" id="1FOQehxoi2E" role="2ZW6bz">
+                  <ref role="3cqZAo" node="3IIf9OAgx7U" resolve="lastStep" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="1FOQehxofbl" role="3cqZAp" />
+            <node concept="3cpWs6" id="2BZXJecZTz9" role="3cqZAp">
+              <node concept="3clFbT" id="2BZXJecZTXe" role="3cqZAk">
+                <property role="3clFbU" value="true" />
+              </node>
+            </node>
+            <node concept="3clFbH" id="2BZXJecZUj8" role="3cqZAp" />
+          </node>
+          <node concept="TDmWw" id="2BZXJecZP8Q" role="TEbGg">
+            <node concept="3cpWsn" id="2BZXJecZP8S" role="TDEfY">
+              <property role="TrG5h" value="ex" />
+              <node concept="3uibUv" id="2BZXJecZPm3" role="1tU5fm">
+                <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
+              </node>
+            </node>
+            <node concept="3clFbS" id="2BZXJecZP8W" role="TDEfX">
+              <node concept="3clFbJ" id="1FOQehxyx$2" role="3cqZAp">
+                <node concept="3clFbS" id="1FOQehxyx$3" role="3clFbx">
+                  <node concept="3clFbF" id="1FOQehxyx$4" role="3cqZAp">
+                    <node concept="2OqwBi" id="1FOQehxyx$5" role="3clFbG">
+                      <node concept="37vLTw" id="1FOQehxyx$6" role="2Oq$k0">
+                        <ref role="3cqZAo" node="5KrJ7UHMZjn" resolve="reportSink" />
+                      </node>
+                      <node concept="liA8E" id="1FOQehxyx$7" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:5KrJ7UHMRSa" resolve="report" />
+                        <node concept="2ShNRf" id="1FOQehxyx$8" role="37wK5m">
+                          <node concept="1pGfFk" id="1FOQehxyx$9" role="2ShVmc">
+                            <ref role="37wK5l" node="1FOQehxyAYy" resolve="LaunchProblemReportItem" />
+                            <node concept="Rm8GO" id="1FOQehxyx$a" role="37wK5m">
+                              <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                              <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
+                            </node>
+                            <node concept="Xl_RD" id="1FOQehxyx$b" role="37wK5m">
+                              <property role="Xl_RC" value="error launching typechecking" />
+                            </node>
+                            <node concept="37vLTw" id="1FOQehxyDr1" role="37wK5m">
+                              <ref role="3cqZAo" node="2BZXJecZP8S" resolve="ex" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3y3z36" id="1FOQehxyx$c" role="3clFbw">
+                  <node concept="10Nm6u" id="1FOQehxyx$d" role="3uHU7w" />
+                  <node concept="37vLTw" id="1FOQehxyx$e" role="3uHU7B">
+                    <ref role="3cqZAo" node="5KrJ7UHMZjn" resolve="reportSink" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="1FOQehxyxzU" role="3cqZAp" />
+              <node concept="RRSsy" id="1FOQehxoxjC" role="3cqZAp">
+                <property role="RRSoG" value="warn" />
+                <node concept="Xl_RD" id="2BZXJed2IvL" role="RRSoy">
+                  <property role="Xl_RC" value="error launching typechecking" />
+                </node>
+                <node concept="37vLTw" id="2BZXJed2IvN" role="RRSow">
+                  <ref role="3cqZAo" node="2BZXJecZP8S" resolve="ex" />
+                </node>
+              </node>
+              <node concept="3clFbH" id="1FOQehxy_$p" role="3cqZAp" />
+              <node concept="3cpWs6" id="2BZXJecZP$A" role="3cqZAp">
+                <node concept="3clFbT" id="2BZXJecZPVl" role="3cqZAk">
+                  <property role="3clFbU" value="false" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="6QH_LDtaCb7" role="jymVt" />
+    <node concept="3clFb_" id="1FOQehxnBew" role="jymVt">
+      <property role="TrG5h" value="helper" />
+      <node concept="3Tm6S6" id="1FOQehxnBex" role="1B3o_S" />
+      <node concept="3uibUv" id="1FOQehxnBey" role="3clF45">
+        <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
+      </node>
+      <node concept="37vLTG" id="1FOQehxnBek" role="3clF46">
+        <property role="TrG5h" value="nodes" />
+        <node concept="2I9FWS" id="1FOQehxnBel" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="1FOQehxnBeo" role="3clF46">
+        <property role="TrG5h" value="queryKind" />
+        <node concept="3uibUv" id="1FOQehxnBep" role="1tU5fm">
+          <ref role="3uigEE" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1FOQehxnWaW" role="3clF46">
+        <property role="TrG5h" value="queryParam" />
+        <node concept="8X2XB" id="1FOQehxnYCW" role="1tU5fm">
+          <node concept="3uibUv" id="1FOQehxnXEw" role="8Xvag">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="1FOQehxnBdT" role="3clF47">
+        <node concept="3cpWs8" id="1FOQehxnBdW" role="3cqZAp">
+          <node concept="3cpWsn" id="1FOQehxnBdX" role="3cpWs9">
+            <property role="TrG5h" value="applyTemplatesStep" />
+            <node concept="3uibUv" id="1FOQehxnBdY" role="1tU5fm">
+              <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+            </node>
+            <node concept="2ShNRf" id="1FOQehxnBdZ" role="33vP2m">
+              <node concept="1pGfFk" id="1FOQehxnBe0" role="2ShVmc">
+                <ref role="37wK5l" to="1yqb:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
+                <node concept="2YIFZM" id="1FOQehxnBe1" role="37wK5m">
+                  <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
+                  <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
+                </node>
+                <node concept="37vLTw" id="1FOQehxnBeq" role="37wK5m">
+                  <ref role="3cqZAo" node="1FOQehxnBek" resolve="nodes" />
+                </node>
+                <node concept="37vLTw" id="1FOQehxnBes" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+                </node>
+                <node concept="37vLTw" id="1FOQehxnBer" role="37wK5m">
+                  <ref role="3cqZAo" node="1FOQehxnBeo" resolve="queryKind" />
+                </node>
+                <node concept="37vLTw" id="1FOQehxo6jr" role="37wK5m">
+                  <ref role="3cqZAo" node="1FOQehxnWaW" resolve="queryParam" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="1FOQehxnBe5" role="3cqZAp">
+          <node concept="3cpWsn" id="1FOQehxnBe6" role="3cpWs9">
+            <property role="TrG5h" value="evaluateRulesStep" />
+            <property role="3TUv4t" value="false" />
+            <node concept="3uibUv" id="1FOQehxnBe7" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
+            </node>
+            <node concept="2ShNRf" id="1FOQehxnBe8" role="33vP2m">
+              <node concept="1pGfFk" id="1FOQehxnBe9" role="2ShVmc">
+                <ref role="37wK5l" to="tj24:NKt6yn84NI" resolve="TypecheckingStep" />
+                <node concept="37vLTw" id="1FOQehxnBet" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="1FOQehxnBei" role="3cqZAp">
+          <node concept="2ShNRf" id="1FOQehxnBee" role="3cqZAk">
+            <node concept="1pGfFk" id="1FOQehxnBef" role="2ShVmc">
+              <ref role="37wK5l" to="1yqb:443LGHBiDEV" resolve="CoderulesHelper" />
+              <node concept="37vLTw" id="1FOQehxnBeg" role="37wK5m">
+                <ref role="3cqZAo" node="1FOQehxnBdX" resolve="applyTemplatesStep" />
+              </node>
+              <node concept="37vLTw" id="1FOQehxnBeh" role="37wK5m">
+                <ref role="3cqZAo" node="1FOQehxnBe6" resolve="evaluateRulesStep" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehxdRJu" role="jymVt" />
+    <node concept="3clFb_" id="1FOQehxolKb" role="jymVt">
+      <property role="TrG5h" value="forwardReportItems" />
+      <node concept="3Tm6S6" id="1FOQehxolKc" role="1B3o_S" />
+      <node concept="3cqZAl" id="1FOQehxolKd" role="3clF45" />
+      <node concept="3clFbS" id="1FOQehxolJA" role="3clF47">
+        <node concept="3clFbJ" id="1FOQehxolJB" role="3cqZAp">
+          <node concept="3clFbS" id="1FOQehxolJC" role="3clFbx">
+            <node concept="1DcWWT" id="1FOQehxolJD" role="3cqZAp">
+              <node concept="3clFbS" id="1FOQehxolJE" role="2LFqv$">
+                <node concept="3clFbJ" id="1FOQehxolJF" role="3cqZAp">
+                  <node concept="2ZW3vV" id="1FOQehxolJG" role="3clFbw">
+                    <node concept="3uibUv" id="1FOQehxolJH" role="2ZW6by">
+                      <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+                    </node>
+                    <node concept="37vLTw" id="1FOQehxolJI" role="2ZW6bz">
+                      <ref role="3cqZAo" node="1FOQehxolJW" resolve="it" />
+                    </node>
+                  </node>
+                  <node concept="3clFbS" id="1FOQehxolJJ" role="3clFbx">
+                    <node concept="3cpWs8" id="1FOQehxolJK" role="3cqZAp">
+                      <node concept="3cpWsn" id="1FOQehxolJL" role="3cpWs9">
+                        <property role="TrG5h" value="nri" />
+                        <node concept="3uibUv" id="1FOQehxolJM" role="1tU5fm">
+                          <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+                        </node>
+                        <node concept="1eOMI4" id="1FOQehxolJN" role="33vP2m">
+                          <node concept="10QFUN" id="1FOQehxolJO" role="1eOMHV">
+                            <node concept="3uibUv" id="1FOQehxolJP" role="10QFUM">
+                              <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+                            </node>
+                            <node concept="37vLTw" id="1FOQehxolJQ" role="10QFUP">
+                              <ref role="3cqZAo" node="1FOQehxolJW" resolve="it" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="1FOQehxolJR" role="3cqZAp">
+                      <node concept="2OqwBi" id="1FOQehxolJS" role="3clFbG">
+                        <node concept="37vLTw" id="1FOQehxolJT" role="2Oq$k0">
+                          <ref role="3cqZAo" node="5KrJ7UHMZjn" resolve="reportSink" />
+                        </node>
+                        <node concept="liA8E" id="1FOQehxolJU" role="2OqNvi">
+                          <ref role="37wK5l" to="1yqb:5KrJ7UHMRSa" resolve="report" />
+                          <node concept="37vLTw" id="1FOQehxolJV" role="37wK5m">
+                            <ref role="3cqZAo" node="1FOQehxolJL" resolve="nri" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWsn" id="1FOQehxolJW" role="1Duv9x">
+                <property role="TrG5h" value="it" />
+                <node concept="3uibUv" id="1FOQehxolJX" role="1tU5fm">
+                  <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="1FOQehxoAHU" role="1DdaDG">
+                <ref role="3cqZAo" node="1FOQehxo$MD" resolve="reportItems" />
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="1FOQehxolK2" role="3clFbw">
+            <node concept="10Nm6u" id="1FOQehxolK3" role="3uHU7w" />
+            <node concept="37vLTw" id="1FOQehxolK4" role="3uHU7B">
+              <ref role="3cqZAo" node="5KrJ7UHMZjn" resolve="reportSink" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="1FOQehxo$MD" role="3clF46">
+        <property role="TrG5h" value="reportItems" />
+        <node concept="3vKaQO" id="1FOQehxo$MB" role="1tU5fm">
+          <node concept="3uibUv" id="1FOQehxoAeQ" role="3O5elw">
+            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehxnD2p" role="jymVt" />
+    <node concept="2YIFZL" id="3IIf9O_tL1f" role="jymVt">
+      <property role="TrG5h" value="repository" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="3IIf9O_tJHw" role="3clF47">
+        <node concept="3cpWs8" id="3IIf9O_tJHx" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9O_tJHy" role="3cpWs9">
+            <property role="TrG5h" value="unit" />
+            <node concept="H_c77" id="3IIf9O_tJHz" role="1tU5fm" />
+            <node concept="2OqwBi" id="3IIf9O_tJH$" role="33vP2m">
+              <node concept="37vLTw" id="3IIf9O_tJH_" role="2Oq$k0">
+                <ref role="3cqZAo" node="3IIf9O_tJHs" resolve="node" />
+              </node>
+              <node concept="I4A8Y" id="3IIf9O_tJHA" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="3IIf9O_tJHD" role="3cqZAp">
+          <node concept="3clFbS" id="3IIf9O_tJHE" role="3clFbx">
+            <node concept="3SKdUt" id="3IIf9O_tRYY" role="3cqZAp">
+              <node concept="3SKdUq" id="3IIf9O_tRZ0" role="3SKWNk">
+                <property role="3SKdUp" value="FIXME the default repository" />
+              </node>
+            </node>
+            <node concept="3cpWs6" id="3IIf9O_tJHF" role="3cqZAp">
+              <node concept="2YIFZM" id="3IIf9O_tQ$z" role="3cqZAk">
+                <ref role="1Pybhc" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
+                <ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance():jetbrains.mps.smodel.MPSModuleRepository" resolve="getInstance" />
+              </node>
+            </node>
+            <node concept="3clFbH" id="3IIf9O_tRfg" role="3cqZAp" />
+          </node>
+          <node concept="3clFbC" id="3IIf9O_tJHH" role="3clFbw">
+            <node concept="10Nm6u" id="3IIf9O_tJHI" role="3uHU7w" />
+            <node concept="37vLTw" id="3IIf9O_tJHJ" role="3uHU7B">
+              <ref role="3cqZAo" node="3IIf9O_tJHy" resolve="unit" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3IIf9O_tJHK" role="3cqZAp">
+          <node concept="2OqwBi" id="3IIf9O_tJHL" role="3clFbG">
+            <node concept="2JrnkZ" id="3IIf9O_tJHM" role="2Oq$k0">
+              <node concept="37vLTw" id="3IIf9O_tJHN" role="2JrQYb">
+                <ref role="3cqZAo" node="3IIf9O_tJHy" resolve="unit" />
+              </node>
+            </node>
+            <node concept="liA8E" id="3IIf9O_tJHO" role="2OqNvi">
+              <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="3IIf9O_tJHs" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="3IIf9O_tJHt" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="3IIf9O_tJHu" role="3clF45">
+        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+      </node>
+      <node concept="3Tm6S6" id="3IIf9O_tJHv" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="5KrJ7UHN1eb" role="jymVt" />
     <node concept="3Tm1VV" id="7kaxm0sEy3f" role="1B3o_S" />
     <node concept="312cEg" id="3IIf9O_u8qV" role="jymVt">
       <property role="TrG5h" value="repository" />
@@ -1198,6 +1922,13 @@
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
     </node>
+    <node concept="312cEg" id="5KrJ7UHMZjn" role="jymVt">
+      <property role="TrG5h" value="reportSink" />
+      <node concept="3Tm6S6" id="5KrJ7UHMZjo" role="1B3o_S" />
+      <node concept="3uibUv" id="5KrJ7UHMZjq" role="1tU5fm">
+        <ref role="3uigEE" to="1yqb:5KrJ7UHMRRs" resolve="ReportSink" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="4t7Xo7inNgi">
     <property role="TrG5h" value="TypecheckingQueryKind" />
@@ -1425,34 +2156,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7lt0LtQ_OM3" role="jymVt" />
-    <node concept="3clFb_" id="oI9Ys2yFM" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="report" />
-      <node concept="37vLTG" id="oI9Ys2yFN" role="3clF46">
-        <property role="TrG5h" value="target" />
-        <node concept="3Tqbb2" id="oI9Ys2yFO" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="oI9Ys2yFP" role="3clF46">
-        <property role="TrG5h" value="kind" />
-        <node concept="3uibUv" id="oI9Ys2yFQ" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="oI9Ys2yFR" role="3clF46">
-        <property role="TrG5h" value="text" />
-        <node concept="17QB3L" id="oI9Ys2yFS" role="1tU5fm" />
-      </node>
-      <node concept="10P_77" id="oI9Ys2yFT" role="3clF45" />
-      <node concept="3Tm1VV" id="oI9Ys2yFU" role="1B3o_S" />
-      <node concept="3clFbS" id="oI9Ys2yFX" role="3clF47">
-        <node concept="3clFbF" id="oI9Ys2yG0" role="3cqZAp">
-          <node concept="3clFbT" id="oI9Ys2yFZ" role="3clFbG" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="oI9Ys2yFY" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
     <node concept="3Tm1VV" id="7lt0LtQ_OIT" role="1B3o_S" />
     <node concept="3uibUv" id="7lt0LtQ_OLT" role="1zkMxy">
       <ref role="3uigEE" to="cxk7:3F6vMxqo13Y" resolve="DefaultSessionSolver" />
@@ -1461,5 +2164,263 @@
       <ref role="3uigEE" to="9x2e:oI9YrIZeS" resolve="Reporting" />
     </node>
   </node>
+  <node concept="312cEu" id="1FOQehwovmW">
+    <property role="TrG5h" value="TypecheckingReportItem" />
+    <node concept="2tJIrI" id="1FOQehwov_X" role="jymVt" />
+    <node concept="3clFbW" id="1FOQehwow5Q" role="jymVt">
+      <node concept="37vLTG" id="1FOQehwownE" role="3clF46">
+        <property role="TrG5h" value="stat" />
+        <node concept="3uibUv" id="1FOQehwozrM" role="1tU5fm">
+          <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1FOQehwozse" role="3clF46">
+        <property role="TrG5h" value="nodeRef" />
+        <node concept="3uibUv" id="1FOQehwozyA" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1FOQehwozzD" role="3clF46">
+        <property role="TrG5h" value="message" />
+        <node concept="17QB3L" id="1FOQehwozKs" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="1FOQehwow5S" role="3clF45" />
+      <node concept="3Tm1VV" id="1FOQehwow5T" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehwow5U" role="3clF47">
+        <node concept="XkiVB" id="1FOQehwozvf" role="3cqZAp">
+          <ref role="37wK5l" to="d6hs:~NodeReportItemBase.&lt;init&gt;(jetbrains.mps.errors.MessageStatus,org.jetbrains.mps.openapi.model.SNodeReference,java.lang.String)" resolve="NodeReportItemBase" />
+          <node concept="37vLTw" id="1FOQehwozDB" role="37wK5m">
+            <ref role="3cqZAo" node="1FOQehwownE" resolve="stat" />
+          </node>
+          <node concept="37vLTw" id="1FOQehwozGd" role="37wK5m">
+            <ref role="3cqZAo" node="1FOQehwozse" resolve="nodeRef" />
+          </node>
+          <node concept="37vLTw" id="1FOQehwozJ1" role="37wK5m">
+            <ref role="3cqZAo" node="1FOQehwozzD" resolve="message" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehxMMQ5" role="jymVt" />
+    <node concept="3clFbW" id="1FOQehxMMLH" role="jymVt">
+      <node concept="37vLTG" id="1FOQehxMMLI" role="3clF46">
+        <property role="TrG5h" value="stat" />
+        <node concept="3uibUv" id="1FOQehxMMLJ" role="1tU5fm">
+          <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1FOQehxMMLK" role="3clF46">
+        <property role="TrG5h" value="nodeRef" />
+        <node concept="3uibUv" id="1FOQehxMMLL" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1FOQehxMMLM" role="3clF46">
+        <property role="TrG5h" value="message" />
+        <node concept="17QB3L" id="1FOQehxMMLN" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="1FOQehxMN30" role="3clF46">
+        <property role="TrG5h" value="cause" />
+        <node concept="3uibUv" id="1FOQehxMN5T" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="1FOQehxMMLO" role="3clF45" />
+      <node concept="3Tm1VV" id="1FOQehxMMLP" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehxMMLQ" role="3clF47">
+        <node concept="XkiVB" id="1FOQehxMMLR" role="3cqZAp">
+          <ref role="37wK5l" to="d6hs:~NodeReportItemBase.&lt;init&gt;(jetbrains.mps.errors.MessageStatus,org.jetbrains.mps.openapi.model.SNodeReference,java.lang.String)" resolve="NodeReportItemBase" />
+          <node concept="37vLTw" id="1FOQehxMMLS" role="37wK5m">
+            <ref role="3cqZAo" node="1FOQehxMMLI" resolve="stat" />
+          </node>
+          <node concept="37vLTw" id="1FOQehxMMLT" role="37wK5m">
+            <ref role="3cqZAo" node="1FOQehxMMLK" resolve="nodeRef" />
+          </node>
+          <node concept="37vLTw" id="1FOQehxMMLU" role="37wK5m">
+            <ref role="3cqZAo" node="1FOQehxMMLM" resolve="message" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="1FOQehxMN6y" role="3cqZAp">
+          <node concept="37vLTI" id="1FOQehxMN6$" role="3clFbG">
+            <node concept="2OqwBi" id="1FOQehxMNbX" role="37vLTJ">
+              <node concept="Xjq3P" id="1FOQehxMNeB" role="2Oq$k0" />
+              <node concept="2OwXpG" id="1FOQehxMNc0" role="2OqNvi">
+                <ref role="2Oxat5" node="1FOQehxMN6u" resolve="cause" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="1FOQehxMN6C" role="37vLTx">
+              <ref role="3cqZAo" node="1FOQehxMN30" resolve="cause" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehwowbp" role="jymVt" />
+    <node concept="3Tm1VV" id="1FOQehwovmX" role="1B3o_S" />
+    <node concept="3uibUv" id="1FOQehwovnW" role="1zkMxy">
+      <ref role="3uigEE" to="d6hs:~NodeReportItemBase" resolve="NodeReportItemBase" />
+    </node>
+    <node concept="3clFb_" id="1FOQehwovo1" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="getIssueKind" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3Tm1VV" id="1FOQehwovo2" role="1B3o_S" />
+      <node concept="17QB3L" id="1FOQehwozNz" role="3clF45" />
+      <node concept="3clFbS" id="1FOQehwovoe" role="3clF47">
+        <node concept="3clFbF" id="1FOQehwovF_" role="3cqZAp">
+          <node concept="37vLTw" id="1FOQehwovWL" role="3clFbG">
+            <ref role="3cqZAo" to="d6hs:~IssueKindReportItem.TYPESYSTEM" resolve="TYPESYSTEM" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="1FOQehwovof" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehwovCw" role="jymVt" />
+    <node concept="3clFb_" id="1FOQehxMNx1" role="jymVt">
+      <property role="TrG5h" value="getCause" />
+      <node concept="3uibUv" id="1FOQehxMNAE" role="3clF45">
+        <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+      </node>
+      <node concept="3Tm1VV" id="1FOQehxMNx4" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehxMNx5" role="3clF47">
+        <node concept="3clFbF" id="1FOQehxMNOz" role="3cqZAp">
+          <node concept="37vLTw" id="1FOQehxMNOy" role="3clFbG">
+            <ref role="3cqZAo" node="1FOQehxMN6u" resolve="cause" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehxMNrL" role="jymVt" />
+    <node concept="312cEg" id="1FOQehxMN6u" role="jymVt">
+      <property role="TrG5h" value="cause" />
+      <node concept="3Tm6S6" id="1FOQehxMN6v" role="1B3o_S" />
+      <node concept="3uibUv" id="1FOQehxMN6x" role="1tU5fm">
+        <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="1FOQehxypKu">
+    <property role="TrG5h" value="LaunchProblemReportItem" />
+    <node concept="2tJIrI" id="1FOQehxypNC" role="jymVt" />
+    <node concept="3clFbW" id="1FOQehxypU6" role="jymVt">
+      <node concept="37vLTG" id="1FOQehxyqdX" role="3clF46">
+        <property role="TrG5h" value="status" />
+        <node concept="3uibUv" id="1FOQehxyqi_" role="1tU5fm">
+          <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1FOQehxyr56" role="3clF46">
+        <property role="TrG5h" value="message" />
+        <node concept="17QB3L" id="1FOQehxyr7s" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="1FOQehxypU8" role="3clF45" />
+      <node concept="3Tm1VV" id="1FOQehxypU9" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehxypUa" role="3clF47">
+        <node concept="XkiVB" id="1FOQehxyqbE" role="3cqZAp">
+          <ref role="37wK5l" to="d6hs:~ReportItemBase.&lt;init&gt;(jetbrains.mps.errors.MessageStatus,java.lang.String)" resolve="ReportItemBase" />
+          <node concept="37vLTw" id="1FOQehxyr9n" role="37wK5m">
+            <ref role="3cqZAo" node="1FOQehxyqdX" resolve="status" />
+          </node>
+          <node concept="37vLTw" id="1FOQehxyrb6" role="37wK5m">
+            <ref role="3cqZAo" node="1FOQehxyr56" resolve="message" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehxypQF" role="jymVt" />
+    <node concept="3clFbW" id="1FOQehxyAYy" role="jymVt">
+      <node concept="37vLTG" id="1FOQehxyAYz" role="3clF46">
+        <property role="TrG5h" value="status" />
+        <node concept="3uibUv" id="1FOQehxyAY$" role="1tU5fm">
+          <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1FOQehxyAY_" role="3clF46">
+        <property role="TrG5h" value="message" />
+        <node concept="17QB3L" id="1FOQehxyAYA" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="1FOQehxyBcf" role="3clF46">
+        <property role="TrG5h" value="cause" />
+        <node concept="3uibUv" id="1FOQehxyBeL" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="1FOQehxyAYB" role="3clF45" />
+      <node concept="3Tm1VV" id="1FOQehxyAYC" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehxyAYD" role="3clF47">
+        <node concept="XkiVB" id="1FOQehxyAYE" role="3cqZAp">
+          <ref role="37wK5l" to="d6hs:~ReportItemBase.&lt;init&gt;(jetbrains.mps.errors.MessageStatus,java.lang.String)" resolve="ReportItemBase" />
+          <node concept="37vLTw" id="1FOQehxyAYF" role="37wK5m">
+            <ref role="3cqZAo" node="1FOQehxyAYz" resolve="status" />
+          </node>
+          <node concept="37vLTw" id="1FOQehxyAYG" role="37wK5m">
+            <ref role="3cqZAo" node="1FOQehxyAY_" resolve="message" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="1FOQehxyBfl" role="3cqZAp">
+          <node concept="37vLTI" id="1FOQehxyBfn" role="3clFbG">
+            <node concept="2OqwBi" id="1FOQehxyBu9" role="37vLTJ">
+              <node concept="Xjq3P" id="1FOQehxyBw$" role="2Oq$k0" />
+              <node concept="2OwXpG" id="1FOQehxyBuc" role="2OqNvi">
+                <ref role="2Oxat5" node="1FOQehxyBfh" resolve="cause" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="1FOQehxyBfr" role="37vLTx">
+              <ref role="3cqZAo" node="1FOQehxyBcf" resolve="cause" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehxyAYx" role="jymVt" />
+    <node concept="3clFb_" id="1FOQehxypNK" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="getIssueKind" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3Tm1VV" id="1FOQehxypNL" role="1B3o_S" />
+      <node concept="17QB3L" id="1FOQehxyrb$" role="3clF45" />
+      <node concept="3clFbS" id="1FOQehxypNS" role="3clF47">
+        <node concept="3clFbF" id="1FOQehxyrkB" role="3cqZAp">
+          <node concept="Xl_RD" id="1FOQehxyrkA" role="3clFbG">
+            <property role="Xl_RC" value="launch typechecking" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="1FOQehxypNT" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehxyBLy" role="jymVt" />
+    <node concept="3clFb_" id="1FOQehxyC1K" role="jymVt">
+      <property role="TrG5h" value="getCause" />
+      <node concept="3uibUv" id="1FOQehxyCgS" role="3clF45">
+        <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+      </node>
+      <node concept="3Tm1VV" id="1FOQehxyC1N" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehxyC1O" role="3clF47">
+        <node concept="3clFbF" id="1FOQehxyCx0" role="3cqZAp">
+          <node concept="37vLTw" id="1FOQehxyCwZ" role="3clFbG">
+            <ref role="3cqZAo" node="1FOQehxyBfh" resolve="cause" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehxyrem" role="jymVt" />
+    <node concept="3Tm1VV" id="1FOQehxypKv" role="1B3o_S" />
+    <node concept="3uibUv" id="1FOQehxypN$" role="1zkMxy">
+      <ref role="3uigEE" to="d6hs:~ReportItemBase" resolve="ReportItemBase" />
+    </node>
+    <node concept="312cEg" id="1FOQehxyBfh" role="jymVt">
+      <property role="TrG5h" value="cause" />
+      <node concept="3Tm6S6" id="1FOQehxyBfi" role="1B3o_S" />
+      <node concept="3uibUv" id="1FOQehxyBfk" role="1tU5fm">
+        <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.typechecking/models/plugin.mps b/coderules/solutions/jetbrains.mps.typechecking/models/plugin.mps
index 915901fb..74043755 100644
--- a/coderules/solutions/jetbrains.mps.typechecking/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking/models/plugin.mps
@@ -9,6 +9,8 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+    <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
@@ -27,6 +29,7 @@
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
+    <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
   </imports>
   <registry>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -202,6 +205,14 @@
       <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" />
     </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" />
+      <concept id="8974276187400348170" name="jetbrains.mps.lang.access.structure.BaseExecuteCommandStatement" flags="nn" index="1QHqEJ">
+        <child id="1423104411234567454" name="repo" index="ukAjM" />
+        <child id="8974276187400348171" name="commandClosureLiteral" index="1QHqEI" />
+      </concept>
+      <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
+    </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -1596,19 +1607,6 @@
   </node>
   <node concept="312cEu" id="4Z$O9mrQIzY">
     <property role="TrG5h" value="TypecheckingCache" />
-    <node concept="2tJIrI" id="4Z$O9mrTfe4" role="jymVt" />
-    <node concept="3HP615" id="443LGHBxJ1f" role="jymVt">
-      <property role="2bfB8j" value="false" />
-      <property role="TrG5h" value="Clearable" />
-      <node concept="3clFb_" id="443LGHBy7NY" role="jymVt">
-        <property role="1EzhhJ" value="true" />
-        <property role="TrG5h" value="clear" />
-        <node concept="3cqZAl" id="443LGHBy7O0" role="3clF45" />
-        <node concept="3Tm1VV" id="443LGHBy7O1" role="1B3o_S" />
-        <node concept="3clFbS" id="443LGHBy7O2" role="3clF47" />
-      </node>
-      <node concept="3Tm1VV" id="443LGHBxJ1g" role="1B3o_S" />
-    </node>
     <node concept="2tJIrI" id="443LGHBxDpo" role="jymVt" />
     <node concept="3HP615" id="6QH_LDtb$zi" role="jymVt">
       <property role="2bfB8j" value="false" />
@@ -1616,15 +1614,14 @@
       <node concept="3clFb_" id="6QH_LDtb_6x" role="jymVt">
         <property role="1EzhhJ" value="true" />
         <property role="TrG5h" value="createCache" />
-        <node concept="3uibUv" id="443LGHBxRki" role="3clF45">
-          <ref role="3uigEE" node="443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
+        <node concept="3uibUv" id="1FOQehxex$4" role="3clF45">
+          <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
         </node>
         <node concept="3Tm1VV" id="6QH_LDtb_6$" role="1B3o_S" />
         <node concept="3clFbS" id="6QH_LDtb_6_" role="3clF47" />
       </node>
       <node concept="3Tm1VV" id="6QH_LDtb$zj" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="4Z$O9mrQI$u" role="jymVt" />
     <node concept="2tJIrI" id="4Z$O9mrTG7X" role="jymVt" />
     <node concept="2YIFZL" id="4Z$O9mrQIG1" role="jymVt">
       <property role="TrG5h" value="get" />
@@ -1715,16 +1712,27 @@
               </node>
               <node concept="1bVj0M" id="443LGHBoCbS" role="37wK5m">
                 <node concept="3clFbS" id="443LGHBoCbT" role="1bW5cS">
-                  <node concept="3clFbF" id="443LGHBoCbU" role="3cqZAp">
-                    <node concept="2OqwBi" id="443LGHBoCbV" role="3clFbG">
-                      <node concept="37vLTw" id="443LGHBoCbW" role="2Oq$k0">
-                        <ref role="3cqZAo" node="443LGHBoCc4" resolve="instance" />
-                      </node>
-                      <node concept="liA8E" id="443LGHBoCbX" role="2OqNvi">
-                        <ref role="37wK5l" node="14$_tTxApBG" resolve="dispose" />
+                  <node concept="3clFbH" id="1FOQehxKH4k" role="3cqZAp" />
+                  <node concept="1QHqEK" id="1FOQehxKJrN" role="3cqZAp">
+                    <node concept="1QHqEC" id="1FOQehxKJrP" role="1QHqEI">
+                      <node concept="3clFbS" id="1FOQehxKJrR" role="1bW5cS">
+                        <node concept="3clFbF" id="443LGHBoCbU" role="3cqZAp">
+                          <node concept="2OqwBi" id="443LGHBoCbV" role="3clFbG">
+                            <node concept="37vLTw" id="443LGHBoCbW" role="2Oq$k0">
+                              <ref role="3cqZAo" node="443LGHBoCc4" resolve="instance" />
+                            </node>
+                            <node concept="liA8E" id="443LGHBoCbX" role="2OqNvi">
+                              <ref role="37wK5l" node="14$_tTxApBG" resolve="dispose" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
+                    <node concept="37vLTw" id="1FOQehxKJx9" role="ukAjM">
+                      <ref role="3cqZAo" node="443LGHBoCc2" resolve="repos" />
+                    </node>
                   </node>
+                  <node concept="3clFbH" id="1FOQehxKJ3E" role="3cqZAp" />
                   <node concept="3SKdUt" id="443LGHBoCbY" role="3cqZAp">
                     <node concept="3SKdUq" id="443LGHBoCbZ" role="3SKWNk">
                       <property role="3SKdUp" value="remove the mapping" />
@@ -1854,8 +1862,8 @@
           <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
         </node>
       </node>
-      <node concept="3uibUv" id="443LGHBxUi3" role="3clF45">
-        <ref role="3uigEE" node="443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
+      <node concept="3uibUv" id="1FOQehxetAn" role="3clF45">
+        <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
       </node>
       <node concept="3Tm1VV" id="4Z$O9mrQJgs" role="1B3o_S" />
       <node concept="3clFbS" id="4Z$O9mrQJgt" role="3clF47">
@@ -1967,8 +1975,8 @@
           <ref role="3uigEE" node="6QH_LDtb$zi" resolve="TypecheckingCache.CacheFactory" />
         </node>
       </node>
-      <node concept="3uibUv" id="443LGHBxYaT" role="3clF45">
-        <ref role="3uigEE" node="443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
+      <node concept="3uibUv" id="1FOQehxewiF" role="3clF45">
+        <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
       </node>
       <node concept="3Tm1VV" id="6QH_LDtbsGA" role="1B3o_S" />
       <node concept="3clFbS" id="6QH_LDtbsGB" role="3clF47">
@@ -2028,8 +2036,8 @@
                   <node concept="3cpWs8" id="443LGHBxRRf" role="3cqZAp">
                     <node concept="3cpWsn" id="443LGHBxRRg" role="3cpWs9">
                       <property role="TrG5h" value="newCache" />
-                      <node concept="3uibUv" id="443LGHBxRRb" role="1tU5fm">
-                        <ref role="3uigEE" node="443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
+                      <node concept="3uibUv" id="1FOQehxexg7" role="1tU5fm">
+                        <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
                       </node>
                       <node concept="2OqwBi" id="443LGHBxRRh" role="33vP2m">
                         <node concept="37vLTw" id="443LGHBxRRi" role="2Oq$k0">
@@ -2201,8 +2209,8 @@
         <property role="TrG5h" value="setCache" />
         <node concept="37vLTG" id="4Z$O9mrT_Xw" role="3clF46">
           <property role="TrG5h" value="newCache" />
-          <node concept="3uibUv" id="443LGHBxSQ4" role="1tU5fm">
-            <ref role="3uigEE" node="443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
+          <node concept="3uibUv" id="1FOQehxe_Ym" role="1tU5fm">
+            <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
           </node>
         </node>
         <node concept="37vLTG" id="443LGHB6d9m" role="3clF46">
@@ -2309,7 +2317,7 @@
                     <ref role="3cqZAo" node="4Z$O9mrQJ$h" resolve="cache" />
                   </node>
                   <node concept="liA8E" id="4Z$O9mrT9b$" role="2OqNvi">
-                    <ref role="37wK5l" node="443LGHBy7NY" resolve="clear" />
+                    <ref role="37wK5l" to="tj24:1FOQehxelEi" resolve="clear" />
                   </node>
                 </node>
               </node>
@@ -2747,8 +2755,8 @@
       <node concept="312cEg" id="4Z$O9mrQJ$h" role="jymVt">
         <property role="TrG5h" value="cache" />
         <node concept="3Tm6S6" id="4Z$O9mrQJ$i" role="1B3o_S" />
-        <node concept="3uibUv" id="443LGHBxTVr" role="1tU5fm">
-          <ref role="3uigEE" node="443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
+        <node concept="3uibUv" id="1FOQehxeuA4" role="1tU5fm">
+          <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
         </node>
       </node>
       <node concept="2tJIrI" id="4Z$O9mrQJzI" role="jymVt" />
diff --git a/coderules/solutions/jetbrains.mps.typechecking/models/service.mps b/coderules/solutions/jetbrains.mps.typechecking/models/service.mps
index ada07987..b0fc0142 100644
--- a/coderules/solutions/jetbrains.mps.typechecking/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking/models/service.mps
@@ -47,6 +47,8 @@
     <import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" />
     <import index="m4y7" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.schedulers(jetbrains.mps.coderules/)" />
     <import index="u46i" ref="r:c2760840-3210-4ad4-9e64-a2dfd53620e1(jetbrains.mps.lang.typechecking.aspect)" />
+    <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/)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -55,9 +57,6 @@
       </concept>
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
-        <child id="1082485599096" name="statements" index="9aQI4" />
-      </concept>
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
@@ -70,6 +69,9 @@
       <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
+      <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
+        <reference id="2820489544401957798" name="classifier" index="HV5vE" />
+      </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
         <child id="1154032183016" name="body" index="2LFqv$" />
       </concept>
@@ -80,17 +82,13 @@
       <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
         <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
       </concept>
-      <concept id="1164879751025" name="jetbrains.mps.baseLanguage.structure.TryCatchStatement" flags="nn" index="SfApY">
-        <child id="1164879758292" name="body" index="SfCbr" />
-        <child id="1164903496223" name="catchClause" index="TEbGg" />
+      <concept id="1083260308424" name="jetbrains.mps.baseLanguage.structure.EnumConstantReference" flags="nn" index="Rm8GO">
+        <reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
+        <reference id="1144432896254" name="enumClass" index="1Px2BO" />
       </concept>
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
-      <concept id="1164903280175" name="jetbrains.mps.baseLanguage.structure.CatchClause" flags="nn" index="TDmWw">
-        <child id="1164903359218" name="catchBody" index="TDEfX" />
-        <child id="1164903359217" name="throwable" index="TDEfY" />
-      </concept>
       <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
       <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
@@ -110,9 +108,6 @@
         <child id="1081256993305" name="classType" index="2ZW6by" />
         <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
       </concept>
-      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
-        <reference id="1144433057691" name="classifier" index="1PxDUh" />
-      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
@@ -153,7 +148,6 @@
       </concept>
       <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
       </concept>
@@ -183,9 +177,7 @@
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
       <concept id="1073063089578" name="jetbrains.mps.baseLanguage.structure.SuperMethodCall" flags="nn" index="3nyPlj" />
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
-        <child id="1212687122400" name="typeParameter" index="1pMfVU" />
-      </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
@@ -207,10 +199,13 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
-      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
-        <child id="1107797138135" name="extendedInterface" index="3HQHJm" />
+      <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
+        <child id="1144226360166" name="iterable" index="1DdaDG" />
       </concept>
-      <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
+      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
+        <child id="1144230900587" name="variable" index="1Duv9x" />
+      </concept>
+      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
       <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
         <property id="6329021646629104958" name="text" index="3SKdUp" />
       </concept>
@@ -251,11 +246,12 @@
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
-      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS" />
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
+      <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="1206482823744" name="jetbrains.mps.lang.smodel.structure.Model_AddRootOperation" flags="nn" index="3BYIHo">
         <child id="1206482823746" name="nodeArgument" index="3BYIHq" />
@@ -272,9 +268,15 @@
       </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
+        <child id="540871147943773366" name="argument" index="25WWJ7" />
+      </concept>
       <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="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
         <child id="1153944400369" name="variable" index="2Gsz3X" />
         <child id="1153944424730" name="inputSequence" index="2GsD0m" />
@@ -284,10 +286,14 @@
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
-        <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
+      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
+      <concept id="1240424373525" name="jetbrains.mps.baseLanguage.collections.structure.MappingType" flags="in" index="3f3tKP">
+        <child id="1240424397093" name="keyType" index="3f3zw5" />
+        <child id="1240424402756" name="valueType" index="3f3$T$" />
+      </concept>
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
         <child id="1197683466920" name="keyType" index="3rvQeY" />
         <child id="1197683475734" name="valueType" index="3rvSg0" />
@@ -296,13 +302,18 @@
         <child id="1197687026896" name="keyType" index="3rHrn6" />
         <child id="1197687035757" name="valueType" index="3rHtpV" />
       </concept>
+      <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
       <concept id="1208542034276" name="jetbrains.mps.baseLanguage.collections.structure.MapClearOperation" flags="nn" index="1yHZxX" />
       <concept id="1240824834947" name="jetbrains.mps.baseLanguage.collections.structure.ValueAccessOperation" flags="nn" index="3AV6Ez" />
       <concept id="1240825616499" name="jetbrains.mps.baseLanguage.collections.structure.KeyAccessOperation" flags="nn" index="3AY5_j" />
+      <concept id="1240854379201" name="jetbrains.mps.baseLanguage.collections.structure.MappingsSetOperation" flags="nn" index="3CFNJx" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
         <child id="1197932525128" name="key" index="3ElVtu" />
       </concept>
+      <concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
+        <child id="5686963296372573084" name="elementType" index="3O5elw" />
+      </concept>
     </language>
   </registry>
   <node concept="312cEu" id="1N_0WA5JxZO">
@@ -347,6 +358,51 @@
       </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">
@@ -400,605 +456,385 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="7y50OW6XU81" role="3cqZAp">
-          <node concept="3cpWsn" id="7y50OW6XU82" role="3cpWs9">
-            <property role="TrG5h" value="helper" />
-            <node concept="3uibUv" id="7y50OW6XU83" role="1tU5fm">
-              <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
+        <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="2YIFZM" id="2Qe6u2c7U1p" role="33vP2m">
-              <ref role="1Pybhc" node="1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-              <ref role="37wK5l" node="2Qe6u2c8aJv" resolve="helper" />
-              <node concept="2ShNRf" id="6OXbTD__WV5" role="37wK5m">
-                <node concept="Tc6Ow" id="6OXbTD__WV6" role="2ShVmc">
-                  <node concept="3Tqbb2" id="6OXbTD__WV7" role="HW$YZ" />
-                  <node concept="37vLTw" id="6OXbTD__Xdf" role="HW$Y0">
-                    <ref role="3cqZAo" node="7smgEqg8tfa" resolve="root" />
-                  </node>
-                </node>
-              </node>
-              <node concept="37vLTw" id="2Qe6u2c7U1o" role="37wK5m">
-                <ref role="3cqZAo" node="443LGHBTRnR" resolve="repository" />
-              </node>
-              <node concept="10M0yZ" id="2Mi2iz0PU3D" role="37wK5m">
-                <ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
-                <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+            <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="3clFbH" id="Hg6Endvgnu" role="3cqZAp" />
-        <node concept="3cpWs8" id="4BHjwwGqFx7" role="3cqZAp">
-          <node concept="3cpWsn" id="4BHjwwGqFx5" role="3cpWs9">
-            <property role="3TUv4t" value="true" />
-            <property role="TrG5h" value="typeNodes" />
-            <node concept="3uibUv" id="4BHjwwGqG4N" role="1tU5fm">
-              <ref role="3uigEE" to="18ew:~Reference" resolve="Reference" />
-              <node concept="3rvAFt" id="4BHjwwGqG8_" role="11_B2D">
-                <node concept="3uibUv" id="4BHjwwGqJ_o" role="3rvQeY">
-                  <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                </node>
-                <node concept="3Tqbb2" id="4BHjwwGqJCR" role="3rvSg0" />
-              </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="2ShNRf" id="4BHjwwGqJUk" role="33vP2m">
-              <node concept="1pGfFk" id="4BHjwwGqJQp" role="2ShVmc">
-                <ref role="37wK5l" to="18ew:~Reference.&lt;init&gt;()" resolve="Reference" />
-                <node concept="3rvAFt" id="4BHjwwGqJQq" role="1pMfVU">
-                  <node concept="3uibUv" id="4BHjwwGqJQr" role="3rvQeY">
-                    <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                  </node>
-                  <node concept="3Tqbb2" id="4BHjwwGqJQs" role="3rvSg0" />
+            <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>
+              </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>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="4BHjwwGP7A7" role="3cqZAp">
-          <node concept="3cpWsn" id="4BHjwwGP7A8" role="3cpWs9">
-            <property role="TrG5h" value="lastStep" />
-            <node concept="3uibUv" id="4BHjwwGP7_o" role="1tU5fm">
-              <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
-              <node concept="3qTvmN" id="4BHjwwGP7_r" role="11_B2D" />
-            </node>
-            <node concept="2OqwBi" id="4BHjwwGP7A9" role="33vP2m">
-              <node concept="2OqwBi" id="4BHjwwGP7Aa" role="2Oq$k0">
-                <node concept="37vLTw" id="4BHjwwGP7Ab" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7y50OW6XU82" resolve="helper" />
-                </node>
-                <node concept="liA8E" id="4BHjwwGP7Ac" role="2OqNvi">
-                  <ref role="37wK5l" to="1yqb:2mbQB8J5m$l" resolve="scheduleExecute" />
-                  <node concept="2YIFZM" id="NKt6yn9ky0" role="37wK5m">
-                    <ref role="37wK5l" to="1yqb:3KwBCAA_erO" resolve="blocking" />
-                    <ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
-                  </node>
-                </node>
-              </node>
-              <node concept="liA8E" id="4BHjwwGP7Ae" role="2OqNvi">
-                <ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
-              </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>
           </node>
         </node>
-        <node concept="3clFbJ" id="4BHjwwGPbVJ" role="3cqZAp">
-          <node concept="3clFbS" id="4BHjwwGPbVK" role="3clFbx">
-            <node concept="3clFbF" id="4BHjwwGPbVL" role="3cqZAp">
-              <node concept="2OqwBi" id="4BHjwwGPbVM" role="3clFbG">
-                <node concept="37vLTw" id="4BHjwwGPbVN" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4BHjwwGqFx5" resolve="typeNodes" />
-                </node>
-                <node concept="liA8E" id="4BHjwwGPbVO" role="2OqNvi">
-                  <ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object):void" resolve="set" />
-                  <node concept="2OqwBi" id="2Qe6u2c8Ftk" role="37wK5m">
-                    <node concept="1eOMI4" id="2Qe6u2c8Ftl" role="2Oq$k0">
-                      <node concept="10QFUN" id="2Qe6u2c8Ftm" role="1eOMHV">
-                        <node concept="3uibUv" id="78H58of7IcR" role="10QFUM">
-                          <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                        </node>
-                        <node concept="37vLTw" id="2Qe6u2c8Fto" role="10QFUP">
-                          <ref role="3cqZAo" node="4BHjwwGP7A8" resolve="lastStep" />
-                        </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="getAllTypes" />
+                      <node concept="37vLTw" id="1FOQehxzenh" role="37wK5m">
+                        <ref role="3cqZAo" node="7smgEqg8tfa" resolve="root" />
                       </node>
                     </node>
-                    <node concept="liA8E" id="2Qe6u2c8Ftp" role="2OqNvi">
-                      <ref role="37wK5l" node="7lt0LtQA50L" resolve="getTypeNodes" />
-                    </node>
+                  </node>
+                  <node concept="37vLTw" id="1FOQehxKiYR" role="37vLTJ">
+                    <ref role="3cqZAo" node="1FOQehxzend" resolve="cache" />
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="3clFbH" id="2Qe6u2c83CE" role="3cqZAp" />
-            <node concept="3clFbJ" id="7smgEqg8HKf" role="3cqZAp">
-              <node concept="3clFbS" id="7smgEqg8HKh" role="3clFbx">
-                <node concept="3SKdUt" id="2Qe6u2c86wX" role="3cqZAp">
-                  <node concept="3SKdUq" id="2Qe6u2c86wZ" role="3SKWNk">
-                    <property role="3SKdUp" value="test that all types also correct in local typechecking and match those computed &quot;normally&quot;" />
-                  </node>
-                </node>
-                <node concept="2Gpval" id="2Qe6u2c8SK3" role="3cqZAp">
-                  <node concept="3clFbS" id="2Qe6u2c85EO" role="2LFqv$">
-                    <node concept="3cpWs8" id="2Qe6u2c8ezs" role="3cqZAp">
-                      <node concept="3cpWsn" id="2Qe6u2c8ezt" role="3cpWs9">
-                        <property role="TrG5h" value="helper2" />
-                        <node concept="3uibUv" id="2Qe6u2c8ezn" role="1tU5fm">
-                          <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
-                        </node>
-                        <node concept="10Nm6u" id="2Qe6u2cbgYt" role="33vP2m" />
-                      </node>
-                    </node>
-                    <node concept="1QHqEK" id="2Qe6u2c9eWl" role="3cqZAp">
-                      <node concept="1QHqEC" id="2Qe6u2c9eWn" role="1QHqEI">
-                        <node concept="3clFbS" id="2Qe6u2c9eWp" role="1bW5cS">
-                          <node concept="3cpWs8" id="2Qe6u2cb46z" role="3cqZAp">
-                            <node concept="3cpWsn" id="2Qe6u2cb46$" role="3cpWs9">
-                              <property role="TrG5h" value="node" />
-                              <node concept="3uibUv" id="2Qe6u2cb440" role="1tU5fm">
-                                <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+              <node concept="3clFbJ" id="1FOQehxzhDC" role="3cqZAp">
+                <node concept="3clFbS" id="1FOQehxzhDE" role="3clFbx">
+                  <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="2OqwBi" id="2Qe6u2cb46_" role="33vP2m">
-                                <node concept="2OqwBi" id="2Qe6u2cb46A" role="2Oq$k0">
-                                  <node concept="2GrUjf" id="2Qe6u2cb46B" role="2Oq$k0">
-                                    <ref role="2Gs0qQ" node="2Qe6u2c8SOJ" resolve="m" />
-                                  </node>
-                                  <node concept="3AY5_j" id="2Qe6u2cb46C" role="2OqNvi" />
+                              <node concept="3AY5_j" id="1FOQehxzmo9" role="2OqNvi" />
+                            </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>
+                            </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="2Qe6u2cb46D" 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="2Qe6u2cb46E" role="37wK5m">
-                                    <ref role="3cqZAo" node="443LGHBTRnR" resolve="repository" />
+                                <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>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="3clFbJ" id="2Qe6u2cb7mU" role="3cqZAp">
-                            <node concept="3clFbS" id="2Qe6u2cb7mW" role="3clFbx">
-                              <node concept="3clFbF" id="2Qe6u2c9dcE" role="3cqZAp">
-                                <node concept="37vLTI" id="2Qe6u2c9dcG" role="3clFbG">
-                                  <node concept="1rXfSq" id="2Qe6u2c8ezu" role="37vLTx">
-                                    <ref role="37wK5l" node="2Qe6u2c8aJv" resolve="helper" />
-                                    <node concept="2ShNRf" id="2Qe6u2c8ezv" role="37wK5m">
-                                      <node concept="Tc6Ow" id="2Qe6u2c8ezw" role="2ShVmc">
-                                        <node concept="3Tqbb2" id="2Qe6u2c8ezx" role="HW$YZ" />
-                                        <node concept="37vLTw" id="2Qe6u2cb46F" role="HW$Y0">
-                                          <ref role="3cqZAo" node="2Qe6u2cb46$" resolve="node" />
+                          <node concept="3clFbJ" id="1FOQehxzrT1" role="3cqZAp">
+                            <node concept="3clFbS" id="1FOQehxzrT2" role="3clFbx">
+                              <node concept="3clFbH" id="1FOQehxzvRR" role="3cqZAp" />
+                              <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">
+                                      <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">
+                                        <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>
+                                        <node concept="3AY5_j" id="1FOQehxzrTa" role="2OqNvi" />
                                       </node>
-                                    </node>
-                                    <node concept="37vLTw" id="2Qe6u2c8hlW" role="37wK5m">
-                                      <ref role="3cqZAo" node="443LGHBTRnR" resolve="repository" />
-                                    </node>
-                                    <node concept="10M0yZ" id="2Mi2iz0PV09" role="37wK5m">
-                                      <ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
-                                      <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-                                    </node>
-                                  </node>
-                                  <node concept="37vLTw" id="2Qe6u2c9dcK" role="37vLTJ">
-                                    <ref role="3cqZAo" node="2Qe6u2c8ezt" resolve="helper2" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3clFbC" id="2Qe6u2cbhtB" role="3clFbw">
-                              <node concept="2OqwBi" id="2Qe6u2cb8Gs" role="3uHU7B">
-                                <node concept="37vLTw" id="2Qe6u2cb7Uc" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2Qe6u2cb46$" resolve="node" />
-                                </node>
-                                <node concept="liA8E" id="2Qe6u2cbbbQ" role="2OqNvi">
-                                  <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot():org.jetbrains.mps.openapi.model.SNode" resolve="getContainingRoot" />
-                                </node>
-                              </node>
-                              <node concept="37vLTw" id="2Qe6u2cbfLi" role="3uHU7w">
-                                <ref role="3cqZAo" node="7smgEqg8tfa" resolve="root" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="37vLTw" id="2Qe6u2c9ftp" role="ukAjM">
-                        <ref role="3cqZAo" node="443LGHBTRnR" resolve="repository" />
-                      </node>
-                    </node>
-                    <node concept="3clFbJ" id="2Qe6u2cbjP0" role="3cqZAp">
-                      <node concept="3clFbS" id="2Qe6u2cbjP2" role="3clFbx">
-                        <node concept="3N13vt" id="2Qe6u2cbl3m" role="3cqZAp" />
-                      </node>
-                      <node concept="3clFbC" id="2Qe6u2cbkQu" role="3clFbw">
-                        <node concept="10Nm6u" id="2Qe6u2cbkUL" role="3uHU7w" />
-                        <node concept="37vLTw" id="2Qe6u2cbkCA" role="3uHU7B">
-                          <ref role="3cqZAo" node="2Qe6u2c8ezt" resolve="helper2" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="2Qe6u2cbl5R" role="3cqZAp" />
-                    <node concept="3SKdUt" id="2Qe6u2c9Y2a" role="3cqZAp">
-                      <node concept="3SKdUq" id="2Qe6u2c9Y2c" role="3SKWNk">
-                        <property role="3SKdUp" value="no read action for typechecking" />
-                      </node>
-                    </node>
-                    <node concept="3cpWs8" id="2Qe6u2c8lbQ" role="3cqZAp">
-                      <node concept="3cpWsn" id="2Qe6u2c8lbR" role="3cpWs9">
-                        <property role="TrG5h" value="lastStep2" />
-                        <node concept="3uibUv" id="2Qe6u2c8lbp" role="1tU5fm">
-                          <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
-                          <node concept="3qTvmN" id="2Qe6u2c8lbs" role="11_B2D" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="SfApY" id="2Qe6u2cad92" role="3cqZAp">
-                      <node concept="3clFbS" id="2Qe6u2cad94" role="SfCbr">
-                        <node concept="3clFbF" id="2Qe6u2ca$mA" role="3cqZAp">
-                          <node concept="37vLTI" id="2Qe6u2ca$mC" role="3clFbG">
-                            <node concept="2OqwBi" id="2Qe6u2c8lbS" role="37vLTx">
-                              <node concept="2OqwBi" id="2Qe6u2c8lbT" role="2Oq$k0">
-                                <node concept="37vLTw" id="2Qe6u2c8lbU" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2Qe6u2c8ezt" resolve="helper2" />
-                                </node>
-                                <node concept="liA8E" id="2Qe6u2c8lbV" role="2OqNvi">
-                                  <ref role="37wK5l" to="1yqb:2mbQB8J5m$l" resolve="scheduleExecute" />
-                                  <node concept="2YIFZM" id="NKt6yn9kxZ" role="37wK5m">
-                                    <ref role="37wK5l" to="1yqb:3KwBCAA_erO" resolve="blocking" />
-                                    <ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="liA8E" id="2Qe6u2c8lbX" role="2OqNvi">
-                                <ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="2Qe6u2ca$mG" role="37vLTJ">
-                              <ref role="3cqZAo" node="2Qe6u2c8lbR" resolve="lastStep2" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbH" id="2Qe6u2cad93" role="3cqZAp" />
-                      </node>
-                      <node concept="TDmWw" id="2Qe6u2cad95" role="TEbGg">
-                        <node concept="3cpWsn" id="2Qe6u2cad97" role="TDEfY">
-                          <property role="TrG5h" value="e" />
-                          <node concept="3uibUv" id="2Qe6u2caOzB" role="1tU5fm">
-                            <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
-                          </node>
-                        </node>
-                        <node concept="3clFbS" id="2Qe6u2cad9b" role="TDEfX">
-                          <node concept="YS8fn" id="2Qe6u2caf7d" role="3cqZAp">
-                            <node concept="2ShNRf" id="2Qe6u2cak2o" role="YScLw">
-                              <node concept="1pGfFk" id="2Qe6u2cakQM" role="2ShVmc">
-                                <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="RuntimeException" />
-                                <node concept="2YIFZM" id="2Qe6u2calb$" 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="2Qe6u2calq0" role="37wK5m">
-                                    <property role="Xl_RC" value="error typechecking [%s]" />
-                                  </node>
-                                  <node concept="2OqwBi" id="2Qe6u2camDq" role="37wK5m">
-                                    <node concept="2GrUjf" id="2Qe6u2camoC" role="2Oq$k0">
-                                      <ref role="2Gs0qQ" node="2Qe6u2c8SOJ" resolve="m" />
-                                    </node>
-                                    <node concept="3AY5_j" id="2Qe6u2canwW" role="2OqNvi" />
-                                  </node>
-                                </node>
-                                <node concept="37vLTw" id="2Qe6u2caNZ$" role="37wK5m">
-                                  <ref role="3cqZAo" node="2Qe6u2cad97" resolve="e" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="2Qe6u2c9udS" role="3cqZAp" />
-                    <node concept="1QHqEK" id="2Qe6u2c9va5" role="3cqZAp">
-                      <node concept="1QHqEC" id="2Qe6u2c9va7" role="1QHqEI">
-                        <node concept="3clFbS" id="2Qe6u2c9va9" role="1bW5cS">
-                          <node concept="3clFbJ" id="2Qe6u2c8mul" role="3cqZAp">
-                            <node concept="3clFbS" id="2Qe6u2c8mun" role="3clFbx">
-                              <node concept="3cpWs8" id="2Qe6u2c8qSr" role="3cqZAp">
-                                <node concept="3cpWsn" id="2Qe6u2c8qSs" role="3cpWs9">
-                                  <property role="TrG5h" value="type" />
-                                  <node concept="3Tqbb2" id="2Qe6u2c8qSi" role="1tU5fm" />
-                                  <node concept="2OqwBi" id="2Qe6u2c8qSt" role="33vP2m">
-                                    <node concept="2GrUjf" id="2Qe6u2c8SON" role="2Oq$k0">
-                                      <ref role="2Gs0qQ" node="2Qe6u2c8SOJ" resolve="m" />
-                                    </node>
-                                    <node concept="3AV6Ez" id="2Qe6u2c8qSv" role="2OqNvi" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3cpWs8" id="2Qe6u2c8pS7" role="3cqZAp">
-                                <node concept="3cpWsn" id="2Qe6u2c8pS8" role="3cpWs9">
-                                  <property role="TrG5h" value="localType" />
-                                  <node concept="3Tqbb2" id="2Qe6u2c8pRu" role="1tU5fm" />
-                                  <node concept="3EllGN" id="2Qe6u2c8pS9" role="33vP2m">
-                                    <node concept="2OqwBi" id="2Qe6u2c8pSa" role="3ElVtu">
-                                      <node concept="2GrUjf" id="2Qe6u2c8SOP" role="2Oq$k0">
-                                        <ref role="2Gs0qQ" node="2Qe6u2c8SOJ" resolve="m" />
-                                      </node>
-                                      <node concept="3AY5_j" id="2Qe6u2c8pSc" role="2OqNvi" />
-                                    </node>
-                                    <node concept="2OqwBi" id="2Qe6u2c8pSd" role="3ElQJh">
-                                      <node concept="1eOMI4" id="2Qe6u2c8pSe" role="2Oq$k0">
-                                        <node concept="10QFUN" id="2Qe6u2c8pSf" role="1eOMHV">
-                                          <node concept="3uibUv" id="78H58of7KjA" role="10QFUM">
-                                            <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                                          </node>
-                                          <node concept="37vLTw" id="2Qe6u2c8pSh" role="10QFUP">
-                                            <ref role="3cqZAo" node="2Qe6u2c8lbR" resolve="lastStep2" />
-                                          </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>
+                                        <node concept="3AV6Ez" id="1FOQehxzyOr" role="2OqNvi" />
                                       </node>
-                                      <node concept="liA8E" id="2Qe6u2c8pSi" role="2OqNvi">
-                                        <ref role="37wK5l" node="7lt0LtQA50L" resolve="getTypeNodes" />
+                                      <node concept="37vLTw" id="1FOQehxzzsr" role="37wK5m">
+                                        <ref role="3cqZAo" node="1FOQehxzrib" resolve="localType" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbJ" id="2Qe6u2c8ru6" role="3cqZAp">
-                                <node concept="3clFbS" id="2Qe6u2c8ru8" role="3clFbx">
-                                  <node concept="YS8fn" id="2Qe6u2c9wM0" role="3cqZAp">
-                                    <node concept="2ShNRf" id="2Qe6u2c9xeb" role="YScLw">
-                                      <node concept="1pGfFk" id="2Qe6u2c9ACj" role="2ShVmc">
-                                        <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
-                                        <node concept="2YIFZM" id="2Qe6u2c9HzD" 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="2Qe6u2c9B5i" role="37wK5m">
-                                            <property role="Xl_RC" value="types of [%s] differ: [%s] and [%s]" />
-                                          </node>
-                                          <node concept="2OqwBi" id="2Qe6u2cainI" role="37wK5m">
-                                            <node concept="2GrUjf" id="2Qe6u2cahRP" role="2Oq$k0">
-                                              <ref role="2Gs0qQ" node="2Qe6u2c8SOJ" resolve="m" />
-                                            </node>
-                                            <node concept="3AY5_j" id="2Qe6u2caj0w" role="2OqNvi" />
-                                          </node>
-                                          <node concept="37vLTw" id="2Qe6u2c9NE3" role="37wK5m">
-                                            <ref role="3cqZAo" node="2Qe6u2c8qSs" resolve="type" />
-                                          </node>
-                                          <node concept="37vLTw" id="2Qe6u2c9OcT" role="37wK5m">
-                                            <ref role="3cqZAo" node="2Qe6u2c8pS8" resolve="localType" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3fqX7Q" id="2Qe6u2c8spI" role="3clFbw">
-                                  <node concept="1eOMI4" id="2Qe6u2c8spK" role="3fr31v">
-                                    <node concept="2YFouu" id="2Qe6u2c8spL" role="1eOMHV">
-                                      <node concept="37vLTw" id="2Qe6u2c8spM" role="3uHU7w">
-                                        <ref role="3cqZAo" node="2Qe6u2c8pS8" resolve="localType" />
-                                      </node>
-                                      <node concept="37vLTw" id="2Qe6u2c8spN" role="3uHU7B">
-                                        <ref role="3cqZAo" node="2Qe6u2c8qSs" resolve="type" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbH" id="2Qe6u2c8sCM" role="3cqZAp" />
-                            </node>
-                            <node concept="2ZW3vV" id="2Qe6u2c8mAp" role="3clFbw">
-                              <node concept="3uibUv" id="78H58of7JV3" role="2ZW6by">
-                                <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                              </node>
-                              <node concept="37vLTw" id="2Qe6u2c8mI4" role="2ZW6bz">
-                                <ref role="3cqZAo" node="2Qe6u2c8lbR" resolve="lastStep2" />
-                              </node>
                             </node>
-                            <node concept="9aQIb" id="2Qe6u2c8tc8" role="9aQIa">
-                              <node concept="3clFbS" id="2Qe6u2c8tc9" role="9aQI4">
-                                <node concept="YS8fn" id="2Qe6u2c9P6x" role="3cqZAp">
-                                  <node concept="2ShNRf" id="2Qe6u2c9P$P" role="YScLw">
-                                    <node concept="1pGfFk" id="2Qe6u2c9QJr" role="2ShVmc">
-                                      <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
-                                      <node concept="Xl_RD" id="2Qe6u2c9RdL" role="37wK5m">
-                                        <property role="Xl_RC" value="error launching typechecking" />
-                                      </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>
+                                    <node concept="3AV6Ez" id="1FOQehxztBT" role="2OqNvi" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                      </node>
-                      <node concept="37vLTw" id="2Qe6u2c9vFN" role="ukAjM">
-                        <ref role="3cqZAo" node="443LGHBTRnR" resolve="repository" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="2Qe6u2c8EPP" role="2GsD0m">
-                    <node concept="1eOMI4" id="2Qe6u2c8EPQ" role="2Oq$k0">
-                      <node concept="10QFUN" id="2Qe6u2c8EPR" role="1eOMHV">
-                        <node concept="3uibUv" id="78H58of7Ijj" role="10QFUM">
-                          <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                        </node>
-                        <node concept="37vLTw" id="2Qe6u2c8EPT" role="10QFUP">
-                          <ref role="3cqZAo" node="4BHjwwGP7A8" resolve="lastStep" />
+                        <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>
+                            <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="liA8E" id="2Qe6u2c8EPU" role="2OqNvi">
-                      <ref role="37wK5l" node="7lt0LtQA50L" resolve="getTypeNodes" />
+                    <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>
+                      </node>
+                      <node concept="3CFNJx" id="1FOQehxB$3G" role="2OqNvi" />
                     </node>
-                  </node>
-                  <node concept="2GrKxI" id="2Qe6u2c8SOJ" role="2Gsz3X">
-                    <property role="TrG5h" value="m" />
                   </node>
                 </node>
-              </node>
-              <node concept="37vLTw" id="7smgEqg8Iil" role="3clFbw">
-                <ref role="3cqZAo" node="7smgEqg8tya" resolve="ensureLocal" />
+                <node concept="37vLTw" id="1FOQehxzisb" role="3clFbw">
+                  <ref role="3cqZAo" node="7smgEqg8tya" resolve="ensureLocal" />
+                </node>
               </node>
             </node>
-            <node concept="3clFbH" id="2Qe6u2c9WDc" role="3cqZAp" />
           </node>
-          <node concept="2ZW3vV" id="4BHjwwGPbVV" role="3clFbw">
-            <node concept="3uibUv" id="78H58of7GSK" role="2ZW6by">
-              <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-            </node>
-            <node concept="37vLTw" id="4BHjwwGPbVX" role="2ZW6bz">
-              <ref role="3cqZAo" node="4BHjwwGP7A8" resolve="lastStep" />
-            </node>
+          <node concept="37vLTw" id="1FOQehxKbG6" role="ukAjM">
+            <ref role="3cqZAo" node="443LGHBTRnR" resolve="repository" />
           </node>
-          <node concept="9aQIb" id="2Qe6u2c9UYe" role="9aQIa">
-            <node concept="3clFbS" id="2Qe6u2c9UYf" role="9aQI4">
-              <node concept="YS8fn" id="2Qe6u2c9Vub" role="3cqZAp">
-                <node concept="2ShNRf" id="2Qe6u2c9V$N" role="YScLw">
-                  <node concept="1pGfFk" id="2Qe6u2c9WnH" role="2ShVmc">
-                    <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
-                    <node concept="Xl_RD" id="2Qe6u2c9Wv9" role="37wK5m">
-                      <property role="Xl_RC" value="error launching typechecking" />
+        </node>
+        <node concept="3clFbH" id="1FOQehxKedS" 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="3clFbJ" id="1FOQehxzJ$0" role="3cqZAp">
+                      <node concept="3clFbS" id="1FOQehxzJ$2" role="3clFbx">
+                        <node concept="YS8fn" id="1FOQehxzK28" role="3cqZAp">
+                          <node concept="2ShNRf" id="1FOQehxzKb9" role="YScLw">
+                            <node concept="1pGfFk" id="1FOQehxzKX0" role="2ShVmc">
+                              <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.Throwable)" resolve="RuntimeException" />
+                              <node concept="37vLTw" id="1FOQehxzL2K" role="37wK5m">
+                                <ref role="3cqZAo" node="1FOQehxzJoZ" resolve="cause" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3y3z36" id="1FOQehxzJRL" role="3clFbw">
+                        <node concept="10Nm6u" id="1FOQehxzJWr" role="3uHU7w" />
+                        <node concept="37vLTw" id="1FOQehxzJDe" role="3uHU7B">
+                          <ref role="3cqZAo" node="1FOQehxzJoZ" resolve="cause" />
+                        </node>
+                      </node>
+                    </node>
+                  </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>
+                <node concept="3clFbH" id="1FOQehxzHug" role="3cqZAp" />
+                <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)" resolve="RuntimeException" />
+                      <node concept="2OqwBi" id="1FOQehxzNvR" role="37wK5m">
+                        <node concept="37vLTw" id="1FOQehxzNdD" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1FOQehxzEsO" resolve="it" />
+                        </node>
+                        <node concept="liA8E" id="1FOQehxzNNe" role="2OqNvi">
+                          <ref role="37wK5l" to="d6hs:~ReportItem.getMessage():java.lang.String" resolve="getMessage" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
               </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="2Qe6u2c82HB" role="3cqZAp" />
-        <node concept="3clFbF" id="443LGHBj1vn" role="3cqZAp">
-          <node concept="2ShNRf" id="443LGHBj1vj" role="3clFbG">
-            <node concept="YeOm9" id="443LGHBj2bx" role="2ShVmc">
-              <node concept="1Y3b0j" id="443LGHBj2b$" role="YeSDq">
-                <property role="2bfB8j" value="true" />
-                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                <ref role="1Y3XeK" node="6QH_LDtfe19" resolve="TypeCache" />
-                <node concept="3Tm1VV" id="443LGHBj2b_" role="1B3o_S" />
-                <node concept="3clFb_" id="443LGHBj2bA" role="jymVt">
-                  <property role="1EzhhJ" value="false" />
-                  <property role="TrG5h" value="typeOf" />
-                  <node concept="37vLTG" id="443LGHBj2bB" role="3clF46">
-                    <property role="TrG5h" value="nodeRef" />
-                    <node concept="3uibUv" id="443LGHBj2bC" role="1tU5fm">
-                      <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                    </node>
-                  </node>
-                  <node concept="3Tqbb2" id="443LGHBj2bD" role="3clF45" />
-                  <node concept="3Tm1VV" id="443LGHBj2bE" role="1B3o_S" />
-                  <node concept="3clFbS" id="443LGHBj2bG" role="3clF47">
-                    <node concept="3clFbF" id="443LGHBj3_v" role="3cqZAp">
-                      <node concept="3EllGN" id="443LGHBj3_w" role="3clFbG">
-                        <node concept="37vLTw" id="443LGHBj47g" role="3ElVtu">
-                          <ref role="3cqZAo" node="443LGHBj2bB" resolve="nodeRef" />
-                        </node>
-                        <node concept="2OqwBi" id="443LGHBj3__" role="3ElQJh">
-                          <node concept="37vLTw" id="443LGHBj3_A" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4BHjwwGqFx5" resolve="typeNodes" />
-                          </node>
-                          <node concept="liA8E" id="443LGHBj3_B" role="2OqNvi">
-                            <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFb_" id="443LGHB$f_K" role="jymVt">
-                  <property role="1EzhhJ" value="false" />
-                  <property role="TrG5h" value="clear" />
-                  <node concept="3cqZAl" id="443LGHB$f_L" role="3clF45" />
-                  <node concept="3Tm1VV" id="443LGHB$f_M" role="1B3o_S" />
-                  <node concept="3clFbS" id="443LGHB$f_Q" role="3clF47">
-                    <node concept="YS8fn" id="443LGHB$gc$" role="3cqZAp">
-                      <node concept="2ShNRf" id="443LGHB$gom" role="YScLw">
-                        <node concept="1pGfFk" id="443LGHB$hv6" role="2ShVmc">
-                          <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </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>
     </node>
     <node concept="2tJIrI" id="2Qe6u2c7Uvv" role="jymVt" />
-    <node concept="2YIFZL" id="2Qe6u2c8aJv" role="jymVt">
-      <property role="TrG5h" value="helper" />
-      <node concept="3Tm6S6" id="2Qe6u2c8aJw" role="1B3o_S" />
-      <node concept="3uibUv" id="2Qe6u2c8aJx" role="3clF45">
-        <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
+    <node concept="312cEu" id="1FOQehxyYXm" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="TrG5h" value="Sink" />
+      <node concept="2tJIrI" id="1FOQehxz4CI" role="jymVt" />
+      <node concept="3Tm6S6" id="1FOQehxyZ9k" role="1B3o_S" />
+      <node concept="3uibUv" id="1FOQehxyZdF" role="EKbjA">
+        <ref role="3uigEE" to="1yqb:5KrJ7UHMRRs" resolve="ReportSink" />
       </node>
-      <node concept="37vLTG" id="2Qe6u2c8aJy" role="3clF46">
-        <property role="TrG5h" value="nodes" />
-        <node concept="2I9FWS" id="2Qe6u2c8bmb" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2Qe6u2c8aJ$" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="2Qe6u2c8aJ_" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+      <node concept="3clFb_" id="1FOQehxyZf2" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="report" />
+        <node concept="37vLTG" id="1FOQehxyZf3" role="3clF46">
+          <property role="TrG5h" value="reportItem" />
+          <node concept="3uibUv" id="1FOQehxyZf4" role="1tU5fm">
+            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+          </node>
         </node>
-      </node>
-      <node concept="37vLTG" id="6OXbTD_A4DJ" role="3clF46">
-        <property role="TrG5h" value="queryKind" />
-        <node concept="3uibUv" id="2Mi2iz0OAqg" role="1tU5fm">
-          <ref role="3uigEE" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="2Qe6u2c8aJA" role="3clF47">
-        <node concept="3cpWs8" id="2Qe6u2c8aJB" role="3cqZAp">
-          <node concept="3cpWsn" id="2Qe6u2c8aJC" role="3cpWs9">
-            <property role="TrG5h" value="applyTemplatesStep" />
-            <node concept="3uibUv" id="2Qe6u2c8aJD" role="1tU5fm">
-              <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-            </node>
-            <node concept="2ShNRf" id="2Qe6u2c8aJE" role="33vP2m">
-              <node concept="1pGfFk" id="2Qe6u2c8aJF" role="2ShVmc">
-                <ref role="37wK5l" to="1yqb:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
-                <node concept="2YIFZM" id="78H58oeKWzF" role="37wK5m">
-                  <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
-                  <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
-                </node>
-                <node concept="37vLTw" id="2Qe6u2c8aJG" role="37wK5m">
-                  <ref role="3cqZAo" node="2Qe6u2c8aJy" resolve="nodes" />
-                </node>
-                <node concept="37vLTw" id="2Qe6u2c8aJH" role="37wK5m">
-                  <ref role="3cqZAo" node="2Qe6u2c8aJ$" resolve="repository" />
-                </node>
-                <node concept="37vLTw" id="6OXbTD_A6xQ" role="37wK5m">
-                  <ref role="3cqZAo" node="6OXbTD_A4DJ" resolve="queryKind" />
+        <node concept="3cqZAl" id="1FOQehxyZf5" role="3clF45" />
+        <node concept="3Tm1VV" id="1FOQehxyZf6" role="1B3o_S" />
+        <node concept="3clFbS" id="1FOQehxyZf8" role="3clF47">
+          <node concept="3clFbF" id="1FOQehxz0sC" role="3cqZAp">
+            <node concept="2OqwBi" id="1FOQehxz1Tq" role="3clFbG">
+              <node concept="37vLTw" id="1FOQehxz107" role="2Oq$k0">
+                <ref role="3cqZAo" node="1FOQehxyZrr" resolve="reportItems" />
+              </node>
+              <node concept="TSZUe" id="1FOQehxz2zk" role="2OqNvi">
+                <node concept="37vLTw" id="1FOQehxz3JU" role="25WWJ7">
+                  <ref role="3cqZAo" node="1FOQehxyZf3" resolve="reportItem" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="2Qe6u2c8aJI" role="3cqZAp">
-          <node concept="3cpWsn" id="2Qe6u2c8aJJ" role="3cpWs9">
-            <property role="TrG5h" value="evaluateRulesStep" />
-            <property role="3TUv4t" value="false" />
-            <node concept="3uibUv" id="NKt6yn8Csh" role="1tU5fm">
-              <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
-            </node>
-            <node concept="2ShNRf" id="2Qe6u2c8aJL" role="33vP2m">
-              <node concept="1pGfFk" id="NKt6yn8zPo" role="2ShVmc">
-                <ref role="37wK5l" node="NKt6yn84NI" resolve="TypecheckingStep" />
-                <node concept="37vLTw" id="2Qe6u2c8aJN" role="37wK5m">
-                  <ref role="3cqZAo" node="2Qe6u2c8aJ$" resolve="repository" />
-                </node>
-              </node>
-            </node>
+        <node concept="2AHcQZ" id="1FOQehxyZf9" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="1FOQehxz3Sh" role="jymVt" />
+      <node concept="312cEg" id="1FOQehxyZrr" role="jymVt">
+        <property role="TrG5h" value="reportItems" />
+        <node concept="3Tm6S6" id="1FOQehxyZrs" role="1B3o_S" />
+        <node concept="_YKpA" id="1FOQehxyZ$W" role="1tU5fm">
+          <node concept="3uibUv" id="1FOQehxyZHo" role="_ZDj9">
+            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
           </node>
         </node>
-        <node concept="3cpWs6" id="2Qe6u2c8aJU" role="3cqZAp">
-          <node concept="2ShNRf" id="2Qe6u2c8aJV" role="3cqZAk">
-            <node concept="1pGfFk" id="2Qe6u2c8aJW" role="2ShVmc">
-              <ref role="37wK5l" to="1yqb:443LGHBiDEV" resolve="CoderulesHelper" />
-              <node concept="37vLTw" id="2Qe6u2c8aJX" role="37wK5m">
-                <ref role="3cqZAo" node="2Qe6u2c8aJC" resolve="applyTemplatesStep" />
-              </node>
-              <node concept="37vLTw" id="2Qe6u2c8aJY" role="37wK5m">
-                <ref role="3cqZAo" node="2Qe6u2c8aJJ" resolve="evaluateRulesStep" />
-              </node>
+        <node concept="2ShNRf" id="1FOQehxyZWG" role="33vP2m">
+          <node concept="Tc6Ow" id="1FOQehxyZL6" role="2ShVmc">
+            <node concept="3uibUv" id="1FOQehxyZL7" role="HW$YZ">
+              <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
             </node>
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="2Qe6u2c8aJu" role="jymVt" />
+    <node concept="2tJIrI" id="1FOQehxyYJq" role="jymVt" />
     <node concept="3Tm1VV" id="1N_0WA5JxZP" role="1B3o_S" />
     <node concept="3UR2Jj" id="443LGHBisnv" role="lGtFl">
       <node concept="TZ5HA" id="443LGHBisnw" role="TZ5H$">
@@ -1088,13 +924,31 @@
       <node concept="3cqZAl" id="6QH_LDtcxgF" role="3clF45" />
       <node concept="3Tm1VV" id="6QH_LDtcxgG" role="1B3o_S" />
       <node concept="3clFbS" id="6QH_LDtcxgH" role="3clF47">
-        <node concept="3clFbF" id="443LGHC32Vq" role="3cqZAp">
-          <node concept="2OqwBi" id="443LGHC33f0" role="3clFbG">
-            <node concept="37vLTw" id="443LGHC32Vo" role="2Oq$k0">
-              <ref role="3cqZAo" node="6QH_LDtcxh0" resolve="typesModelOwner" />
+        <node concept="3clFbJ" id="1FOQehxKN56" role="3cqZAp">
+          <node concept="3clFbS" id="1FOQehxKN58" role="3clFbx">
+            <node concept="3clFbF" id="443LGHC32Vq" role="3cqZAp">
+              <node concept="2OqwBi" id="443LGHC33f0" role="3clFbG">
+                <node concept="37vLTw" id="443LGHC32Vo" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6QH_LDtcxh0" resolve="typesModelOwner" />
+                </node>
+                <node concept="liA8E" id="443LGHC33u6" role="2OqNvi">
+                  <ref role="37wK5l" to="qox2:2zU3cYq$eDA" resolve="unregister" />
+                </node>
+              </node>
             </node>
-            <node concept="liA8E" id="443LGHC33u6" role="2OqNvi">
-              <ref role="37wK5l" to="qox2:2zU3cYq$eDA" resolve="unregister" />
+            <node concept="3clFbF" id="1FOQehxKOm8" role="3cqZAp">
+              <node concept="37vLTI" id="1FOQehxKOBu" role="3clFbG">
+                <node concept="10Nm6u" id="1FOQehxKONb" role="37vLTx" />
+                <node concept="37vLTw" id="1FOQehxKOm6" role="37vLTJ">
+                  <ref role="3cqZAo" node="6QH_LDtcxh0" resolve="typesModelOwner" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="1FOQehxKNEy" role="3clFbw">
+            <node concept="10Nm6u" id="1FOQehxKNQz" role="3uHU7w" />
+            <node concept="37vLTw" id="1FOQehxKNo0" role="3uHU7B">
+              <ref role="3cqZAo" node="6QH_LDtcxh0" resolve="typesModelOwner" />
             </node>
           </node>
         </node>
@@ -1180,6 +1034,28 @@
       </node>
     </node>
     <node concept="2tJIrI" id="6QH_LDtcxgZ" role="jymVt" />
+    <node concept="3clFb_" id="1FOQehxe9vM" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="allTypes" />
+      <node concept="3rvAFt" id="1FOQehxe9vN" role="3clF45">
+        <node concept="3uibUv" id="1FOQehxe9vO" role="3rvQeY">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+        <node concept="3Tqbb2" id="1FOQehxe9vP" role="3rvSg0" />
+      </node>
+      <node concept="3Tm1VV" id="1FOQehxe9vQ" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehxe9vS" role="3clF47">
+        <node concept="3clFbF" id="1FOQehxeaqO" role="3cqZAp">
+          <node concept="37vLTw" id="1FOQehxeaqN" role="3clFbG">
+            <ref role="3cqZAo" node="6QH_LDtcJq4" resolve="typeNodes" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="1FOQehxe9vT" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehxe9QR" role="jymVt" />
     <node concept="312cEg" id="6QH_LDtcxh0" role="jymVt">
       <property role="TrG5h" value="typesModelOwner" />
       <node concept="3Tm6S6" id="6QH_LDtcxh1" role="1B3o_S" />
@@ -1228,11 +1104,28 @@
       <node concept="3Tm1VV" id="6QH_LDtffJm" role="1B3o_S" />
       <node concept="3clFbS" id="6QH_LDtffJn" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="6QH_LDtffK6" role="jymVt" />
-    <node concept="3Tm1VV" id="6QH_LDtfe1a" role="1B3o_S" />
-    <node concept="3uibUv" id="443LGHBy9d5" role="3HQHJm">
-      <ref role="3uigEE" to="qox2:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
+    <node concept="2tJIrI" id="1FOQehxe54l" role="jymVt" />
+    <node concept="3clFb_" id="1FOQehxe5cU" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="allTypes" />
+      <node concept="3rvAFt" id="1FOQehxe5no" role="3clF45">
+        <node concept="3uibUv" id="1FOQehxe5uo" role="3rvQeY">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+        <node concept="3Tqbb2" id="1FOQehxe5_7" role="3rvSg0" />
+      </node>
+      <node concept="3Tm1VV" id="1FOQehxe5cX" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehxe5cY" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="6QH_LDtffK6" role="jymVt" />
+    <node concept="3clFb_" id="1FOQehxelEi" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="clear" />
+      <node concept="3cqZAl" id="1FOQehxelEk" role="3clF45" />
+      <node concept="3Tm1VV" id="1FOQehxelEl" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehxelEm" role="3clF47" />
+    </node>
+    <node concept="3Tm1VV" id="6QH_LDtfe1a" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="HOeeeUbosT">
     <property role="3GE5qa" value="launch.step" />
@@ -1453,36 +1346,7 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="NKt6yn86zu" role="jymVt" />
-    <node concept="3clFbW" id="NKt6yn87iq" role="jymVt">
-      <node concept="37vLTG" id="3IIf9OAgFCv" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="3IIf9OAgFCw" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="3IIf9OAgHzP" role="3clF46">
-        <property role="TrG5h" value="parameter" />
-        <node concept="3uibUv" id="3IIf9OAgO$P" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3qTvmN" id="3IIf9OAm23N" role="11_B2D" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="NKt6yn87is" role="3clF45" />
-      <node concept="3Tm1VV" id="NKt6yn87it" role="1B3o_S" />
-      <node concept="3clFbS" id="NKt6yn87iu" role="3clF47">
-        <node concept="XkiVB" id="NKt6yn88$I" role="3cqZAp">
-          <ref role="37wK5l" to="1yqb:3IIf9OAgFCl" resolve="EvaluateRulesStep" />
-          <node concept="37vLTw" id="NKt6yn88Ny" role="37wK5m">
-            <ref role="3cqZAo" node="3IIf9OAgFCv" resolve="repository" />
-          </node>
-          <node concept="37vLTw" id="NKt6yn8947" role="37wK5m">
-            <ref role="3cqZAo" node="3IIf9OAgHzP" resolve="parameter" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="78H58of4wE_" role="jymVt" />
+    <node concept="2tJIrI" id="1FOQehwff1G" role="jymVt" />
     <node concept="3clFb_" id="78H58of4zU0" role="jymVt">
       <property role="TrG5h" value="scheduleWithTrace" />
       <property role="1EzhhJ" value="false" />
@@ -1719,16 +1583,16 @@
                 <node concept="3clFb_" id="oI9YsbqwE" role="jymVt">
                   <property role="1EzhhJ" value="false" />
                   <property role="TrG5h" value="report" />
-                  <node concept="37vLTG" id="oI9YsbqwF" role="3clF46">
-                    <property role="TrG5h" value="target" />
-                    <node concept="3Tqbb2" id="oI9YsbqwG" role="1tU5fm" />
-                  </node>
                   <node concept="37vLTG" id="oI9YsbqwH" role="3clF46">
                     <property role="TrG5h" value="kind" />
-                    <node concept="3uibUv" id="oI9YsbqwI" role="1tU5fm">
-                      <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                    <node concept="3uibUv" id="1FOQehwpalJ" role="1tU5fm">
+                      <ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
                     </node>
                   </node>
+                  <node concept="37vLTG" id="oI9YsbqwF" role="3clF46">
+                    <property role="TrG5h" value="target" />
+                    <node concept="2sp9CU" id="1FOQehwMmS7" role="1tU5fm" />
+                  </node>
                   <node concept="37vLTG" id="oI9YsbqwJ" role="3clF46">
                     <property role="TrG5h" value="text" />
                     <node concept="17QB3L" id="oI9YsbqwK" role="1tU5fm" />
@@ -1739,51 +1603,38 @@
                     <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                   <node concept="3clFbS" id="oI9YsbqwS" role="3clF47">
-                    <node concept="3clFbJ" id="oI9Ysbre7" role="3cqZAp">
-                      <node concept="2OqwBi" id="oI9YsbrVU" role="3clFbw">
-                        <node concept="Xl_RD" id="oI9Ysbruj" role="2Oq$k0">
-                          <property role="Xl_RC" value="error" />
+                    <node concept="3clFbF" id="1FOQehx44C2" role="3cqZAp">
+                      <node concept="2OqwBi" id="1FOQehx46b7" role="3clFbG">
+                        <node concept="37vLTw" id="1FOQehx44C0" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1FOQehx3Ss8" resolve="reportItems" />
                         </node>
-                        <node concept="liA8E" id="oI9Ysbsor" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
-                          <node concept="37vLTw" id="oI9YsbsD8" role="37wK5m">
-                            <ref role="3cqZAo" node="oI9YsbqwH" resolve="kind" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbS" id="oI9Ysbre9" role="3clFbx">
-                        <node concept="3clFbF" id="oI9Ysbt3k" role="3cqZAp">
-                          <node concept="37vLTI" id="oI9YsbvTv" role="3clFbG">
-                            <node concept="37vLTw" id="oI9YsbwpJ" role="37vLTx">
-                              <ref role="3cqZAo" node="oI9YsbqwJ" resolve="text" />
-                            </node>
-                            <node concept="3EllGN" id="oI9YsbtHt" role="37vLTJ">
-                              <node concept="2OqwBi" id="oI9YsbuMb" role="3ElVtu">
-                                <node concept="2JrnkZ" id="oI9YsbuyC" role="2Oq$k0">
-                                  <node concept="37vLTw" id="oI9Ysbu8v" role="2JrQYb">
-                                    <ref role="3cqZAo" node="oI9YsbqwF" resolve="target" />
-                                  </node>
-                                </node>
-                                <node concept="liA8E" id="oI9Ysbv9O" role="2OqNvi">
-                                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
-                                </node>
+                        <node concept="TSZUe" id="1FOQehx47D6" role="2OqNvi">
+                          <node concept="2ShNRf" id="1FOQehx47KL" role="25WWJ7">
+                            <node concept="1pGfFk" id="1FOQehx47KM" role="2ShVmc">
+                              <ref role="37wK5l" to="1g4i:1FOQehwow5Q" resolve="TypecheckingReportItem" />
+                              <node concept="37vLTw" id="1FOQehx47KN" role="37wK5m">
+                                <ref role="3cqZAo" node="oI9YsbqwH" resolve="kind" />
                               </node>
-                              <node concept="37vLTw" id="oI9Ysbt3j" role="3ElQJh">
-                                <ref role="3cqZAo" node="7lt0LtQ_XxI" resolve="errors" />
+                              <node concept="37vLTw" id="1FOQehx47KO" role="37wK5m">
+                                <ref role="3cqZAo" node="oI9YsbqwF" resolve="target" />
+                              </node>
+                              <node concept="37vLTw" id="1FOQehx47KP" role="37wK5m">
+                                <ref role="3cqZAo" node="oI9YsbqwJ" resolve="text" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="3cpWs6" id="oI9YsbwWO" role="3cqZAp">
-                          <node concept="3clFbT" id="oI9Ysbxg1" role="3cqZAk">
-                            <property role="3clFbU" value="true" />
-                          </node>
-                        </node>
                       </node>
                     </node>
-                    <node concept="3cpWs6" id="oI9Ysby3S" role="3cqZAp">
-                      <node concept="3clFbT" id="oI9Ysbyzu" role="3cqZAk">
-                        <property role="3clFbU" value="false" />
+                    <node concept="3cpWs6" id="1FOQehx50Bb" role="3cqZAp">
+                      <node concept="3y3z36" id="1FOQehx53Aw" role="3cqZAk">
+                        <node concept="37vLTw" id="1FOQehx54pE" role="3uHU7w">
+                          <ref role="3cqZAo" node="oI9YsbqwH" resolve="kind" />
+                        </node>
+                        <node concept="Rm8GO" id="1FOQehx51aJ" role="3uHU7B">
+                          <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                          <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -1853,6 +1704,23 @@
       </node>
     </node>
     <node concept="2tJIrI" id="78H58of7_So" role="jymVt" />
+    <node concept="3clFb_" id="1FOQehx3WGd" role="jymVt">
+      <property role="TrG5h" value="getReportItems" />
+      <node concept="3vKaQO" id="1FOQehx403O" role="3clF45">
+        <node concept="3uibUv" id="1FOQehx41Iq" role="3O5elw">
+          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="1FOQehx3WGh" role="1B3o_S" />
+      <node concept="3clFbS" id="1FOQehx3WGi" role="3clF47">
+        <node concept="3clFbF" id="1FOQehx43$$" role="3cqZAp">
+          <node concept="37vLTw" id="1FOQehx43$z" role="3clFbG">
+            <ref role="3cqZAo" node="1FOQehx3Ss8" resolve="reportItems" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1FOQehx3WGc" role="jymVt" />
     <node concept="3clFb_" id="78H58of7_Sp" role="jymVt">
       <property role="TrG5h" value="getTypesModelOwner" />
       <node concept="3uibUv" id="78H58of7_Sq" role="3clF45">
@@ -1923,6 +1791,22 @@
         </node>
       </node>
     </node>
+    <node concept="312cEg" id="1FOQehx3Ss8" role="jymVt">
+      <property role="TrG5h" value="reportItems" />
+      <node concept="3Tm6S6" id="1FOQehx3Ss9" role="1B3o_S" />
+      <node concept="_YKpA" id="1FOQehx3Upg" role="1tU5fm">
+        <node concept="3uibUv" id="1FOQehx3UTJ" role="_ZDj9">
+          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="1FOQehx3WdM" role="33vP2m">
+        <node concept="Tc6Ow" id="1FOQehx3W9s" role="2ShVmc">
+          <node concept="3uibUv" id="1FOQehx3W9t" role="HW$YZ">
+            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="312cEg" id="78H58of5Vry" role="jymVt">
       <property role="TrG5h" value="typesModelOwner" />
       <node concept="3Tm6S6" id="78H58of5Vrz" role="1B3o_S" />