From 661ee068ffb33f084ac76cd956e4afedf2a5115b Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 28 Aug 2024 13:42:21 +0200
Subject: [PATCH] Refactor caching system; drop obsolete classes

---
 ...ains.mps.coderules.testhelper.testutil.mps |  304 +-
 ...rains.mps.coderules.typechecking@tests.mps |  363 +-
 ...ains.mps.coderules.typechecking.plugin.mps |  186 +-
 ...ins.mps.coderules.typechecking.service.mps | 9376 ++++++++---------
 .../models/firstOrderLogic@tests.mps          |  172 +-
 .../models/herbrandLogic@tests.mps            |   28 +-
 .../models/propositionalLogic@tests.mps       |  267 +-
 .../models/samples.lambdacalc.demo@tests.mps  |  402 +-
 ...nguage.closuresExt.test.closures@tests.mps |  108 +-
 ...age.closuresExt.test.collections@tests.mps |   48 +-
 ...e.collectionsExt.test.containers@tests.mps |  234 +-
 ...age.collectionsExt.test.sequence@tests.mps |   24 +-
 ...ge.methodReferencesExt.test.code@tests.mps |   84 +-
 ...ethodReferencesExt.test.features@tests.mps |   24 +-
 ...seLanguage.tuplesExt.test.tuples@tests.mps |   24 +-
 ...ps.baseLanguageExt.test.features@tests.mps |  370 +-
 ...ps.baseLanguageExt.test.generics@tests.mps |  252 +-
 ...mps.baseLanguageExt.test.staging@tests.mps |   24 +-
 ...mps.baseLanguageExt.test.thinlet@tests.mps |   26 +-
 ...ins.mps.lang.smodelExt.test.code@tests.mps |   84 +-
 .../models/bounds@tests.mps                   |   64 +-
 .../models/helloWorld@tests.mps               |   92 +-
 22 files changed, 5839 insertions(+), 6717 deletions(-)

diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
index 420a82e6..c9236aef 100644
--- a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
@@ -187,7 +187,6 @@
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
       </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" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
@@ -5020,8 +5019,26 @@
                 <ref role="2Oxat5" node="5Qx6_65wuyf" resolve="typesIndex" />
               </node>
             </node>
-            <node concept="1rXfSq" id="3j46jeGLJ6E" role="37vLTx">
-              <ref role="37wK5l" node="WJTIIoWnAS" resolve="newIndex" />
+            <node concept="2ShNRf" id="7Aoa2yVNQiS" role="37vLTx">
+              <node concept="HV5vD" id="7Aoa2yVNQiT" role="2ShVmc">
+                <ref role="HV5vE" to="tj24:7Aoa2yVdSP8" resolve="ReportedTypes" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7Aoa2yVQt6v" role="3cqZAp">
+          <node concept="37vLTI" id="7Aoa2yVQvx1" role="3clFbG">
+            <node concept="2ShNRf" id="7Aoa2yVQwgd" role="37vLTx">
+              <node concept="HV5vD" id="7Aoa2yVQxQa" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="HV5vE" to="tj24:7Aoa2yVfU_u" resolve="ReportedItems" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7Aoa2yVQtkN" role="37vLTJ">
+              <node concept="Xjq3P" id="7Aoa2yVQt6t" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7Aoa2yVQu_Q" role="2OqNvi">
+                <ref role="2Oxat5" node="7Aoa2yVNxRN" resolve="reportedItems" />
+              </node>
             </node>
           </node>
         </node>
@@ -5034,15 +5051,32 @@
         <node concept="3clFbH" id="WJTIIoZMsv" role="3cqZAp" />
         <node concept="3cpWs8" id="WJTIIoWrMe" role="3cqZAp">
           <node concept="3cpWsn" id="WJTIIoWrMf" role="3cpWs9">
-            <property role="TrG5h" value="newIndex" />
+            <property role="TrG5h" value="newReportedTypes" />
             <node concept="3uibUv" id="WJTIIp0B55" role="1tU5fm">
-              <ref role="3uigEE" node="WJTIIoVdei" resolve="TypeIndexIncrementalLauncher.TestTypesIndex" />
+              <ref role="3uigEE" to="tj24:7Aoa2yVdSP8" resolve="ReportedTypes" />
             </node>
-            <node concept="1rXfSq" id="WJTIIoWszE" role="33vP2m">
-              <ref role="37wK5l" node="WJTIIoWnAS" resolve="newIndex" />
+            <node concept="2ShNRf" id="7Aoa2yVNR2a" role="33vP2m">
+              <node concept="HV5vD" id="7Aoa2yVNR2b" role="2ShVmc">
+                <ref role="HV5vE" to="tj24:7Aoa2yVdSP8" resolve="ReportedTypes" />
+              </node>
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="7Aoa2yVNXMP" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVNXMQ" role="3cpWs9">
+            <property role="TrG5h" value="newReportedItems" />
+            <node concept="3uibUv" id="7Aoa2yVNXMR" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:7Aoa2yVfU_u" resolve="ReportedItems" />
+            </node>
+            <node concept="2ShNRf" id="7Aoa2yVO5l3" role="33vP2m">
+              <node concept="HV5vD" id="7Aoa2yVO7Nm" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="HV5vE" to="tj24:7Aoa2yVfU_u" resolve="ReportedItems" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7Aoa2yVO9sB" role="3cqZAp" />
         <node concept="2Gpval" id="1z4$59jdVSO" role="3cqZAp">
           <node concept="3clFbS" id="1z4$59jdVSP" role="2LFqv$">
             <node concept="3clFbJ" id="1z4$59jdVTp" role="3cqZAp">
@@ -5067,7 +5101,7 @@
             <node concept="3clFbF" id="1z4$59jdVTx" role="3cqZAp">
               <node concept="2OqwBi" id="1z4$59jdVTM" role="3clFbG">
                 <node concept="liA8E" id="1z4$59jdVTL" role="2OqNvi">
-                  <ref role="37wK5l" node="1z4$59je3qp" resolve="putType" />
+                  <ref role="37wK5l" to="tj24:7Aoa2yVe2QA" resolve="putType" />
                   <node concept="2OqwBi" id="1z4$59jdVTz" role="37wK5m">
                     <node concept="2GrUjf" id="1z4$59jdVT$" role="2Oq$k0">
                       <ref role="2Gs0qQ" node="1z4$59jdVTG" resolve="m" />
@@ -5092,7 +5126,7 @@
               <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="typesIndex" />
             </node>
             <node concept="liA8E" id="1z4$59je8Zm" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:1FOQehxe9vM" resolve="allTypes" />
+              <ref role="37wK5l" to="tj24:7Aoa2yVI_mh" resolve="allTypes" />
             </node>
           </node>
           <node concept="2GrKxI" id="1z4$59jdVTG" role="2Gsz3X">
@@ -5178,13 +5212,13 @@
             <node concept="3clFbF" id="1z4$59jegXC" role="3cqZAp">
               <node concept="2OqwBi" id="1z4$59jegYf" role="3clFbG">
                 <node concept="liA8E" id="1z4$59jegYe" role="2OqNvi">
-                  <ref role="37wK5l" node="1z4$59jenqx" resolve="addReportItem" />
+                  <ref role="37wK5l" to="tj24:7Aoa2yVg8DK" resolve="addReportItem" />
                   <node concept="37vLTw" id="1z4$59jegXE" role="37wK5m">
                     <ref role="3cqZAo" node="1z4$59jegXF" resolve="it" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="1z4$59jeiRG" role="2Oq$k0">
-                  <ref role="3cqZAo" node="WJTIIoWrMf" resolve="newIndex" />
+                  <ref role="3cqZAo" node="7Aoa2yVNXMQ" resolve="newReportedItems" />
                 </node>
               </node>
             </node>
@@ -5198,10 +5232,10 @@
           <node concept="2OqwBi" id="362mGRZLGZ1" role="1DdaDG">
             <node concept="2OqwBi" id="1z4$59jegXH" role="2Oq$k0">
               <node concept="37vLTw" id="1z4$59jegYb" role="2Oq$k0">
-                <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="typesIndex" />
+                <ref role="3cqZAo" node="7Aoa2yVNxRN" resolve="reportedItems" />
               </node>
               <node concept="liA8E" id="1z4$59jej9y" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:3yEb0I3SXN3" resolve="allReportItems" />
+                <ref role="37wK5l" to="tj24:7Aoa2yVl_uk" resolve="allReportItems" />
               </node>
             </node>
             <node concept="UnYns" id="362mGRZLIqU" role="2OqNvi">
@@ -5218,7 +5252,7 @@
               <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="typesIndex" />
             </node>
             <node concept="liA8E" id="WJTIIoZOVR" role="2OqNvi">
-              <ref role="37wK5l" node="WJTIIoVgXI" resolve="clear" />
+              <ref role="37wK5l" to="tj24:7Aoa2yVdVDc" resolve="clear" />
             </node>
           </node>
         </node>
@@ -5232,14 +5266,13 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="WJTIIp0C2k" role="3cqZAp" />
         <node concept="3clFbF" id="WJTIIp0_sJ" role="3cqZAp">
           <node concept="2OqwBi" id="WJTIIp0_G0" role="3clFbG">
             <node concept="37vLTw" id="WJTIIp0_sH" role="2Oq$k0">
               <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="typesIndex" />
             </node>
             <node concept="liA8E" id="WJTIIp0AgC" role="2OqNvi">
-              <ref role="37wK5l" node="1z4$59jdhR$" resolve="putAllTypes" />
+              <ref role="37wK5l" to="tj24:7Aoa2yVe2QP" resolve="putAllTypes" />
               <node concept="2OqwBi" id="WJTIIp9ct_" role="37wK5m">
                 <node concept="37vLTw" id="WJTIIp0AxH" role="2Oq$k0">
                   <ref role="3cqZAo" node="WJTIIoZGPA" resolve="typesDelta" />
@@ -5251,18 +5284,39 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="qsErMwqiyZ" role="3cqZAp" />
+        <node concept="3clFbF" id="qsErMwqkr0" role="3cqZAp">
+          <node concept="2OqwBi" id="qsErMwqmeu" role="3clFbG">
+            <node concept="37vLTw" id="qsErMwqkqY" role="2Oq$k0">
+              <ref role="3cqZAo" node="7Aoa2yVNxRN" resolve="reportedItems" />
+            </node>
+            <node concept="liA8E" id="qsErMwqnZ3" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:7Aoa2yVQVr5" resolve="clear" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="qsErMwqrrE" role="3cqZAp">
+          <node concept="37vLTI" id="qsErMwqtcQ" role="3clFbG">
+            <node concept="37vLTw" id="qsErMwqv2N" role="37vLTx">
+              <ref role="3cqZAo" node="7Aoa2yVNXMQ" resolve="newReportedItems" />
+            </node>
+            <node concept="37vLTw" id="qsErMwqrrC" role="37vLTJ">
+              <ref role="3cqZAo" node="7Aoa2yVNxRN" resolve="reportedItems" />
+            </node>
+          </node>
+        </node>
         <node concept="1DcWWT" id="362mGRZM0tb" role="3cqZAp">
           <node concept="3clFbS" id="362mGRZM0tc" role="2LFqv$">
             <node concept="3clFbF" id="362mGRZM0tf" role="3cqZAp">
               <node concept="2OqwBi" id="362mGRZM0tg" role="3clFbG">
                 <node concept="liA8E" id="362mGRZM0th" role="2OqNvi">
-                  <ref role="37wK5l" node="1z4$59jenqx" resolve="addReportItem" />
+                  <ref role="37wK5l" to="tj24:7Aoa2yVg8DK" resolve="addReportItem" />
                   <node concept="37vLTw" id="362mGRZM0ti" role="37wK5m">
                     <ref role="3cqZAo" node="362mGRZM0tr" resolve="it" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="362mGRZM1HB" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="typesIndex" />
+                  <ref role="3cqZAo" node="7Aoa2yVNxRN" resolve="reportedItems" />
                 </node>
               </node>
             </node>
@@ -5338,7 +5392,7 @@
                   <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="typesIndex" />
                 </node>
                 <node concept="liA8E" id="WJTIIoViYf" role="2OqNvi">
-                  <ref role="37wK5l" node="WJTIIoVgXI" resolve="clear" />
+                  <ref role="37wK5l" to="tj24:7Aoa2yVdVDc" resolve="clear" />
                 </node>
               </node>
             </node>
@@ -5355,11 +5409,49 @@
             <node concept="2OqwBi" id="WJTIIoV2fD" role="37vLTJ">
               <node concept="Xjq3P" id="WJTIIoV2fE" role="2Oq$k0" />
               <node concept="2OwXpG" id="WJTIIoV2fF" role="2OqNvi">
-                <ref role="2Oxat5" node="5Qx6_65wuyf" resolve="typesIndex" />
+                <ref role="2Oxat5" node="5Qx6_65wuyf" resolve="reportedTypes" />
               </node>
             </node>
-            <node concept="1rXfSq" id="WJTIIoWrjc" role="37vLTx">
-              <ref role="37wK5l" node="WJTIIoWnAS" resolve="newIndex" />
+            <node concept="2ShNRf" id="7Aoa2yVQA4Q" role="37vLTx">
+              <node concept="HV5vD" id="7Aoa2yVQA4R" role="2ShVmc">
+                <ref role="HV5vE" to="tj24:7Aoa2yVdSP8" resolve="ReportedTypes" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="7Aoa2yVQ$vN" role="3cqZAp">
+          <node concept="3clFbS" id="7Aoa2yVQ$vP" role="3clFbx">
+            <node concept="3clFbF" id="7Aoa2yVQNqi" role="3cqZAp">
+              <node concept="2OqwBi" id="7Aoa2yVQOWu" role="3clFbG">
+                <node concept="37vLTw" id="7Aoa2yVQNqg" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7Aoa2yVNxRN" resolve="reportedItems" />
+                </node>
+                <node concept="liA8E" id="7Aoa2yVRbjF" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:7Aoa2yVQVr5" resolve="clear" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="7Aoa2yVQKuW" role="3clFbw">
+            <node concept="10Nm6u" id="7Aoa2yVQLGJ" role="3uHU7w" />
+            <node concept="37vLTw" id="7Aoa2yVQELB" role="3uHU7B">
+              <ref role="3cqZAo" node="7Aoa2yVNxRN" resolve="reportedItems" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7Aoa2yVReOr" role="3cqZAp">
+          <node concept="37vLTI" id="7Aoa2yVRlv6" role="3clFbG">
+            <node concept="2ShNRf" id="7Aoa2yVRn92" role="37vLTx">
+              <node concept="HV5vD" id="7Aoa2yVRpQi" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="HV5vE" to="tj24:7Aoa2yVfU_u" resolve="ReportedItems" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7Aoa2yVRg2G" role="37vLTJ">
+              <node concept="Xjq3P" id="7Aoa2yVReOp" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7Aoa2yVRidB" role="2OqNvi">
+                <ref role="2Oxat5" node="7Aoa2yVNxRN" resolve="reportedItems" />
+              </node>
             </node>
           </node>
         </node>
@@ -5380,7 +5472,7 @@
               <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="typesIndex" />
             </node>
             <node concept="liA8E" id="WJTIIoUQwv" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:1FOQehxe9vM" resolve="allTypes" />
+              <ref role="37wK5l" to="tj24:7Aoa2yVI_mh" resolve="allTypes" />
             </node>
           </node>
         </node>
@@ -5404,10 +5496,10 @@
               <node concept="2OqwBi" id="WJTIIoVjFv" role="2Oq$k0">
                 <node concept="2OqwBi" id="WJTIIoV2MM" role="2Oq$k0">
                   <node concept="37vLTw" id="WJTIIoV2EE" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5Qx6_65wuyf" resolve="typesIndex" />
+                    <ref role="3cqZAo" node="7Aoa2yVNxRN" resolve="reportedItems" />
                   </node>
                   <node concept="liA8E" id="WJTIIoVjdV" role="2OqNvi">
-                    <ref role="37wK5l" to="tj24:3yEb0I3SXN3" resolve="allReportItems" />
+                    <ref role="37wK5l" to="tj24:7Aoa2yVl_uk" resolve="allReportItems" />
                   </node>
                 </node>
                 <node concept="UnYns" id="WJTIIoVkAW" role="2OqNvi">
@@ -5433,162 +5525,18 @@
       </node>
     </node>
     <node concept="2tJIrI" id="WJTIIoVbDF" role="jymVt" />
-    <node concept="3clFb_" id="WJTIIoWnAS" role="jymVt">
-      <property role="TrG5h" value="newIndex" />
-      <node concept="3clFbS" id="WJTIIoWnAV" role="3clF47">
-        <node concept="3cpWs6" id="WJTIIoWocI" role="3cqZAp">
-          <node concept="2ShNRf" id="WJTIIoUXxB" role="3cqZAk">
-            <node concept="HV5vD" id="55xYlrl_L92" role="2ShVmc">
-              <ref role="HV5vE" node="WJTIIoVdei" resolve="TypeIndexIncrementalLauncher.TestTypesIndex" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="WJTIIoWjM9" role="1B3o_S" />
-      <node concept="3uibUv" id="WJTIIoWnqn" role="3clF45">
-        <ref role="3uigEE" node="WJTIIoVdei" resolve="TypeIndexIncrementalLauncher.TestTypesIndex" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="WJTIIoVcF4" role="jymVt" />
-    <node concept="312cEu" id="WJTIIoVdei" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="TestTypesIndex" />
-      <node concept="3Tm6S6" id="WJTIIoVi_5" role="1B3o_S" />
-      <node concept="3uibUv" id="WJTIIoVe7c" role="1zkMxy">
-        <ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-      </node>
-      <node concept="2tJIrI" id="WJTIIoVgCH" role="jymVt" />
-      <node concept="3clFb_" id="WJTIIoVgXI" role="jymVt">
-        <property role="TrG5h" value="clear" />
-        <node concept="3clFbS" id="WJTIIoVgXL" role="3clF47">
-          <node concept="3clFbF" id="WJTIIoVhuG" role="3cqZAp">
-            <node concept="3nyPlj" id="WJTIIoVhuF" role="3clFbG">
-              <ref role="37wK5l" to="tj24:6QH_LDtcxgE" resolve="clear" />
-            </node>
-          </node>
-        </node>
-        <node concept="3Tmbuc" id="WJTIIoW$16" role="1B3o_S" />
-        <node concept="3cqZAl" id="WJTIIoVhg_" role="3clF45" />
-      </node>
-      <node concept="2tJIrI" id="1z4$59jdh5g" role="jymVt" />
-      <node concept="3clFb_" id="1z4$59je3qp" role="jymVt">
-        <property role="TrG5h" value="putType" />
-        <node concept="37vLTG" id="1z4$59je3qq" role="3clF46">
-          <property role="TrG5h" value="ref" />
-          <node concept="3uibUv" id="1z4$59je3qr" role="1tU5fm">
-            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="1z4$59je3qs" role="3clF46">
-          <property role="TrG5h" value="type" />
-          <node concept="3Tqbb2" id="1z4$59je3qt" role="1tU5fm" />
-        </node>
-        <node concept="3cqZAl" id="1z4$59je3qu" role="3clF45" />
-        <node concept="3Tm1VV" id="1z4$59je3qv" role="1B3o_S" />
-        <node concept="3clFbS" id="1z4$59je3qG" role="3clF47">
-          <node concept="3clFbF" id="1z4$59je3qL" role="3cqZAp">
-            <node concept="3nyPlj" id="1z4$59je3qK" role="3clFbG">
-              <ref role="37wK5l" to="tj24:6QH_LDtcYUC" resolve="putType" />
-              <node concept="37vLTw" id="1z4$59je3qI" role="37wK5m">
-                <ref role="3cqZAo" node="1z4$59je3qq" resolve="ref" />
-              </node>
-              <node concept="37vLTw" id="1z4$59je3qJ" role="37wK5m">
-                <ref role="3cqZAo" node="1z4$59je3qs" resolve="type" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="1z4$59je3qH" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="1z4$59jeD9R" role="jymVt" />
-      <node concept="3clFb_" id="1z4$59jdhR$" role="jymVt">
-        <property role="TrG5h" value="putAllTypes" />
-        <node concept="37vLTG" id="1z4$59jdhR_" role="3clF46">
-          <property role="TrG5h" value="loc2typeNode" />
-          <node concept="3rvAFt" id="1z4$59jdhRA" role="1tU5fm">
-            <node concept="3Tqbb2" id="1z4$59jdhRB" role="3rvSg0" />
-            <node concept="2sp9CU" id="1z4$59jdhRC" role="3rvQeY" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="1z4$59jdhRD" role="3clF45" />
-        <node concept="3Tm1VV" id="1z4$59jdjlc" role="1B3o_S" />
-        <node concept="3clFbS" id="1z4$59jdhS8" role="3clF47">
-          <node concept="3clFbF" id="1z4$59jdhSc" role="3cqZAp">
-            <node concept="3nyPlj" id="1z4$59jdhSb" role="3clFbG">
-              <ref role="37wK5l" to="tj24:6$gg4kA3UdB" resolve="putAllTypes" />
-              <node concept="37vLTw" id="1z4$59jdhSa" role="37wK5m">
-                <ref role="3cqZAo" node="1z4$59jdhR_" resolve="loc2typeNode" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="1z4$59jdhS9" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="3clFb_" id="1z4$59jenqx" role="jymVt">
-        <property role="TrG5h" value="addReportItem" />
-        <node concept="3Tm1VV" id="1z4$59jenqy" role="1B3o_S" />
-        <node concept="3cqZAl" id="1z4$59jenrl" role="3clF45" />
-        <node concept="37vLTG" id="1z4$59jenrm" role="3clF46">
-          <property role="TrG5h" value="ri" />
-          <node concept="3uibUv" id="1z4$59jenrn" role="1tU5fm">
-            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="1z4$59jenro" role="3clF47">
-          <node concept="3clFbF" id="1z4$59jenrs" role="3cqZAp">
-            <node concept="3nyPlj" id="1z4$59jenrr" role="3clFbG">
-              <ref role="37wK5l" to="tj24:3yEb0I3WCjJ" resolve="addReportItem" />
-              <node concept="37vLTw" id="1z4$59jenrq" role="37wK5m">
-                <ref role="3cqZAo" node="1z4$59jenrm" resolve="ri" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="1z4$59jenrp" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="1z4$59jeGQz" role="jymVt" />
-      <node concept="3clFb_" id="1z4$59jetoN" role="jymVt">
-        <property role="TrG5h" value="addReportItems" />
-        <node concept="3Tm1VV" id="1z4$59jetoO" role="1B3o_S" />
-        <node concept="3cqZAl" id="1z4$59jetoY" role="3clF45" />
-        <node concept="37vLTG" id="1z4$59jetoZ" role="3clF46">
-          <property role="TrG5h" value="items" />
-          <node concept="A3Dl8" id="1z4$59jetp0" role="1tU5fm">
-            <node concept="3qUE_q" id="1z4$59jetp1" role="A3Ik2">
-              <node concept="3uibUv" id="1z4$59jetp2" role="3qUE_r">
-                <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbS" id="1z4$59jetp3" role="3clF47">
-          <node concept="3clFbF" id="1z4$59jetp7" role="3cqZAp">
-            <node concept="3nyPlj" id="1z4$59jetp6" role="3clFbG">
-              <ref role="37wK5l" to="tj24:9dktABHyKF" resolve="addReportItems" />
-              <node concept="37vLTw" id="1z4$59jetp5" role="37wK5m">
-                <ref role="3cqZAo" node="1z4$59jetoZ" resolve="items" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="1z4$59jetp4" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="WJTIIoV3ib" role="jymVt" />
-    <node concept="2tJIrI" id="WJTIIoU_Aj" role="jymVt" />
     <node concept="312cEg" id="5Qx6_65wuyf" role="jymVt">
-      <property role="TrG5h" value="typesIndex" />
+      <property role="TrG5h" value="reportedTypes" />
       <node concept="3Tm6S6" id="WJTIIoViiv" role="1B3o_S" />
       <node concept="3uibUv" id="WJTIIoVhQN" role="1tU5fm">
-        <ref role="3uigEE" node="WJTIIoVdei" resolve="TypeIndexIncrementalLauncher.TestTypesIndex" />
+        <ref role="3uigEE" to="tj24:7Aoa2yVdSP8" resolve="ReportedTypes" />
+      </node>
+    </node>
+    <node concept="312cEg" id="7Aoa2yVNxRN" role="jymVt">
+      <property role="TrG5h" value="reportedItems" />
+      <node concept="3Tm6S6" id="7Aoa2yVNxRO" role="1B3o_S" />
+      <node concept="3uibUv" id="7Aoa2yVNxRP" role="1tU5fm">
+        <ref role="3uigEE" to="tj24:7Aoa2yVfU_u" resolve="ReportedItems" />
       </node>
     </node>
     <node concept="312cEg" id="WJTIIoUV8P" role="jymVt">
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index 8a4a856d..6a4e5ac1 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -72,6 +72,7 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
@@ -244,6 +245,7 @@
       <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="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -516,30 +518,39 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="27bTNFfbxlM" role="3cqZAp">
-          <node concept="3cpWsn" id="27bTNFfbxlN" role="3cpWs9">
-            <property role="TrG5h" value="checkTypes" />
-            <node concept="3uibUv" id="27bTNFfbxlO" role="1tU5fm">
-              <ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+        <node concept="3cpWs8" id="7Aoa2yVLKBf" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVLKBg" role="3cpWs9">
+            <property role="TrG5h" value="ofNode" />
+            <node concept="3uibUv" id="7Aoa2yVLKzM" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:27bTNFfaJxq" resolve="TypecheckingTestHelper.Checker" />
             </node>
-            <node concept="2OqwBi" id="27bTNFfbxlP" role="33vP2m">
-              <node concept="2YIFZM" id="27bTNFfbxlQ" role="2Oq$k0">
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="37vLTw" id="27bTNFfbxlR" role="37wK5m">
-                  <ref role="3cqZAo" node="4BHjwwGTLX6" resolve="demo" />
-                </node>
-                <node concept="1jxXqW" id="27bTNFfc2nC" role="37wK5m" />
+            <node concept="2YIFZM" id="7Aoa2yVLKBh" role="33vP2m">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+              <node concept="37vLTw" id="7Aoa2yVLKBi" role="37wK5m">
+                <ref role="3cqZAo" node="4BHjwwGTLX6" resolve="demo" />
               </node>
-              <node concept="liA8E" id="27bTNFfbxlT" role="2OqNvi">
+              <node concept="1jxXqW" id="7Aoa2yVLKBj" role="37wK5m" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7Aoa2yVGYj2" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVGYj3" role="3cpWs9">
+            <property role="TrG5h" value="checkTypes" />
+            <node concept="10P_77" id="7Aoa2yVGYag" role="1tU5fm" />
+            <node concept="2OqwBi" id="7Aoa2yVGYj4" role="33vP2m">
+              <node concept="37vLTw" id="7Aoa2yVLKBk" role="2Oq$k0">
+                <ref role="3cqZAo" node="7Aoa2yVLKBg" resolve="ofNode" />
+              </node>
+              <node concept="liA8E" id="7Aoa2yVGYj8" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="2Hmddi" id="7gMIJIxMdm6" role="3cqZAp">
-          <node concept="37vLTw" id="7gMIJIxMdso" role="2Hmdds">
-            <ref role="3cqZAo" node="27bTNFfbxlN" resolve="checkTypes" />
+        <node concept="3vwNmj" id="7Aoa2yVGYyK" role="3cqZAp">
+          <node concept="37vLTw" id="7Aoa2yVGYEn" role="3vwVQn">
+            <ref role="3cqZAo" node="7Aoa2yVGYj3" resolve="checkTypes" />
           </node>
         </node>
         <node concept="3clFbH" id="7gMIJIxMdwJ" role="3cqZAp" />
@@ -551,11 +562,16 @@
                   <property role="TrG5h" value="typeFoo" />
                   <node concept="3Tqbb2" id="4BHjwwGqWQm" role="1tU5fm" />
                   <node concept="2OqwBi" id="7y50OW6ZH4n" role="33vP2m">
-                    <node concept="37vLTw" id="443LGHBj7MB" role="2Oq$k0">
-                      <ref role="3cqZAo" node="27bTNFfbxlN" resolve="checkTypes" />
+                    <node concept="2OqwBi" id="7Aoa2yVLKS_" role="2Oq$k0">
+                      <node concept="37vLTw" id="443LGHBj7MB" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7Aoa2yVLKBg" resolve="ofNode" />
+                      </node>
+                      <node concept="liA8E" id="7Aoa2yVLLj1" role="2OqNvi">
+                        <ref role="37wK5l" to="tj24:7Aoa2yVLrwM" resolve="getCachedTypes" />
+                      </node>
                     </node>
                     <node concept="liA8E" id="7y50OW6ZH4p" role="2OqNvi">
-                      <ref role="37wK5l" to="tj24:6QH_LDtcxgN" resolve="getType" />
+                      <ref role="37wK5l" to="tj24:7Aoa2yVpIT7" resolve="getType" />
                       <node concept="2tJFMh" id="7mB3viLeIwC" role="37wK5m">
                         <node concept="ZC_QK" id="7mB3viLeIII" role="2tJFKM">
                           <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
@@ -573,11 +589,16 @@
                   <property role="TrG5h" value="typeBar" />
                   <node concept="3Tqbb2" id="4BHjwwGqWVs" role="1tU5fm" />
                   <node concept="2OqwBi" id="7y50OW701J3" role="33vP2m">
-                    <node concept="37vLTw" id="443LGHBj7W9" role="2Oq$k0">
-                      <ref role="3cqZAo" node="27bTNFfbxlN" resolve="checkTypes" />
+                    <node concept="2OqwBi" id="7Aoa2yVLLAu" role="2Oq$k0">
+                      <node concept="37vLTw" id="443LGHBj7W9" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7Aoa2yVLKBg" resolve="ofNode" />
+                      </node>
+                      <node concept="liA8E" id="7Aoa2yVLM1S" role="2OqNvi">
+                        <ref role="37wK5l" to="tj24:7Aoa2yVLrwM" resolve="getCachedTypes" />
+                      </node>
                     </node>
                     <node concept="liA8E" id="7y50OW701J5" role="2OqNvi">
-                      <ref role="37wK5l" to="tj24:6QH_LDtcxgN" resolve="getType" />
+                      <ref role="37wK5l" to="tj24:7Aoa2yVpIT7" resolve="getType" />
                       <node concept="2tJFMh" id="7mB3viLeJ4H" role="37wK5m">
                         <node concept="ZC_QK" id="7mB3viLeJ4I" role="2tJFKM">
                           <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
@@ -2731,14 +2752,14 @@
                 <node concept="3cpWsn" id="6QH_LDtdVHk" role="3cpWs9">
                   <property role="TrG5h" value="typesCache" />
                   <node concept="3uibUv" id="1FOQehxeuXN" role="1tU5fm">
-                    <ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+                    <ref role="3uigEE" to="tj24:4Z$O9mrQJw7" resolve="CacheHolder" />
                   </node>
                   <node concept="2OqwBi" id="6QH_LDtdVHl" role="33vP2m">
                     <node concept="37vLTw" id="6QH_LDtdVHm" role="2Oq$k0">
                       <ref role="3cqZAo" node="6QH_LDtdTgs" resolve="typecheckingState" />
                     </node>
                     <node concept="liA8E" id="6QH_LDtdVHn" role="2OqNvi">
-                      <ref role="37wK5l" to="tj24:4Z$O9mrQJgp" resolve="cachedTypecheckingResults" />
+                      <ref role="37wK5l" to="tj24:7Aoa2yVAE2W" resolve="getCacheHolder" />
                       <node concept="2OqwBi" id="443LGHB5OH6" role="37wK5m">
                         <node concept="2JrnkZ" id="443LGHB5Olz" role="2Oq$k0">
                           <node concept="37vLTw" id="7mB3viLe3ou" role="2JrQYb">
@@ -2761,124 +2782,118 @@
               <node concept="3clFbH" id="14$_tTx$ElE" role="3cqZAp" />
               <node concept="3J1_TO" id="14$_tTx$j9K" role="3cqZAp">
                 <node concept="3clFbS" id="14$_tTx$j9M" role="1zxBo7">
-                  <node concept="3cpWs8" id="6QH_LDtdXLJ" role="3cqZAp">
-                    <node concept="3cpWsn" id="6QH_LDtdXLK" role="3cpWs9">
-                      <property role="TrG5h" value="typesIndex2" />
-                      <node concept="3uibUv" id="1FOQehxevl5" role="1tU5fm">
-                        <ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+                  <node concept="3clFbF" id="7Aoa2yV_Gyf" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Aoa2yV_GQC" role="3clFbG">
+                      <node concept="37vLTw" id="7Aoa2yV_Gyd" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6QH_LDtdTgs" resolve="typecheckingState" />
                       </node>
-                      <node concept="2OqwBi" id="6QH_LDtdXLL" role="33vP2m">
-                        <node concept="37vLTw" id="6QH_LDtdXLM" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6QH_LDtdTgs" resolve="typecheckingState" />
+                      <node concept="liA8E" id="7Aoa2yV_HmT" role="2OqNvi">
+                        <ref role="37wK5l" to="tj24:7Aoa2yVgCDl" resolve="updateUnitCachedData" />
+                        <node concept="37vLTw" id="7Aoa2yV_HMj" role="37wK5m">
+                          <ref role="3cqZAo" node="7mB3viLe1a2" resolve="demo" />
                         </node>
-                        <node concept="liA8E" id="6QH_LDtdXLN" role="2OqNvi">
-                          <ref role="37wK5l" to="tj24:4Dkptq1OPR7" resolve="updateUnitTypecheckingResults" />
-                          <node concept="37vLTw" id="7gMIJIxPLpc" role="37wK5m">
-                            <ref role="3cqZAo" node="7mB3viLe1a2" resolve="demo" />
+                        <node concept="1bVj0M" id="7Aoa2yV_IdU" role="37wK5m">
+                          <node concept="gl6BB" id="7Aoa2yV_Iea" role="1bW2Oz">
+                            <property role="TrG5h" value="cachedData" />
+                            <node concept="2jxLKc" id="7Aoa2yV_Ieb" role="1tU5fm" />
                           </node>
-                          <node concept="1bVj0M" id="44XN1Jd6FDu" role="37wK5m">
-                            <node concept="3clFbS" id="44XN1Jd6FDw" role="1bW5cS">
-                              <node concept="3clFbF" id="44XN1Jd6GK5" role="3cqZAp">
-                                <node concept="2OqwBi" id="44XN1Jd6H1G" role="3clFbG">
-                                  <node concept="37vLTw" id="44XN1Jd6GK3" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="44XN1Jd6FWm" resolve="updatable" />
+                          <node concept="gl6BB" id="7Aoa2yV_Iec" role="1bW2Oz">
+                            <property role="TrG5h" value="fresh" />
+                            <node concept="2jxLKc" id="7Aoa2yV_Ied" role="1tU5fm" />
+                          </node>
+                          <node concept="3clFbS" id="7Aoa2yV_Iee" role="1bW5cS">
+                            <node concept="3cpWs8" id="7mB3viLe7Js" role="3cqZAp">
+                              <node concept="3cpWsn" id="7mB3viLe7Jt" role="3cpWs9">
+                                <property role="TrG5h" value="typeNode" />
+                                <node concept="3Tqbb2" id="7mB3viLe7Jq" role="1tU5fm">
+                                  <ref role="ehGHo" to="qulx:7mB3viLbCL0" resolve="Type" />
+                                </node>
+                                <node concept="2ShNRf" id="7mB3viLe7Ju" role="33vP2m">
+                                  <node concept="3zrR0B" id="7mB3viLe7Jv" role="2ShVmc">
+                                    <node concept="3Tqbb2" id="7mB3viLe7Jw" role="3zrR0E">
+                                      <ref role="ehGHo" to="qulx:7mB3viLbCL0" resolve="Type" />
+                                    </node>
                                   </node>
-                                  <node concept="liA8E" id="44XN1Jd6HUy" role="2OqNvi">
-                                    <ref role="37wK5l" to="tj24:5Qx6_65$vyG" resolve="update" />
-                                    <node concept="1bVj0M" id="6QH_LDtdXLP" role="37wK5m">
-                                      <node concept="3clFbS" id="6QH_LDtdXLQ" role="1bW5cS">
-                                        <node concept="3clFbH" id="6$gg4kAgPiE" role="3cqZAp" />
-                                        <node concept="3cpWs8" id="7mB3viLe7Js" role="3cqZAp">
-                                          <node concept="3cpWsn" id="7mB3viLe7Jt" role="3cpWs9">
-                                            <property role="TrG5h" value="typeNode" />
-                                            <node concept="3Tqbb2" id="7mB3viLe7Jq" role="1tU5fm">
-                                              <ref role="ehGHo" to="qulx:7mB3viLbCL0" resolve="Type" />
-                                            </node>
-                                            <node concept="2ShNRf" id="7mB3viLe7Ju" role="33vP2m">
-                                              <node concept="3zrR0B" id="7mB3viLe7Jv" role="2ShVmc">
-                                                <node concept="3Tqbb2" id="7mB3viLe7Jw" role="3zrR0E">
-                                                  <ref role="ehGHo" to="qulx:7mB3viLbCL0" resolve="Type" />
-                                                </node>
-                                              </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbF" id="7mB3viLe8AJ" role="3cqZAp">
+                              <node concept="2OqwBi" id="7mB3viLeaHf" role="3clFbG">
+                                <node concept="2OqwBi" id="7mB3viLe8Uq" role="2Oq$k0">
+                                  <node concept="37vLTw" id="7mB3viLe8AH" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="7mB3viLe7Jt" resolve="typeNode" />
+                                  </node>
+                                  <node concept="3TrcHB" id="7mB3viLea6s" role="2OqNvi">
+                                    <ref role="3TsBF5" to="qulx:7mB3viLbCL1" resolve="name" />
+                                  </node>
+                                </node>
+                                <node concept="tyxLq" id="7mB3viLebdC" role="2OqNvi">
+                                  <node concept="Xl_RD" id="7mB3viLenf6" role="tz02z">
+                                    <property role="Xl_RC" value="String" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbF" id="7mB3viLo$7G" role="3cqZAp">
+                              <node concept="2OqwBi" id="7mB3viLo_zj" role="3clFbG">
+                                <node concept="2OqwBi" id="7mB3viLo$wr" role="2Oq$k0">
+                                  <node concept="37vLTw" id="7mB3viLo$7E" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="7mB3viLe7Jt" resolve="typeNode" />
+                                  </node>
+                                  <node concept="3TrcHB" id="7mB3viLo$Rl" role="2OqNvi">
+                                    <ref role="3TsBF5" to="qulx:7mB3viLggsO" resolve="val" />
+                                  </node>
+                                </node>
+                                <node concept="tyxLq" id="7mB3viLoA4G" role="2OqNvi">
+                                  <node concept="Xl_RD" id="7mB3viLoBfX" role="tz02z">
+                                    <property role="Xl_RC" value="test" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbH" id="7mB3viLe75j" role="3cqZAp" />
+                            <node concept="3clFbF" id="6QH_LDtesyR" role="3cqZAp">
+                              <node concept="2OqwBi" id="6QH_LDtesDH" role="3clFbG">
+                                <node concept="2OqwBi" id="7Aoa2yV_JOg" role="2Oq$k0">
+                                  <node concept="37vLTw" id="6$gg4kBbqsG" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="7Aoa2yV_Iea" resolve="cachedData" />
+                                  </node>
+                                  <node concept="liA8E" id="7Aoa2yV_Lps" role="2OqNvi">
+                                    <ref role="37wK5l" to="tj24:7z54$fPgk2E" resolve="getOrSet" />
+                                    <node concept="10M0yZ" id="7Aoa2yV_Wn2" role="37wK5m">
+                                      <ref role="3cqZAo" to="tj24:7Aoa2yVefYI" resolve="REPORTED_TYPES" />
+                                      <ref role="1PxDUh" to="tj24:6v6oK27venk" resolve="AbstractCheckRequest" />
+                                    </node>
+                                    <node concept="1bVj0M" id="7Aoa2yV_Xqj" role="37wK5m">
+                                      <node concept="3clFbS" id="7Aoa2yV_Xqq" role="1bW5cS">
+                                        <node concept="3clFbF" id="7Aoa2yV_XUu" role="3cqZAp">
+                                          <node concept="2ShNRf" id="7Aoa2yV_XUs" role="3clFbG">
+                                            <node concept="HV5vD" id="7Aoa2yV_Zrk" role="2ShVmc">
+                                              <property role="373rjd" value="true" />
+                                              <ref role="HV5vE" to="tj24:7Aoa2yVdSP8" resolve="ReportedTypes" />
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="3clFbF" id="7mB3viLe8AJ" role="3cqZAp">
-                                          <node concept="2OqwBi" id="7mB3viLeaHf" role="3clFbG">
-                                            <node concept="2OqwBi" id="7mB3viLe8Uq" role="2Oq$k0">
-                                              <node concept="37vLTw" id="7mB3viLe8AH" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="7mB3viLe7Jt" resolve="typeNode" />
-                                              </node>
-                                              <node concept="3TrcHB" id="7mB3viLea6s" role="2OqNvi">
-                                                <ref role="3TsBF5" to="qulx:7mB3viLbCL1" resolve="name" />
-                                              </node>
-                                            </node>
-                                            <node concept="tyxLq" id="7mB3viLebdC" role="2OqNvi">
-                                              <node concept="Xl_RD" id="7mB3viLenf6" role="tz02z">
-                                                <property role="Xl_RC" value="String" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                        <node concept="3clFbF" id="7mB3viLo$7G" role="3cqZAp">
-                                          <node concept="2OqwBi" id="7mB3viLo_zj" role="3clFbG">
-                                            <node concept="2OqwBi" id="7mB3viLo$wr" role="2Oq$k0">
-                                              <node concept="37vLTw" id="7mB3viLo$7E" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="7mB3viLe7Jt" resolve="typeNode" />
-                                              </node>
-                                              <node concept="3TrcHB" id="7mB3viLo$Rl" role="2OqNvi">
-                                                <ref role="3TsBF5" to="qulx:7mB3viLggsO" resolve="val" />
-                                              </node>
-                                            </node>
-                                            <node concept="tyxLq" id="7mB3viLoA4G" role="2OqNvi">
-                                              <node concept="Xl_RD" id="7mB3viLoBfX" role="tz02z">
-                                                <property role="Xl_RC" value="test" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                        <node concept="3clFbH" id="7mB3viLe75j" role="3cqZAp" />
-                                        <node concept="3clFbF" id="6QH_LDtesyR" role="3cqZAp">
-                                          <node concept="2OqwBi" id="6QH_LDtesDH" role="3clFbG">
-                                            <node concept="37vLTw" id="6$gg4kBbqsG" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="6$gg4kB7Byp" resolve="update" />
-                                            </node>
-                                            <node concept="liA8E" id="6QH_LDtesSt" role="2OqNvi">
-                                              <ref role="37wK5l" to="tj24:1z4$59jqkDQ" resolve="putType" />
-                                              <node concept="2OqwBi" id="6QH_LDteGcY" role="37wK5m">
-                                                <node concept="2JrnkZ" id="7mB3viLesyS" role="2Oq$k0">
-                                                  <node concept="37vLTw" id="7mB3viLeq7J" role="2JrQYb">
-                                                    <ref role="3cqZAo" node="7mB3viLem44" resolve="foo" />
-                                                  </node>
-                                                </node>
-                                                <node concept="liA8E" id="7mB3viLet95" role="2OqNvi">
-                                                  <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                                                </node>
-                                              </node>
-                                              <node concept="37vLTw" id="7mB3viLetmP" role="37wK5m">
-                                                <ref role="3cqZAo" node="7mB3viLe7Jt" resolve="typeNode" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                        <node concept="3clFbH" id="443LGHByq9z" role="3cqZAp" />
-                                      </node>
-                                      <node concept="37vLTG" id="6$gg4kB7Byp" role="1bW2Oz">
-                                        <property role="TrG5h" value="update" />
-                                        <node concept="3uibUv" id="1z4$59jr1Jx" role="1tU5fm">
-                                          <ref role="3uigEE" to="tj24:1z4$59jqeoH" resolve="TypecheckingResultsCache.Update" />
-                                        </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                              </node>
-                              <node concept="3clFbH" id="44XN1Jd6JzA" role="3cqZAp" />
-                            </node>
-                            <node concept="37vLTG" id="44XN1Jd6FWm" role="1bW2Oz">
-                              <property role="TrG5h" value="updatable" />
-                              <node concept="3uibUv" id="44XN1Jd6G8I" role="1tU5fm">
-                                <ref role="3uigEE" to="tj24:4Dkptq1Qcxp" resolve="CacheUpdatable" />
+                                <node concept="liA8E" id="6QH_LDtesSt" role="2OqNvi">
+                                  <ref role="37wK5l" to="tj24:7Aoa2yVe2QA" resolve="putType" />
+                                  <node concept="2OqwBi" id="6QH_LDteGcY" role="37wK5m">
+                                    <node concept="2JrnkZ" id="7mB3viLesyS" role="2Oq$k0">
+                                      <node concept="37vLTw" id="7mB3viLeq7J" role="2JrQYb">
+                                        <ref role="3cqZAo" node="7mB3viLem44" resolve="foo" />
+                                      </node>
+                                    </node>
+                                    <node concept="liA8E" id="7mB3viLet95" role="2OqNvi">
+                                      <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                    </node>
+                                  </node>
+                                  <node concept="37vLTw" id="7mB3viLetmP" role="37wK5m">
+                                    <ref role="3cqZAo" node="7mB3viLe7Jt" resolve="typeNode" />
+                                  </node>
+                                </node>
                               </node>
                             </node>
                           </node>
@@ -2886,7 +2901,38 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbH" id="14$_tTx$z38" role="3cqZAp" />
+                  <node concept="3clFbH" id="7Aoa2yV_FGC" role="3cqZAp" />
+                  <node concept="3cpWs8" id="6QH_LDtdXLJ" role="3cqZAp">
+                    <node concept="3cpWsn" id="6QH_LDtdXLK" role="3cpWs9">
+                      <property role="TrG5h" value="typesIndex2" />
+                      <node concept="3uibUv" id="1FOQehxevl5" role="1tU5fm">
+                        <ref role="3uigEE" to="tj24:7i3KM7g1Hnp" resolve="CachedData" />
+                      </node>
+                      <node concept="2OqwBi" id="7Aoa2yVBxxI" role="33vP2m">
+                        <node concept="2OqwBi" id="6QH_LDtdXLL" role="2Oq$k0">
+                          <node concept="37vLTw" id="6QH_LDtdXLM" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6QH_LDtdTgs" resolve="typecheckingState" />
+                          </node>
+                          <node concept="liA8E" id="6QH_LDtdXLN" role="2OqNvi">
+                            <ref role="37wK5l" to="tj24:7Aoa2yVAE2W" resolve="getCacheHolder" />
+                            <node concept="2OqwBi" id="7Aoa2yVBoO1" role="37wK5m">
+                              <node concept="liA8E" id="7Aoa2yVBq74" role="2OqNvi">
+                                <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                              </node>
+                              <node concept="2JrnkZ" id="7Aoa2yVBoO6" role="2Oq$k0">
+                                <node concept="37vLTw" id="7gMIJIxPLpc" role="2JrQYb">
+                                  <ref role="3cqZAo" node="7mB3viLe1a2" resolve="demo" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="7Aoa2yVBykc" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:7Aoa2yVBu8W" resolve="getCachedData" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                   <node concept="2Hmddi" id="6QH_LDtdY5q" role="3cqZAp">
                     <node concept="37vLTw" id="6QH_LDtdYCG" role="2Hmdds">
                       <ref role="3cqZAo" node="6QH_LDtdXLK" resolve="typesIndex2" />
@@ -2897,25 +2943,30 @@
                     <node concept="3cpWsn" id="6QH_LDtdZNu" role="3cpWs9">
                       <property role="TrG5h" value="typesIndex3" />
                       <node concept="3uibUv" id="1FOQehxesGr" role="1tU5fm">
-                        <ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+                        <ref role="3uigEE" to="tj24:7i3KM7g1Hnp" resolve="CachedData" />
                       </node>
-                      <node concept="2OqwBi" id="6QH_LDtdZNv" role="33vP2m">
-                        <node concept="37vLTw" id="6QH_LDtdZNw" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6QH_LDtdTgs" resolve="typecheckingState" />
-                        </node>
-                        <node concept="liA8E" id="6QH_LDtdZNx" role="2OqNvi">
-                          <ref role="37wK5l" to="tj24:4Z$O9mrQJgp" resolve="cachedTypecheckingResults" />
-                          <node concept="2OqwBi" id="4vBwiiVuDf_" role="37wK5m">
-                            <node concept="2JrnkZ" id="4vBwiiVuDfA" role="2Oq$k0">
-                              <node concept="37vLTw" id="7mB3viLezeb" role="2JrQYb">
-                                <ref role="3cqZAo" node="7mB3viLe1a2" resolve="demo" />
+                      <node concept="2OqwBi" id="7Aoa2yVBDGs" role="33vP2m">
+                        <node concept="2OqwBi" id="6QH_LDtdZNv" role="2Oq$k0">
+                          <node concept="37vLTw" id="6QH_LDtdZNw" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6QH_LDtdTgs" resolve="typecheckingState" />
+                          </node>
+                          <node concept="liA8E" id="6QH_LDtdZNx" role="2OqNvi">
+                            <ref role="37wK5l" to="tj24:7Aoa2yVAE2W" resolve="getCacheHolder" />
+                            <node concept="2OqwBi" id="4vBwiiVuDf_" role="37wK5m">
+                              <node concept="2JrnkZ" id="4vBwiiVuDfA" role="2Oq$k0">
+                                <node concept="37vLTw" id="7mB3viLezeb" role="2JrQYb">
+                                  <ref role="3cqZAo" node="7mB3viLe1a2" resolve="demo" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="4vBwiiVuDfC" role="2OqNvi">
+                                <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                               </node>
                             </node>
-                            <node concept="liA8E" id="4vBwiiVuDfC" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                            </node>
                           </node>
                         </node>
+                        <node concept="liA8E" id="7Aoa2yVBE_n" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:7Aoa2yVBu8W" resolve="getCachedData" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -2933,18 +2984,20 @@
                       <property role="TrG5h" value="typeOfFoo" />
                       <node concept="3Tqbb2" id="6QH_LDteITC" role="1tU5fm" />
                       <node concept="2OqwBi" id="6QH_LDteITJ" role="33vP2m">
-                        <node concept="1eOMI4" id="443LGHByrov" role="2Oq$k0">
-                          <node concept="10QFUN" id="443LGHByros" role="1eOMHV">
-                            <node concept="3uibUv" id="443LGHByrB9" role="10QFUM">
-                              <ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-                            </node>
-                            <node concept="37vLTw" id="443LGHByrox" role="10QFUP">
-                              <ref role="3cqZAo" node="6QH_LDtdZNu" resolve="typesIndex3" />
+                        <node concept="2OqwBi" id="7Aoa2yVBGxZ" role="2Oq$k0">
+                          <node concept="37vLTw" id="7Aoa2yVBGdM" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6QH_LDtdZNu" resolve="typesIndex3" />
+                          </node>
+                          <node concept="liA8E" id="7Aoa2yVBGZn" role="2OqNvi">
+                            <ref role="37wK5l" to="tj24:7i3KM7g1KV4" resolve="get" />
+                            <node concept="10M0yZ" id="7Aoa2yVBHd5" role="37wK5m">
+                              <ref role="3cqZAo" to="tj24:7Aoa2yVefYI" resolve="REPORTED_TYPES" />
+                              <ref role="1PxDUh" to="tj24:6v6oK27venk" resolve="AbstractCheckRequest" />
                             </node>
                           </node>
                         </node>
                         <node concept="liA8E" id="6QH_LDteITL" role="2OqNvi">
-                          <ref role="37wK5l" to="tj24:6QH_LDtcxgN" resolve="getType" />
+                          <ref role="37wK5l" to="tj24:7Aoa2yVpIT7" resolve="getType" />
                           <node concept="2OqwBi" id="443LGHBdJJ$" role="37wK5m">
                             <node concept="2JrnkZ" id="443LGHBdJjh" role="2Oq$k0">
                               <node concept="37vLTw" id="7mB3viLeu0q" role="2JrQYb">
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index c0bff796..6b0dbe49 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -3466,111 +3466,101 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="3cpWs8" id="9dktABR$KP" role="3cqZAp">
-                      <node concept="3cpWsn" id="9dktABR$KQ" role="3cpWs9">
-                        <property role="TrG5h" value="typesIndex" />
-                        <node concept="3uibUv" id="9dktABRsfo" role="1tU5fm">
-                          <ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-                        </node>
-                        <node concept="2OqwBi" id="1z4$59iRR3C" role="33vP2m">
-                          <node concept="2OqwBi" id="9dktABR$KY" role="2Oq$k0">
-                            <node concept="liA8E" id="9dktABR$KZ" role="2OqNvi">
-                              <ref role="37wK5l" to="tj24:1z4$59ixOPQ" resolve="check" />
-                              <node concept="37vLTw" id="2xx8OBymBZP" role="37wK5m">
-                                <ref role="3cqZAo" node="1oUwjADo$Xr" resolve="containingRoot" />
+                    <node concept="3clFbF" id="7Aoa2yVoJK1" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Aoa2yVoJK3" role="3clFbG">
+                        <node concept="liA8E" id="7Aoa2yVoJK4" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:7Aoa2yVmEth" resolve="check" />
+                          <node concept="37vLTw" id="7Aoa2yVoJK5" role="37wK5m">
+                            <ref role="3cqZAo" node="1oUwjADo$Xr" resolve="containingRoot" />
+                          </node>
+                          <node concept="1bVj0M" id="7Aoa2yVoJK6" role="37wK5m">
+                            <node concept="gl6BB" id="7Aoa2yVoJK7" role="1bW2Oz">
+                              <property role="TrG5h" value="repIt" />
+                              <node concept="2jxLKc" id="7Aoa2yVoJK8" role="1tU5fm" />
+                            </node>
+                            <node concept="3clFbS" id="7Aoa2yVoJK9" role="1bW5cS">
+                              <node concept="3SKdUt" id="7Aoa2yVoJKa" role="3cqZAp">
+                                <node concept="1PaTwC" id="7Aoa2yVoJKb" role="1aUNEU">
+                                  <node concept="3oM_SD" id="7Aoa2yVoJKc" role="1PaTwD">
+                                    <property role="3oM_SC" value="FIXME" />
+                                  </node>
+                                  <node concept="3oM_SD" id="7Aoa2yVoJKd" role="1PaTwD">
+                                    <property role="3oM_SC" value="better" />
+                                  </node>
+                                  <node concept="3oM_SD" id="7Aoa2yVoJKe" role="1PaTwD">
+                                    <property role="3oM_SC" value="forwarding" />
+                                  </node>
+                                  <node concept="3oM_SD" id="7Aoa2yVoJKf" role="1PaTwD">
+                                    <property role="3oM_SC" value="of" />
+                                  </node>
+                                  <node concept="3oM_SD" id="7Aoa2yVoJKg" role="1PaTwD">
+                                    <property role="3oM_SC" value="report" />
+                                  </node>
+                                  <node concept="3oM_SD" id="7Aoa2yVoJKh" role="1PaTwD">
+                                    <property role="3oM_SC" value="items" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3SKdUt" id="7Aoa2yVoJKi" role="3cqZAp">
+                                <node concept="1PaTwC" id="7Aoa2yVoJKj" role="1aUNEU">
+                                  <node concept="3oM_SD" id="7Aoa2yVoJKk" role="1PaTwD">
+                                    <property role="3oM_SC" value="forward" />
+                                  </node>
+                                  <node concept="3oM_SD" id="7Aoa2yVoJKl" role="1PaTwD">
+                                    <property role="3oM_SC" value="all" />
+                                  </node>
+                                  <node concept="3oM_SD" id="7Aoa2yVoJKm" role="1PaTwD">
+                                    <property role="3oM_SC" value="reported" />
+                                  </node>
+                                  <node concept="3oM_SD" id="7Aoa2yVoJKn" role="1PaTwD">
+                                    <property role="3oM_SC" value="items" />
+                                  </node>
+                                  <node concept="3oM_SD" id="7Aoa2yVoJKo" role="1PaTwD">
+                                    <property role="3oM_SC" value="always" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbJ" id="7Aoa2yVoJKp" role="3cqZAp">
+                                <node concept="2ZW3vV" id="7Aoa2yVoJKq" role="3clFbw">
+                                  <node concept="3uibUv" id="7Aoa2yVoJKr" role="2ZW6by">
+                                    <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+                                  </node>
+                                  <node concept="37vLTw" id="7Aoa2yVoJKs" role="2ZW6bz">
+                                    <ref role="3cqZAo" node="7Aoa2yVoJK7" resolve="repIt" />
+                                  </node>
+                                </node>
+                                <node concept="3clFbS" id="7Aoa2yVoJKt" role="3clFbx">
+                                  <node concept="3clFbF" id="7Aoa2yVoJKu" role="3cqZAp">
+                                    <node concept="2OqwBi" id="7Aoa2yVoJKv" role="3clFbG">
+                                      <node concept="37vLTw" id="7Aoa2yVoJKw" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="2Hyoxv0bBI" resolve="consumer" />
+                                      </node>
+                                      <node concept="liA8E" id="7Aoa2yVoJKx" role="2OqNvi">
+                                        <ref role="37wK5l" to="82uw:~Consumer.accept(java.lang.Object)" resolve="accept" />
+                                        <node concept="1eOMI4" id="7Aoa2yVoJKy" role="37wK5m">
+                                          <node concept="10QFUN" id="7Aoa2yVoJKz" role="1eOMHV">
+                                            <node concept="3uibUv" id="7Aoa2yVoJK$" role="10QFUM">
+                                              <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+                                            </node>
+                                            <node concept="37vLTw" id="7Aoa2yVoJK_" role="10QFUP">
+                                              <ref role="3cqZAo" node="7Aoa2yVoJK7" resolve="repIt" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
                             </node>
-                            <node concept="37vLTw" id="1z4$59j6IZX" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1z4$59j5F_5" resolve="typecheckingService" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="1z4$59iRRQd" role="2OqNvi">
-                            <ref role="37wK5l" to="tj24:1C_jAsqza5P" resolve="get" />
                           </node>
                         </node>
+                        <node concept="37vLTw" id="7Aoa2yVoJKA" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1z4$59j5F_5" resolve="typecheckingService" />
+                        </node>
                       </node>
                     </node>
                     <node concept="3clFbH" id="3yEb0I3SBsd" role="3cqZAp" />
-                    <node concept="3SKdUt" id="5Qx6_660Hb_" role="3cqZAp">
-                      <node concept="1PaTwC" id="5Qx6_660HbA" role="1aUNEU">
-                        <node concept="3oM_SD" id="5Qx6_660HbC" role="1PaTwD">
-                          <property role="3oM_SC" value="forward" />
-                        </node>
-                        <node concept="3oM_SD" id="5Qx6_660IqB" role="1PaTwD">
-                          <property role="3oM_SC" value="all" />
-                        </node>
-                        <node concept="3oM_SD" id="5Qx6_660IqE" role="1PaTwD">
-                          <property role="3oM_SC" value="reported" />
-                        </node>
-                        <node concept="3oM_SD" id="5Qx6_660Iri" role="1PaTwD">
-                          <property role="3oM_SC" value="items" />
-                        </node>
-                        <node concept="3oM_SD" id="5Qx6_660Isc" role="1PaTwD">
-                          <property role="3oM_SC" value="always" />
-                        </node>
-                      </node>
-                    </node>
-                    <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="5Qx6_666Sb8" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2Hyoxv0bBI" resolve="consumer" />
-                                </node>
-                                <node concept="liA8E" id="1FOQehxolJU" role="2OqNvi">
-                                  <ref role="37wK5l" to="82uw:~Consumer.accept(java.lang.Object)" resolve="accept" />
-                                  <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="2OqwBi" id="5Qx6_660$sf" role="1DdaDG">
-                        <node concept="37vLTw" id="5Qx6_660zcn" role="2Oq$k0">
-                          <ref role="3cqZAo" node="9dktABR$KQ" resolve="typesIndex" />
-                        </node>
-                        <node concept="liA8E" id="5Qx6_660_60" role="2OqNvi">
-                          <ref role="37wK5l" to="tj24:3yEb0I3SXN3" resolve="allReportItems" />
-                        </node>
-                      </node>
-                    </node>
                   </node>
                 </node>
               </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index d8f51688..0f3126c1 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -56,6 +56,7 @@
     <import index="cof4" ref="r:0a9d1d47-250c-4f98-8962-b65edf8b0721(jetbrains.mps.logic.dataform)" />
     <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
     <import index="o35r" ref="r:76281d8a-46ce-405f-8cfc-287ee8597b54(jetbrains.mps.coderules.ui.plugin)" />
+    <import index="wwqx" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.logging(MPS.Core/)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -418,6 +419,9 @@
       <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
         <child id="8970989240999019149" name="part" index="1dT_Ay" />
       </concept>
+      <concept id="8465538089690331492" name="jetbrains.mps.baseLanguage.javadoc.structure.DeprecatedBlockDocTag" flags="ng" index="TZ5HI">
+        <child id="2667874559098216723" name="text" index="3HnX3l" />
+      </concept>
       <concept id="2217234381367530212" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocReference" flags="ng" index="VXe08">
         <reference id="2217234381367530213" name="classifier" index="VXe09" />
       </concept>
@@ -543,7 +547,6 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="2526372162255441536" name="jetbrains.mps.baseLanguage.collections.structure.AsUnmodifiableOperation" flags="nn" index="26Dbio" />
-      <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
         <child id="1226511765987" name="elementType" index="2hN53Y" />
       </concept>
@@ -572,10 +575,6 @@
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
-        <child id="1201654602639" name="key" index="38cxEo" />
-      </concept>
-      <concept id="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
       <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="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -966,11 +965,28 @@
       <node concept="2tJIrI" id="4ZGicUYVMR_" role="jymVt" />
       <node concept="3clFb_" id="27bTNFfaYS2" role="jymVt">
         <property role="TrG5h" value="checkTypes" />
-        <node concept="3uibUv" id="27bTNFfb1W3" role="3clF45">
-          <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-        </node>
+        <node concept="10P_77" id="7Aoa2yVGujR" role="3clF45" />
         <node concept="3Tm1VV" id="27bTNFfaYS5" role="1B3o_S" />
         <node concept="3clFbS" id="27bTNFfaYS6" role="3clF47">
+          <node concept="3clFbJ" id="7Aoa2yVJVs6" role="3cqZAp">
+            <node concept="3clFbS" id="7Aoa2yVJVs8" role="3clFbx">
+              <node concept="YS8fn" id="7Aoa2yVK9M8" role="3cqZAp">
+                <node concept="2ShNRf" id="7Aoa2yVKgL3" role="YScLw">
+                  <node concept="1pGfFk" id="7Aoa2yVKyz9" role="2ShVmc">
+                    <property role="373rjd" value="true" />
+                    <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;()" resolve="IllegalStateException" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3y3z36" id="7Aoa2yVK1lW" role="3clFbw">
+              <node concept="10Nm6u" id="7Aoa2yVK4lN" role="3uHU7w" />
+              <node concept="37vLTw" id="7Aoa2yVJXA9" role="3uHU7B">
+                <ref role="3cqZAo" node="7Aoa2yVJEdf" resolve="cachedTypes" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="7Aoa2yVKCoa" role="3cqZAp" />
           <node concept="3cpWs8" id="27bTNFfaZ1f" role="3cqZAp">
             <node concept="3cpWsn" id="27bTNFfaZ1g" role="3cpWs9">
               <property role="TrG5h" value="project" />
@@ -1032,91 +1048,105 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="27bTNFfaZ1D" role="3cqZAp" />
-          <node concept="3cpWs8" id="27bTNFfaZ1E" role="3cqZAp">
-            <node concept="3cpWsn" id="27bTNFfaZ1F" role="3cpWs9">
-              <property role="TrG5h" value="cache" />
-              <node concept="3uibUv" id="27bTNFfaZ1G" role="1tU5fm">
-                <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-              </node>
-            </node>
-          </node>
           <node concept="3clFbH" id="27bTNFfaZ1H" role="3cqZAp" />
           <node concept="1QHqEK" id="27bTNFfaZ1I" role="3cqZAp">
             <node concept="1QHqEC" id="27bTNFfaZ1J" role="1QHqEI">
               <node concept="3clFbS" id="27bTNFfaZ1K" role="1bW5cS">
-                <node concept="3clFbF" id="27bTNFfaZ1L" role="3cqZAp">
-                  <node concept="37vLTI" id="27bTNFfaZ1M" role="3clFbG">
-                    <node concept="2OqwBi" id="1z4$59iPhw3" role="37vLTx">
-                      <node concept="2OqwBi" id="27bTNFfaZ1N" role="2Oq$k0">
-                        <node concept="37vLTw" id="27bTNFfaZ1O" role="2Oq$k0">
+                <node concept="3cpWs8" id="7Aoa2yVDWkz" role="3cqZAp">
+                  <node concept="3cpWsn" id="7Aoa2yVDWk$" role="3cpWs9">
+                    <property role="TrG5h" value="ok" />
+                    <node concept="3uibUv" id="7Aoa2yVC$Ho" role="1tU5fm">
+                      <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+                    </node>
+                    <node concept="2OqwBi" id="7Aoa2yVDWk_" role="33vP2m">
+                      <node concept="2OqwBi" id="7Aoa2yVDWkA" role="2Oq$k0">
+                        <node concept="37vLTw" id="7Aoa2yVDWkB" role="2Oq$k0">
                           <ref role="3cqZAo" node="27bTNFfaZ1y" resolve="facade" />
                         </node>
-                        <node concept="liA8E" id="27bTNFfaZ1P" role="2OqNvi">
+                        <node concept="liA8E" id="7Aoa2yVDWkC" role="2OqNvi">
                           <ref role="37wK5l" node="1C_jAsqgrq4" resolve="submit" />
-                          <node concept="2OqwBi" id="1C_jAsqB0do" role="37wK5m">
-                            <node concept="2ShNRf" id="1C_jAsqAMar" role="2Oq$k0">
-                              <node concept="1pGfFk" id="1C_jAsqAUoR" role="2ShVmc">
+                          <node concept="2OqwBi" id="7Aoa2yVDWkD" role="37wK5m">
+                            <node concept="2ShNRf" id="7Aoa2yVDWkE" role="2Oq$k0">
+                              <node concept="1pGfFk" id="7Aoa2yVDWkF" role="2ShVmc">
                                 <property role="373rjd" value="true" />
                                 <ref role="37wK5l" node="6v6oK26pH7x" resolve="CheckRequest" />
-                                <node concept="2YIFZM" id="1C_jAsq_PvV" role="37wK5m">
+                                <node concept="2YIFZM" id="7Aoa2yVDWkG" role="37wK5m">
                                   <ref role="37wK5l" node="5EDW3XDYggE" resolve="check" />
                                   <ref role="1Pybhc" node="5EDW3XDYg8Y" resolve="TypecheckingQueries" />
-                                  <node concept="37vLTw" id="1C_jAsq_U6m" role="37wK5m">
+                                  <node concept="37vLTw" id="7Aoa2yVDWkH" role="37wK5m">
                                     <ref role="3cqZAo" node="27bTNFfaKmm" resolve="root" />
                                   </node>
-                                  <node concept="2OqwBi" id="1C_jAsqApap" role="37wK5m">
-                                    <node concept="2OqwBi" id="1C_jAsqAi5e" role="2Oq$k0">
-                                      <node concept="37vLTw" id="1C_jAsqAfuI" role="2Oq$k0">
+                                  <node concept="2OqwBi" id="7Aoa2yVDWkI" role="37wK5m">
+                                    <node concept="2OqwBi" id="7Aoa2yVDWkJ" role="2Oq$k0">
+                                      <node concept="37vLTw" id="7Aoa2yVDWkK" role="2Oq$k0">
                                         <ref role="3cqZAo" node="27bTNFfaZ1y" resolve="facade" />
                                       </node>
-                                      <node concept="liA8E" id="1C_jAsqAnfT" role="2OqNvi">
+                                      <node concept="liA8E" id="7Aoa2yVDWkL" role="2OqNvi">
                                         <ref role="37wK5l" node="1RYTbd7Di6U" resolve="getState" />
                                       </node>
                                     </node>
-                                    <node concept="liA8E" id="1C_jAsqAuOB" role="2OqNvi">
+                                    <node concept="liA8E" id="7Aoa2yVDWkM" role="2OqNvi">
                                       <ref role="37wK5l" node="1T5MAgPidDk" resolve="typeCollector" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="liA8E" id="1C_jAsqB6uh" role="2OqNvi">
+                            <node concept="liA8E" id="7Aoa2yVDWkN" role="2OqNvi">
                               <ref role="37wK5l" node="1z4$59iFAPj" resolve="withReportConsumer" />
-                              <node concept="37vLTw" id="1z4$59iPdK8" role="37wK5m">
+                              <node concept="37vLTw" id="7Aoa2yVDWkO" role="37wK5m">
                                 <ref role="3cqZAo" node="27bTNFfaZ1t" resolve="sink" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="1z4$59iPXr4" role="2OqNvi">
+                      <node concept="liA8E" id="7Aoa2yVDWkP" role="2OqNvi">
                         <ref role="37wK5l" node="1C_jAsqza5P" resolve="get" />
                       </node>
                     </node>
-                    <node concept="37vLTw" id="27bTNFfaZ1R" role="37vLTJ">
-                      <ref role="3cqZAo" node="27bTNFfaZ1F" resolve="cache" />
-                    </node>
                   </node>
                 </node>
                 <node concept="3clFbJ" id="7eK3Dxvoqkp" role="3cqZAp">
                   <node concept="3clFbS" id="7eK3Dxvoqkr" role="3clFbx">
                     <node concept="YS8fn" id="7eK3Dxvoydf" role="3cqZAp">
                       <node concept="2ShNRf" id="7eK3Dxvo$Vo" role="YScLw">
-                        <node concept="1pGfFk" id="7eK3DxvoCkV" role="2ShVmc">
-                          <ref role="37wK5l" to="wyt6:~NullPointerException.&lt;init&gt;()" resolve="NullPointerException" />
+                        <node concept="1pGfFk" id="7Aoa2yVEy7z" role="2ShVmc">
+                          <property role="373rjd" value="true" />
+                          <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;()" resolve="IllegalStateException" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbC" id="7eK3Dxvov5y" role="3clFbw">
-                    <node concept="10Nm6u" id="7eK3Dxvovdg" role="3uHU7w" />
-                    <node concept="37vLTw" id="7eK3DxvosEz" role="3uHU7B">
-                      <ref role="3cqZAo" node="27bTNFfaZ1F" resolve="cache" />
+                  <node concept="3fqX7Q" id="7Aoa2yVEgiP" role="3clFbw">
+                    <node concept="37vLTw" id="7Aoa2yVEnwJ" role="3fr31v">
+                      <ref role="3cqZAo" node="7Aoa2yVDWk$" resolve="ok" />
                     </node>
                   </node>
                 </node>
                 <node concept="3clFbH" id="27bTNFfaZ1S" role="3cqZAp" />
+                <node concept="3clFbF" id="7Aoa2yVJg95" role="3cqZAp">
+                  <node concept="37vLTI" id="7Aoa2yVJg96" role="3clFbG">
+                    <node concept="2OqwBi" id="7Aoa2yVKMxi" role="37vLTJ">
+                      <node concept="Xjq3P" id="7Aoa2yVKJEz" role="2Oq$k0" />
+                      <node concept="2OwXpG" id="7Aoa2yVKPUm" role="2OqNvi">
+                        <ref role="2Oxat5" node="7Aoa2yVJEdf" resolve="cachedTypes" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="7Aoa2yVJg98" role="37vLTx">
+                      <node concept="37vLTw" id="7Aoa2yVJg99" role="2Oq$k0">
+                        <ref role="3cqZAo" node="27bTNFfaZ1y" resolve="facade" />
+                      </node>
+                      <node concept="liA8E" id="7Aoa2yVJg9a" role="2OqNvi">
+                        <ref role="37wK5l" node="19OC90lY7P" resolve="cachedTypes" />
+                        <node concept="37vLTw" id="7Aoa2yVJg9b" role="37wK5m">
+                          <ref role="3cqZAo" node="27bTNFfaKmm" resolve="root" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="7Aoa2yVJg94" role="3cqZAp" />
                 <node concept="3cpWs8" id="27bTNFfaZ1T" role="3cqZAp">
                   <node concept="3cpWsn" id="27bTNFfaZ1U" role="3cpWs9">
                     <property role="TrG5h" value="errors" />
@@ -1857,10 +1887,10 @@
                           <node concept="2OqwBi" id="61G6TdDrEBQ" role="2Oq$k0">
                             <node concept="2OqwBi" id="61G6TdDrEBR" role="2Oq$k0">
                               <node concept="37vLTw" id="61G6TdDrEBS" role="2Oq$k0">
-                                <ref role="3cqZAo" node="27bTNFfaZ1F" resolve="cache" />
+                                <ref role="3cqZAo" node="7Aoa2yVJEdf" resolve="cachedTypes" />
                               </node>
                               <node concept="liA8E" id="61G6TdDrEBT" role="2OqNvi">
-                                <ref role="37wK5l" node="1FOQehxe9vM" resolve="allTypes" />
+                                <ref role="37wK5l" node="7Aoa2yVI_mh" resolve="allTypes" />
                               </node>
                             </node>
                             <node concept="3CFNJx" id="61G6TdDrEBU" role="2OqNvi" />
@@ -1896,6 +1926,7 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3clFbH" id="7Aoa2yVIOyR" role="3cqZAp" />
                 <node concept="1DcWWT" id="27bTNFfaZ4V" role="3cqZAp">
                   <node concept="3clFbS" id="27bTNFfaZ4W" role="2LFqv$">
                     <node concept="3cpWs8" id="4ZGicUZbFEu" role="3cqZAp">
@@ -2240,8 +2271,11 @@
                 </node>
                 <node concept="3clFbF" id="27bTNFfaZ6B" role="3cqZAp">
                   <node concept="37vLTI" id="61G6TdDBVo2" role="3clFbG">
-                    <node concept="37vLTw" id="61G6TdDBZ6u" role="37vLTJ">
-                      <ref role="3cqZAo" node="27bTNFfaZ1F" resolve="cache" />
+                    <node concept="2OqwBi" id="7Aoa2yVL4RP" role="37vLTJ">
+                      <node concept="Xjq3P" id="7Aoa2yVL1ZO" role="2Oq$k0" />
+                      <node concept="2OwXpG" id="7Aoa2yVLaWZ" role="2OqNvi">
+                        <ref role="2Oxat5" node="7Aoa2yVJEdf" resolve="cachedTypes" />
+                      </node>
                     </node>
                     <node concept="2OqwBi" id="61G6TdDAMHL" role="37vLTx">
                       <node concept="37vLTw" id="61G6TdDAKHS" role="2Oq$k0">
@@ -2264,13 +2298,31 @@
           </node>
           <node concept="3clFbH" id="27bTNFfaZ6A" role="3cqZAp" />
           <node concept="3clFbF" id="61G6TdDC1gS" role="3cqZAp">
-            <node concept="37vLTw" id="61G6TdDC1gQ" role="3clFbG">
-              <ref role="3cqZAo" node="27bTNFfaZ1F" resolve="cache" />
+            <node concept="3y3z36" id="7Aoa2yVIo0T" role="3clFbG">
+              <node concept="10Nm6u" id="7Aoa2yVIqJD" role="3uHU7w" />
+              <node concept="37vLTw" id="61G6TdDC1gQ" role="3uHU7B">
+                <ref role="3cqZAo" node="7Aoa2yVJEdf" resolve="cachedTypes" />
+              </node>
             </node>
           </node>
         </node>
       </node>
       <node concept="2tJIrI" id="4AYiKM_LqMd" role="jymVt" />
+      <node concept="3clFb_" id="7Aoa2yVLrwM" role="jymVt">
+        <property role="TrG5h" value="getCachedTypes" />
+        <node concept="3uibUv" id="7Aoa2yVLvkz" role="3clF45">
+          <ref role="3uigEE" node="7Aoa2yVdSP8" resolve="ReportedTypes" />
+        </node>
+        <node concept="3Tm1VV" id="7Aoa2yVLrwP" role="1B3o_S" />
+        <node concept="3clFbS" id="7Aoa2yVLrwQ" role="3clF47">
+          <node concept="3clFbF" id="7Aoa2yVLH8d" role="3cqZAp">
+            <node concept="37vLTw" id="7Aoa2yVLH8c" role="3clFbG">
+              <ref role="3cqZAo" node="7Aoa2yVJEdf" resolve="cachedTypes" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7Aoa2yVLl3g" role="jymVt" />
       <node concept="3clFb_" id="4AYiKM_LMDy" role="jymVt">
         <property role="TrG5h" value="anyDescendantIn" />
         <node concept="37vLTG" id="4AYiKM_LQme" role="3clF46">
@@ -2635,6 +2687,14 @@
           <property role="3clFbU" value="true" />
         </node>
       </node>
+      <node concept="312cEg" id="7Aoa2yVJEdf" role="jymVt">
+        <property role="TrG5h" value="cachedTypes" />
+        <node concept="3Tm6S6" id="7Aoa2yVJEdg" role="1B3o_S" />
+        <node concept="3uibUv" id="7Aoa2yVJEdi" role="1tU5fm">
+          <ref role="3uigEE" node="7Aoa2yVdSP8" resolve="ReportedTypes" />
+        </node>
+        <node concept="10Nm6u" id="7Aoa2yVJEdj" role="33vP2m" />
+      </node>
     </node>
     <node concept="2tJIrI" id="5Hi6MebykCs" role="jymVt" />
     <node concept="312cEu" id="5Hi6MebxFhQ" role="jymVt">
@@ -3103,2684 +3163,6 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="6QH_LDtcxgf">
-    <property role="TrG5h" value="TypecheckingResultsCache" />
-    <property role="3GE5qa" value="cache" />
-    <node concept="2tJIrI" id="1z4$59jq8Pw" role="jymVt" />
-    <node concept="312cEu" id="1z4$59jqeoH" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Update" />
-      <node concept="3clFbW" id="1z4$59jqjZr" role="jymVt">
-        <node concept="3cqZAl" id="1z4$59jqjZt" role="3clF45" />
-        <node concept="3Tm6S6" id="1z4$59jqI1E" role="1B3o_S" />
-        <node concept="3clFbS" id="1z4$59jqjZv" role="3clF47" />
-      </node>
-      <node concept="3clFb_" id="1z4$59jqkDQ" role="jymVt">
-        <property role="TrG5h" value="putType" />
-        <node concept="37vLTG" id="1z4$59jqkDR" role="3clF46">
-          <property role="TrG5h" value="ref" />
-          <node concept="3uibUv" id="1z4$59jqkDS" role="1tU5fm">
-            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="1z4$59jqkDT" role="3clF46">
-          <property role="TrG5h" value="type" />
-          <node concept="3Tqbb2" id="1z4$59jqkDU" role="1tU5fm" />
-        </node>
-        <node concept="3cqZAl" id="1z4$59jqkDV" role="3clF45" />
-        <node concept="3Tm1VV" id="1z4$59jqkDW" role="1B3o_S" />
-        <node concept="3clFbS" id="1z4$59jqkDX" role="3clF47">
-          <node concept="3clFbF" id="1z4$59jqlXz" role="3cqZAp">
-            <node concept="2OqwBi" id="1z4$59jqmQ0" role="3clFbG">
-              <node concept="Xjq3P" id="1z4$59jqlXy" role="2Oq$k0">
-                <ref role="1HBi2w" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-              </node>
-              <node concept="liA8E" id="1z4$59jqnGm" role="2OqNvi">
-                <ref role="37wK5l" node="6QH_LDtcYUC" resolve="putType" />
-                <node concept="37vLTw" id="1z4$59jqnZW" role="37wK5m">
-                  <ref role="3cqZAo" node="1z4$59jqkDR" resolve="ref" />
-                </node>
-                <node concept="37vLTw" id="1z4$59jqo8h" role="37wK5m">
-                  <ref role="3cqZAo" node="1z4$59jqkDT" resolve="type" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="1z4$59jqkDZ" role="jymVt">
-        <property role="TrG5h" value="putAllTypes" />
-        <node concept="37vLTG" id="1z4$59jqkE0" role="3clF46">
-          <property role="TrG5h" value="loc2typeNode" />
-          <node concept="3rvAFt" id="1z4$59jqkE1" role="1tU5fm">
-            <node concept="3Tqbb2" id="1z4$59jqkE2" role="3rvSg0" />
-            <node concept="2sp9CU" id="1z4$59jqkE3" role="3rvQeY" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="1z4$59jqkE4" role="3clF45" />
-        <node concept="3Tm1VV" id="1z4$59jqkE5" role="1B3o_S" />
-        <node concept="3clFbS" id="1z4$59jqkE6" role="3clF47">
-          <node concept="3clFbF" id="1z4$59jqo_z" role="3cqZAp">
-            <node concept="2OqwBi" id="1z4$59jqo_$" role="3clFbG">
-              <node concept="Xjq3P" id="1z4$59jqo__" role="2Oq$k0">
-                <ref role="1HBi2w" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-              </node>
-              <node concept="liA8E" id="1z4$59jqo_A" role="2OqNvi">
-                <ref role="37wK5l" node="6$gg4kA3UdB" resolve="putAllTypes" />
-                <node concept="37vLTw" id="1z4$59jqq$z" role="37wK5m">
-                  <ref role="3cqZAo" node="1z4$59jqkE0" resolve="loc2typeNode" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="3Pxu0s8qa6J" role="jymVt">
-        <property role="TrG5h" value="dropInvalidated" />
-        <node concept="37vLTG" id="3Pxu0s8qK9v" role="3clF46">
-          <property role="TrG5h" value="origins" />
-          <node concept="3vKaQO" id="3Pxu0s8qK9w" role="1tU5fm">
-            <node concept="3Tqbb2" id="3Pxu0s8qK9x" role="3O5elw" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="3Pxu0s8qa6L" role="3clF45" />
-        <node concept="3Tm1VV" id="3Pxu0s8qa6M" role="1B3o_S" />
-        <node concept="3clFbS" id="3Pxu0s8qa6N" role="3clF47">
-          <node concept="3clFbF" id="1RYTbd8ySwx" role="3cqZAp">
-            <node concept="2OqwBi" id="1RYTbd8ySwy" role="3clFbG">
-              <node concept="Xjq3P" id="1RYTbd8ySwz" role="2Oq$k0">
-                <ref role="1HBi2w" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-              </node>
-              <node concept="liA8E" id="1RYTbd8ySw$" role="2OqNvi">
-                <ref role="37wK5l" node="3Pxu0s8oq7g" resolve="dropInvalidated" />
-                <node concept="37vLTw" id="3Pxu0s8qZJj" role="37wK5m">
-                  <ref role="3cqZAo" node="3Pxu0s8qK9v" resolve="origins" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="55xYlrm1rIW" role="jymVt">
-        <property role="TrG5h" value="changedBasis" />
-        <node concept="37vLTG" id="55xYlrlWxzj" role="3clF46">
-          <property role="TrG5h" value="invalidatedBasis" />
-          <node concept="3vKaQO" id="55xYlrlWxzk" role="1tU5fm">
-            <node concept="3uibUv" id="55xYlrm2SeZ" role="3O5elw">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-        </node>
-        <node concept="37vLTG" id="6DQTzHy7E4M" role="3clF46">
-          <property role="TrG5h" value="validatedBasis" />
-          <node concept="3vKaQO" id="6DQTzHy7E4N" role="1tU5fm">
-            <node concept="3uibUv" id="6DQTzHy7E4O" role="3O5elw">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cqZAl" id="55xYlrm1rIY" role="3clF45" />
-        <node concept="3Tm1VV" id="55xYlrm1rIZ" role="1B3o_S" />
-        <node concept="3clFbS" id="55xYlrm1rJ0" role="3clF47">
-          <node concept="3clFbF" id="55xYlrm1CRi" role="3cqZAp">
-            <node concept="2OqwBi" id="55xYlrm1CRj" role="3clFbG">
-              <node concept="Xjq3P" id="55xYlrm1CRk" role="2Oq$k0">
-                <ref role="1HBi2w" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-              </node>
-              <node concept="liA8E" id="55xYlrm1CRl" role="2OqNvi">
-                <ref role="37wK5l" node="55xYlrm1XFI" resolve="changedBasis" />
-                <node concept="37vLTw" id="55xYlrm1CRo" role="37wK5m">
-                  <ref role="3cqZAo" node="55xYlrlWxzj" resolve="invalidatedBasis" />
-                </node>
-                <node concept="37vLTw" id="6DQTzHy7Qob" role="37wK5m">
-                  <ref role="3cqZAo" node="6DQTzHy7E4M" resolve="validatedBasis" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="1z4$59jqkE8" role="jymVt">
-        <property role="TrG5h" value="addReportItem" />
-        <node concept="37vLTG" id="1z4$59jqkE9" role="3clF46">
-          <property role="TrG5h" value="item" />
-          <node concept="3uibUv" id="1z4$59jqkEa" role="1tU5fm">
-            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="1z4$59jqkEb" role="3clF45" />
-        <node concept="3Tm1VV" id="1z4$59jqkEc" role="1B3o_S" />
-        <node concept="3clFbS" id="1z4$59jqkEd" role="3clF47">
-          <node concept="3clFbF" id="1z4$59jqr3u" role="3cqZAp">
-            <node concept="2OqwBi" id="1z4$59jqr3v" role="3clFbG">
-              <node concept="Xjq3P" id="1z4$59jqr3w" role="2Oq$k0">
-                <ref role="1HBi2w" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-              </node>
-              <node concept="liA8E" id="1z4$59jqr3x" role="2OqNvi">
-                <ref role="37wK5l" node="3yEb0I3WCjJ" resolve="addReportItem" />
-                <node concept="37vLTw" id="1z4$59jqsyM" role="37wK5m">
-                  <ref role="3cqZAo" node="1z4$59jqkE9" resolve="item" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="1z4$59jqkEf" role="jymVt">
-        <property role="TrG5h" value="addReportItems" />
-        <node concept="37vLTG" id="1z4$59jqkEg" role="3clF46">
-          <property role="TrG5h" value="items" />
-          <node concept="A3Dl8" id="1z4$59jqkEh" role="1tU5fm">
-            <node concept="3qUE_q" id="1z4$59jqkEi" role="A3Ik2">
-              <node concept="3uibUv" id="1z4$59jqkEj" role="3qUE_r">
-                <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cqZAl" id="1z4$59jqkEk" role="3clF45" />
-        <node concept="3Tm1VV" id="1z4$59jqkEl" role="1B3o_S" />
-        <node concept="3clFbS" id="1z4$59jqkEm" role="3clF47">
-          <node concept="3clFbF" id="1z4$59jqt1j" role="3cqZAp">
-            <node concept="2OqwBi" id="1z4$59jqt1k" role="3clFbG">
-              <node concept="Xjq3P" id="1z4$59jqt1l" role="2Oq$k0">
-                <ref role="1HBi2w" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-              </node>
-              <node concept="liA8E" id="1z4$59jqt1m" role="2OqNvi">
-                <ref role="37wK5l" node="9dktABHyKF" resolve="addReportItems" />
-                <node concept="37vLTw" id="1z4$59jqv8F" role="37wK5m">
-                  <ref role="3cqZAo" node="1z4$59jqkEg" resolve="items" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="1z4$59jFoE1" role="jymVt">
-        <property role="TrG5h" value="putConvertsTo" />
-        <node concept="37vLTG" id="1z4$59jFqrA" role="3clF46">
-          <property role="TrG5h" value="source" />
-          <node concept="3Tqbb2" id="1z4$59jFqrB" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="1z4$59jFqrC" role="3clF46">
-          <property role="TrG5h" value="target" />
-          <node concept="3Tqbb2" id="1z4$59jFqrD" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="3FEFhOSPfa7" role="3clF46">
-          <property role="TrG5h" value="strong" />
-          <node concept="10P_77" id="3FEFhOSPktM" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="1z4$59jFqrE" role="3clF46">
-          <property role="TrG5h" value="value" />
-          <node concept="3uibUv" id="1z4$59jFqrF" role="1tU5fm">
-            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="1z4$59jFoE3" role="3clF45" />
-        <node concept="3Tm1VV" id="1z4$59jFoE4" role="1B3o_S" />
-        <node concept="3clFbS" id="1z4$59jFoE5" role="3clF47">
-          <node concept="3clFbF" id="1z4$59jFrC4" role="3cqZAp">
-            <node concept="2OqwBi" id="1z4$59jFrC5" role="3clFbG">
-              <node concept="Xjq3P" id="1z4$59jFrC6" role="2Oq$k0">
-                <ref role="1HBi2w" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-              </node>
-              <node concept="liA8E" id="1z4$59jFrC7" role="2OqNvi">
-                <ref role="37wK5l" node="1z4$59j_T$f" resolve="putConvertsTo" />
-                <node concept="37vLTw" id="1z4$59jFuu8" role="37wK5m">
-                  <ref role="3cqZAo" node="1z4$59jFqrA" resolve="source" />
-                </node>
-                <node concept="37vLTw" id="1z4$59jFuCj" role="37wK5m">
-                  <ref role="3cqZAo" node="1z4$59jFqrC" resolve="target" />
-                </node>
-                <node concept="37vLTw" id="3FEFhOSPrlI" role="37wK5m">
-                  <ref role="3cqZAo" node="3FEFhOSPfa7" resolve="strong" />
-                </node>
-                <node concept="37vLTw" id="1z4$59jFuGr" role="37wK5m">
-                  <ref role="3cqZAo" node="1z4$59jFqrE" resolve="value" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="1z4$59jFuM0" role="jymVt">
-        <property role="TrG5h" value="putCoerceToConcept" />
-        <node concept="37vLTG" id="1z4$59jFxbE" role="3clF46">
-          <property role="TrG5h" value="source" />
-          <node concept="3Tqbb2" id="1z4$59jFxbF" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="1z4$59jFxbG" role="3clF46">
-          <property role="TrG5h" value="targetConcept" />
-          <node concept="3bZ5Sz" id="1z4$59jFxbH" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="3FEFhOSPwwb" role="3clF46">
-          <property role="TrG5h" value="strong" />
-          <node concept="10P_77" id="3FEFhOSP$Tw" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="1z4$59jFxbI" role="3clF46">
-          <property role="TrG5h" value="value" />
-          <node concept="3uibUv" id="1z4$59jFxbJ" role="1tU5fm">
-            <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-            <node concept="3uibUv" id="1z4$59jFxbK" role="11_B2D">
-              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-            </node>
-            <node concept="3Tqbb2" id="1z4$59jFxbL" role="11_B2D" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="1z4$59jFuM7" role="3clF45" />
-        <node concept="3Tm1VV" id="1z4$59jFuM8" role="1B3o_S" />
-        <node concept="3clFbS" id="1z4$59jFuM9" role="3clF47">
-          <node concept="3clFbF" id="1z4$59jFuMa" role="3cqZAp">
-            <node concept="2OqwBi" id="1z4$59jFuMb" role="3clFbG">
-              <node concept="Xjq3P" id="1z4$59jFuMc" role="2Oq$k0">
-                <ref role="1HBi2w" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-              </node>
-              <node concept="liA8E" id="1z4$59jFuMd" role="2OqNvi">
-                <ref role="37wK5l" node="1z4$59j_T$M" resolve="putCoerceToConcept" />
-                <node concept="37vLTw" id="1z4$59jFyGY" role="37wK5m">
-                  <ref role="3cqZAo" node="1z4$59jFxbE" resolve="source" />
-                </node>
-                <node concept="37vLTw" id="1z4$59jFyQ5" role="37wK5m">
-                  <ref role="3cqZAo" node="1z4$59jFxbG" resolve="targetConcept" />
-                </node>
-                <node concept="37vLTw" id="3FEFhOSPELW" role="37wK5m">
-                  <ref role="3cqZAo" node="3FEFhOSPwwb" resolve="strong" />
-                </node>
-                <node concept="37vLTw" id="1z4$59jFxVr" role="37wK5m">
-                  <ref role="3cqZAo" node="1z4$59jFxbI" resolve="value" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1z4$59jqeoI" role="1B3o_S" />
-      <node concept="3clFb_" id="1RYTbd7YOM8" role="jymVt">
-        <property role="TrG5h" value="putCoerceTo" />
-        <node concept="37vLTG" id="1RYTbd7YOM9" role="3clF46">
-          <property role="TrG5h" value="source" />
-          <node concept="3Tqbb2" id="1RYTbd7YOMa" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="1RYTbd7YOMb" role="3clF46">
-          <property role="TrG5h" value="target" />
-          <node concept="3Tqbb2" id="1RYTbd7YR7j" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="3FEFhOSPJAq" role="3clF46">
-          <property role="TrG5h" value="strong" />
-          <node concept="10P_77" id="3FEFhOSPOrI" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="1RYTbd7YOMd" role="3clF46">
-          <property role="TrG5h" value="value" />
-          <node concept="3uibUv" id="1RYTbd7YOMe" role="1tU5fm">
-            <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-            <node concept="3uibUv" id="1RYTbd7YOMf" role="11_B2D">
-              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-            </node>
-            <node concept="3Tqbb2" id="1RYTbd7YOMg" role="11_B2D" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="1RYTbd7YOMh" role="3clF45" />
-        <node concept="3Tm1VV" id="1RYTbd7YOMi" role="1B3o_S" />
-        <node concept="3clFbS" id="1RYTbd7YOMj" role="3clF47">
-          <node concept="3clFbF" id="1RYTbd7YOMk" role="3cqZAp">
-            <node concept="2OqwBi" id="1RYTbd7YOMl" role="3clFbG">
-              <node concept="Xjq3P" id="1RYTbd7YOMm" role="2Oq$k0">
-                <ref role="1HBi2w" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-              </node>
-              <node concept="liA8E" id="1RYTbd7YOMn" role="2OqNvi">
-                <ref role="37wK5l" node="1RYTbd7Wq1N" resolve="putCoerceTo" />
-                <node concept="37vLTw" id="1RYTbd7YOMo" role="37wK5m">
-                  <ref role="3cqZAo" node="1RYTbd7YOM9" resolve="source" />
-                </node>
-                <node concept="37vLTw" id="1RYTbd7YOMp" role="37wK5m">
-                  <ref role="3cqZAo" node="1RYTbd7YOMb" resolve="target" />
-                </node>
-                <node concept="37vLTw" id="3FEFhOSPUfg" role="37wK5m">
-                  <ref role="3cqZAo" node="3FEFhOSPJAq" resolve="strong" />
-                </node>
-                <node concept="37vLTw" id="1RYTbd7YOMq" role="37wK5m">
-                  <ref role="3cqZAo" node="1RYTbd7YOMd" resolve="value" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6QH_LDtcCVX" role="jymVt" />
-    <node concept="3clFbW" id="5cBWTAejXzY" role="jymVt">
-      <node concept="3cqZAl" id="5cBWTAejX$1" role="3clF45" />
-      <node concept="3Tmbuc" id="5cBWTAejX$2" role="1B3o_S" />
-      <node concept="3clFbS" id="5cBWTAejX$3" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5cBWTAejXzX" role="jymVt" />
-    <node concept="3clFb_" id="6QH_LDtcxgN" role="jymVt">
-      <property role="TrG5h" value="getType" />
-      <node concept="37vLTG" id="6QH_LDtcxgO" role="3clF46">
-        <property role="TrG5h" value="nodeRef" />
-        <node concept="3uibUv" id="443LGHBdP_o" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="6QH_LDtcxgQ" role="3clF45" />
-      <node concept="3Tm1VV" id="6QH_LDtcxgR" role="1B3o_S" />
-      <node concept="3clFbS" id="6QH_LDtcxgS" role="3clF47">
-        <node concept="3clFbF" id="6QH_LDteZQM" role="3cqZAp">
-          <node concept="3EllGN" id="6QH_LDtf0fY" role="3clFbG">
-            <node concept="37vLTw" id="6$gg4kAAgdH" role="3ElVtu">
-              <ref role="3cqZAo" node="6QH_LDtcxgO" resolve="nodeRef" />
-            </node>
-            <node concept="37vLTw" id="6QH_LDteZQL" role="3ElQJh">
-              <ref role="3cqZAo" node="6QH_LDtcJq4" resolve="typeNodes" />
-            </node>
-          </node>
-        </node>
-      </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="2sp9CU" id="4ZGicUZaojm" role="3rvQeY" />
-        <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>
-    <node concept="2tJIrI" id="3yEb0I3WCjI" role="jymVt" />
-    <node concept="3clFb_" id="3yEb0I3SXN3" role="jymVt">
-      <property role="TrG5h" value="allReportItems" />
-      <node concept="3Tm1VV" id="3yEb0I3SXN6" role="1B3o_S" />
-      <node concept="3clFbS" id="3yEb0I3SXN7" role="3clF47">
-        <node concept="3cpWs8" id="7Aoa2yULbpf" role="3cqZAp">
-          <node concept="3cpWsn" id="7Aoa2yULbpg" role="3cpWs9">
-            <property role="TrG5h" value="list" />
-            <node concept="_YKpA" id="7Aoa2yUL8cT" role="1tU5fm">
-              <node concept="3uibUv" id="7Aoa2yUL8cW" role="_ZDj9">
-                <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="7Aoa2yULbph" role="33vP2m">
-              <node concept="Tc6Ow" id="7Aoa2yULbpi" role="2ShVmc">
-                <node concept="3uibUv" id="7Aoa2yULbpj" role="HW$YZ">
-                  <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7Aoa2yUKHOP" role="3cqZAp">
-          <node concept="2OqwBi" id="7Aoa2yULksp" role="3clFbG">
-            <node concept="37vLTw" id="7Aoa2yULbpk" role="2Oq$k0">
-              <ref role="3cqZAo" node="7Aoa2yULbpg" resolve="list" />
-            </node>
-            <node concept="X8dFx" id="7Aoa2yULsnd" role="2OqNvi">
-              <node concept="37vLTw" id="7Aoa2yULyge" role="25WWJ7">
-                <ref role="3cqZAo" node="55xYlrlYSeQ" resolve="feedbackReportItems" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7Aoa2yULBPU" role="3cqZAp">
-          <node concept="2OqwBi" id="7Aoa2yULBPV" role="3clFbG">
-            <node concept="37vLTw" id="7Aoa2yULBPW" role="2Oq$k0">
-              <ref role="3cqZAo" node="7Aoa2yULbpg" resolve="list" />
-            </node>
-            <node concept="X8dFx" id="7Aoa2yULBPX" role="2OqNvi">
-              <node concept="37vLTw" id="7Aoa2yULBPY" role="25WWJ7">
-                <ref role="3cqZAo" node="9dktABNSdT" resolve="auxReportItems" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7Aoa2yULVsj" role="3cqZAp">
-          <node concept="37vLTw" id="7Aoa2yULVsh" role="3clFbG">
-            <ref role="3cqZAo" node="7Aoa2yULbpg" resolve="list" />
-          </node>
-        </node>
-      </node>
-      <node concept="3vKaQO" id="3yEb0I3Tbjj" role="3clF45">
-        <node concept="3uibUv" id="3yEb0I3TcsH" role="3O5elw">
-          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1z4$59jbV_l" role="jymVt" />
-    <node concept="3clFb_" id="1z4$59jyR8N" role="jymVt">
-      <property role="TrG5h" value="convertsTo" />
-      <node concept="37vLTG" id="1z4$59jzdfB" role="3clF46">
-        <property role="TrG5h" value="source" />
-        <node concept="3Tqbb2" id="1z4$59jzhAb" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1z4$59jziqC" role="3clF46">
-        <property role="TrG5h" value="target" />
-        <node concept="3Tqbb2" id="1z4$59jznnU" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="3FEFhOSOnO5" role="3clF46">
-        <property role="TrG5h" value="strong" />
-        <node concept="10P_77" id="3FEFhOSOtkh" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="1z4$59jzuMC" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-      </node>
-      <node concept="3Tm1VV" id="1z4$59jyR8Q" role="1B3o_S" />
-      <node concept="3clFbS" id="1z4$59jyR8R" role="3clF47">
-        <node concept="3cpWs8" id="1z4$59jzsLU" role="3cqZAp">
-          <node concept="3cpWsn" id="1z4$59jzsLV" role="3cpWs9">
-            <property role="TrG5h" value="map" />
-            <node concept="3uibUv" id="1z4$59jzspF" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-              <node concept="3uibUv" id="1z4$59jzspK" role="11_B2D">
-                <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-              </node>
-              <node concept="3uibUv" id="1z4$59jzspL" role="11_B2D">
-                <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="1z4$59jzsLW" role="33vP2m">
-              <node concept="37vLTw" id="1z4$59jzsLX" role="2Oq$k0">
-                <ref role="3cqZAo" node="1z4$59jbqu2" resolve="convertsToCache" />
-              </node>
-              <node concept="liA8E" id="1z4$59jzsLY" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
-                <node concept="2ShNRf" id="1z4$59j__1X" role="37wK5m">
-                  <node concept="1pGfFk" id="1z4$59j__1Y" role="2ShVmc">
-                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                    <node concept="37vLTw" id="1z4$59j__1Z" role="37wK5m">
-                      <ref role="3cqZAo" node="1z4$59jzdfB" resolve="source" />
-                    </node>
-                    <node concept="37vLTw" id="3FEFhOSOyZN" role="37wK5m">
-                      <ref role="3cqZAo" node="3FEFhOSOnO5" resolve="strong" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="1z4$59jzR69" role="3cqZAp">
-          <node concept="3clFbS" id="1z4$59jzR6r" role="3clFbx">
-            <node concept="3cpWs6" id="1z4$59jzWcf" role="3cqZAp">
-              <node concept="10Nm6u" id="1z4$59jzWen" role="3cqZAk" />
-            </node>
-          </node>
-          <node concept="3clFbC" id="1z4$59jzQLF" role="3clFbw">
-            <node concept="10Nm6u" id="1z4$59jzQWO" role="3uHU7w" />
-            <node concept="37vLTw" id="1z4$59jzsM0" role="3uHU7B">
-              <ref role="3cqZAo" node="1z4$59jzsLV" resolve="map" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1z4$59j$1lW" role="3cqZAp" />
-        <node concept="3clFbF" id="1z4$59jETMS" role="3cqZAp">
-          <node concept="2OqwBi" id="1z4$59j$XW_" role="3clFbG">
-            <node concept="37vLTw" id="1z4$59j$XWA" role="2Oq$k0">
-              <ref role="3cqZAo" node="1z4$59jzsLV" resolve="map" />
-            </node>
-            <node concept="liA8E" id="1z4$59j$XWB" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
-              <node concept="2ShNRf" id="1z4$59j_viN" role="37wK5m">
-                <node concept="1pGfFk" id="1z4$59j_viO" role="2ShVmc">
-                  <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                  <node concept="37vLTw" id="1z4$59j_viP" role="37wK5m">
-                    <ref role="3cqZAo" node="1z4$59jziqC" resolve="target" />
-                  </node>
-                  <node concept="37vLTw" id="3FEFhOSOFst" role="37wK5m">
-                    <ref role="3cqZAo" node="3FEFhOSOnO5" resolve="strong" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1z4$59jyJWl" role="jymVt" />
-    <node concept="3clFb_" id="1z4$59j$eEZ" role="jymVt">
-      <property role="TrG5h" value="coerceToConcept" />
-      <node concept="37vLTG" id="1z4$59j$D4X" role="3clF46">
-        <property role="TrG5h" value="source" />
-        <node concept="3Tqbb2" id="1z4$59j$D4Y" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1z4$59j$D4Z" role="3clF46">
-        <property role="TrG5h" value="target" />
-        <node concept="3bZ5Sz" id="1z4$59j$D50" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="3FEFhOSOJRR" role="3clF46">
-        <property role="TrG5h" value="strong" />
-        <node concept="10P_77" id="3FEFhOSOPgj" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="1z4$59j$x3M" role="3clF45">
-        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-        <node concept="3uibUv" id="1z4$59j$Ah0" role="11_B2D">
-          <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-        </node>
-        <node concept="3Tqbb2" id="1z4$59j$Au3" role="11_B2D" />
-      </node>
-      <node concept="3Tm1VV" id="1z4$59j$eF2" role="1B3o_S" />
-      <node concept="3clFbS" id="1z4$59j$eF3" role="3clF47">
-        <node concept="3cpWs8" id="1z4$59j$ASY" role="3cqZAp">
-          <node concept="3cpWsn" id="1z4$59j$ASZ" role="3cpWs9">
-            <property role="TrG5h" value="map" />
-            <node concept="3uibUv" id="1z4$59j$AT0" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-              <node concept="3bZ5Sz" id="1z4$59j$AT1" role="11_B2D" />
-              <node concept="3uibUv" id="1z4$59j$AT2" role="11_B2D">
-                <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                <node concept="3uibUv" id="1z4$59j$AT3" role="11_B2D">
-                  <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                </node>
-                <node concept="3Tqbb2" id="1z4$59j$AT4" role="11_B2D" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="1z4$59j$AT5" role="33vP2m">
-              <node concept="37vLTw" id="1z4$59j$AT6" role="2Oq$k0">
-                <ref role="3cqZAo" node="1z4$59jbquf" resolve="coerceToConceptCache" />
-              </node>
-              <node concept="liA8E" id="1z4$59j$AT7" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
-                <node concept="2ShNRf" id="1z4$59j_EOV" role="37wK5m">
-                  <node concept="1pGfFk" id="1z4$59j_EOW" role="2ShVmc">
-                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                    <node concept="37vLTw" id="1z4$59j_EOX" role="37wK5m">
-                      <ref role="3cqZAo" node="1z4$59j$D4X" resolve="source" />
-                    </node>
-                    <node concept="37vLTw" id="3FEFhOSOQ4n" role="37wK5m">
-                      <ref role="3cqZAo" node="3FEFhOSOJRR" resolve="strong" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="1z4$59j$L0h" role="3cqZAp">
-          <node concept="3clFbS" id="1z4$59j$L0z" role="3clFbx">
-            <node concept="3cpWs6" id="1z4$59j$Lez" role="3cqZAp">
-              <node concept="10Nm6u" id="1z4$59j$LgN" role="3cqZAk" />
-            </node>
-          </node>
-          <node concept="3clFbC" id="1z4$59j$KCd" role="3clFbw">
-            <node concept="10Nm6u" id="1z4$59j$KVF" role="3uHU7w" />
-            <node concept="37vLTw" id="1z4$59j$K0t" role="3uHU7B">
-              <ref role="3cqZAo" node="1z4$59j$ASZ" resolve="map" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1z4$59j_rIq" role="3cqZAp" />
-        <node concept="3clFbF" id="1z4$59j_9Tm" role="3cqZAp">
-          <node concept="2OqwBi" id="1z4$59j_frS" role="3clFbG">
-            <node concept="37vLTw" id="1z4$59j_frT" role="2Oq$k0">
-              <ref role="3cqZAo" node="1z4$59j$ASZ" resolve="map" />
-            </node>
-            <node concept="liA8E" id="1z4$59j_frU" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
-              <node concept="37vLTw" id="1z4$59j_frV" role="37wK5m">
-                <ref role="3cqZAo" node="1z4$59j$D4Z" resolve="target" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1z4$59j_KEB" role="jymVt" />
-    <node concept="3clFb_" id="1RYTbd7VNe4" role="jymVt">
-      <property role="TrG5h" value="coerceTo" />
-      <node concept="37vLTG" id="1RYTbd7VNe5" role="3clF46">
-        <property role="TrG5h" value="source" />
-        <node concept="3Tqbb2" id="1RYTbd7VNe6" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1RYTbd7VNe7" role="3clF46">
-        <property role="TrG5h" value="target" />
-        <node concept="3Tqbb2" id="1RYTbd7VYXt" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="3FEFhOSOUfd" role="3clF46">
-        <property role="TrG5h" value="strong" />
-        <node concept="10P_77" id="3FEFhOSOYVG" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="1RYTbd7VNe9" role="3clF45">
-        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-        <node concept="3uibUv" id="1RYTbd7VNea" role="11_B2D">
-          <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-        </node>
-        <node concept="3Tqbb2" id="1RYTbd7VNeb" role="11_B2D" />
-      </node>
-      <node concept="3Tm1VV" id="1RYTbd7VNec" role="1B3o_S" />
-      <node concept="3clFbS" id="1RYTbd7VNed" role="3clF47">
-        <node concept="3cpWs8" id="1RYTbd7VNee" role="3cqZAp">
-          <node concept="3cpWsn" id="1RYTbd7VNef" role="3cpWs9">
-            <property role="TrG5h" value="map" />
-            <node concept="3uibUv" id="1RYTbd7VNeg" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-              <node concept="3uibUv" id="1RYTbd7Wh$v" role="11_B2D">
-                <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-              </node>
-              <node concept="3uibUv" id="1RYTbd7VNei" role="11_B2D">
-                <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                <node concept="3uibUv" id="1RYTbd7VNej" role="11_B2D">
-                  <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                </node>
-                <node concept="3Tqbb2" id="1RYTbd7VNek" role="11_B2D" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="1RYTbd7VNel" role="33vP2m">
-              <node concept="37vLTw" id="1RYTbd7Wgxy" role="2Oq$k0">
-                <ref role="3cqZAo" node="1RYTbd7W1Xa" resolve="coerceToCache" />
-              </node>
-              <node concept="liA8E" id="1RYTbd7VNen" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
-                <node concept="2ShNRf" id="1RYTbd7VNeo" role="37wK5m">
-                  <node concept="1pGfFk" id="1RYTbd7VNep" role="2ShVmc">
-                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                    <node concept="37vLTw" id="1RYTbd7VNeq" role="37wK5m">
-                      <ref role="3cqZAo" node="1RYTbd7VNe5" resolve="source" />
-                    </node>
-                    <node concept="37vLTw" id="3FEFhOSP4W_" role="37wK5m">
-                      <ref role="3cqZAo" node="3FEFhOSOUfd" resolve="strong" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="1RYTbd7VNer" role="3cqZAp">
-          <node concept="3clFbS" id="1RYTbd7VNes" role="3clFbx">
-            <node concept="3cpWs6" id="1RYTbd7VNet" role="3cqZAp">
-              <node concept="10Nm6u" id="1RYTbd7VNeu" role="3cqZAk" />
-            </node>
-          </node>
-          <node concept="3clFbC" id="1RYTbd7VNev" role="3clFbw">
-            <node concept="10Nm6u" id="1RYTbd7VNew" role="3uHU7w" />
-            <node concept="37vLTw" id="1RYTbd7VNex" role="3uHU7B">
-              <ref role="3cqZAo" node="1RYTbd7VNef" resolve="map" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1RYTbd7VNey" role="3cqZAp" />
-        <node concept="3clFbF" id="1RYTbd7VNez" role="3cqZAp">
-          <node concept="2OqwBi" id="1RYTbd7VNe$" role="3clFbG">
-            <node concept="37vLTw" id="1RYTbd7VNe_" role="2Oq$k0">
-              <ref role="3cqZAo" node="1RYTbd7VNef" resolve="map" />
-            </node>
-            <node concept="liA8E" id="1RYTbd7VNeA" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
-              <node concept="2ShNRf" id="1RYTbd7WRRW" role="37wK5m">
-                <node concept="1pGfFk" id="1RYTbd7WTcn" role="2ShVmc">
-                  <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                  <node concept="37vLTw" id="1RYTbd7WTxv" role="37wK5m">
-                    <ref role="3cqZAo" node="1RYTbd7VNe7" resolve="target" />
-                  </node>
-                  <node concept="37vLTw" id="3FEFhOSPabj" role="37wK5m">
-                    <ref role="3cqZAo" node="3FEFhOSOUfd" resolve="strong" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1RYTbd7VNe3" role="jymVt" />
-    <node concept="3clFb_" id="1z4$59jrfhG" role="jymVt">
-      <property role="TrG5h" value="update" />
-      <node concept="3uibUv" id="1z4$59jrkOE" role="3clF45">
-        <ref role="3uigEE" node="1z4$59jqeoH" resolve="TypecheckingResultsCache.Update" />
-      </node>
-      <node concept="3Tmbuc" id="1z4$59jrfhI" role="1B3o_S" />
-      <node concept="3clFbS" id="1z4$59jrfhK" role="3clF47">
-        <node concept="3clFbF" id="1z4$59jru7q" role="3cqZAp">
-          <node concept="2ShNRf" id="1z4$59jru7o" role="3clFbG">
-            <node concept="1pGfFk" id="1z4$59jruTC" role="2ShVmc">
-              <ref role="37wK5l" node="1z4$59jqjZr" resolve="TypecheckingResultsCache.Update" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1z4$59jr4ea" role="jymVt" />
-    <node concept="3clFb_" id="7gMIJIycJB4" role="jymVt">
-      <property role="TrG5h" value="disengage" />
-      <node concept="3cqZAl" id="7gMIJIycJB6" role="3clF45" />
-      <node concept="3Tmbuc" id="7gMIJIye4QM" role="1B3o_S" />
-      <node concept="3clFbS" id="7gMIJIycJB8" role="3clF47">
-        <node concept="3clFbF" id="7gMIJIyeGnS" role="3cqZAp">
-          <node concept="37vLTI" id="7gMIJIyeHvm" role="3clFbG">
-            <node concept="10Nm6u" id="7gMIJIyeHGO" role="37vLTx" />
-            <node concept="2OqwBi" id="7gMIJIyeGrE" role="37vLTJ">
-              <node concept="Xjq3P" id="7gMIJIyeGnQ" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7gMIJIyeG_0" role="2OqNvi">
-                <ref role="2Oxat5" node="6QH_LDtcJq4" resolve="typeNodes" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7gMIJIyeIeb" role="3cqZAp">
-          <node concept="37vLTI" id="7gMIJIyeK33" role="3clFbG">
-            <node concept="10Nm6u" id="7gMIJIyeKc5" role="37vLTx" />
-            <node concept="2OqwBi" id="7gMIJIyeIot" role="37vLTJ">
-              <node concept="Xjq3P" id="7gMIJIyeIe9" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7gMIJIyeIKG" role="2OqNvi">
-                <ref role="2Oxat5" node="9dktABNSdT" resolve="auxReportItems" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7gMIJIyeNHx" role="3cqZAp">
-          <node concept="37vLTI" id="7gMIJIyeP3t" role="3clFbG">
-            <node concept="10Nm6u" id="7gMIJIyeP7R" role="37vLTx" />
-            <node concept="2OqwBi" id="7gMIJIyeNTF" role="37vLTJ">
-              <node concept="Xjq3P" id="7gMIJIyeNHv" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7gMIJIyeOak" role="2OqNvi">
-                <ref role="2Oxat5" node="1z4$59jbqu2" resolve="convertsToCache" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7gMIJIyePZq" role="3cqZAp">
-          <node concept="37vLTI" id="7gMIJIyeUe0" role="3clFbG">
-            <node concept="10Nm6u" id="7gMIJIyeURY" role="37vLTx" />
-            <node concept="2OqwBi" id="7gMIJIyeQmV" role="37vLTJ">
-              <node concept="Xjq3P" id="7gMIJIyePZo" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7gMIJIyeS6N" role="2OqNvi">
-                <ref role="2Oxat5" node="1z4$59jbquf" resolve="coerceToConceptCache" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7gMIJIychNo" role="jymVt" />
-    <node concept="3clFb_" id="61G6TdDuZzD" role="jymVt">
-      <property role="TrG5h" value="merge" />
-      <node concept="37vLTG" id="61G6TdDvb9F" role="3clF46">
-        <property role="TrG5h" value="that" />
-        <node concept="3uibUv" id="61G6TdDvdQV" role="1tU5fm">
-          <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="61G6TdDuZzF" role="3clF45" />
-      <node concept="3Tmbuc" id="1z4$59jkxtT" role="1B3o_S" />
-      <node concept="3clFbS" id="61G6TdDuZzH" role="3clF47">
-        <node concept="3clFbF" id="19fWAfxSIg5" role="3cqZAp">
-          <node concept="37vLTI" id="19fWAfxSIg6" role="3clFbG">
-            <node concept="2OqwBi" id="19fWAfxSIg7" role="37vLTx">
-              <node concept="37vLTw" id="1RYTbd8BhzZ" role="2Oq$k0">
-                <ref role="3cqZAo" node="61G6TdDvb9F" resolve="that" />
-              </node>
-              <node concept="2OwXpG" id="19fWAfxSIg8" role="2OqNvi">
-                <ref role="2Oxat5" node="6QH_LDtcJq4" resolve="typeNodes" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="19fWAfxSIg9" role="37vLTJ">
-              <node concept="Xjq3P" id="19fWAfxSIga" role="2Oq$k0" />
-              <node concept="2OwXpG" id="19fWAfxSIgb" role="2OqNvi">
-                <ref role="2Oxat5" node="6QH_LDtcJq4" resolve="typeNodes" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="19fWAfxSIgk" role="3cqZAp">
-          <node concept="37vLTI" id="19fWAfxSIgl" role="3clFbG">
-            <node concept="2OqwBi" id="19fWAfxSIgm" role="37vLTx">
-              <node concept="37vLTw" id="1RYTbd8Bics" role="2Oq$k0">
-                <ref role="3cqZAo" node="61G6TdDvb9F" resolve="that" />
-              </node>
-              <node concept="2OwXpG" id="19fWAfxSIgn" role="2OqNvi">
-                <ref role="2Oxat5" node="9dktABNSdT" resolve="auxReportItems" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="19fWAfxSIgo" role="37vLTJ">
-              <node concept="Xjq3P" id="19fWAfxSIgp" role="2Oq$k0" />
-              <node concept="2OwXpG" id="19fWAfxSIgq" role="2OqNvi">
-                <ref role="2Oxat5" node="9dktABNSdT" resolve="auxReportItems" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="19fWAfxSIgz" role="3cqZAp">
-          <node concept="37vLTI" id="19fWAfxSIg$" role="3clFbG">
-            <node concept="2OqwBi" id="19fWAfxSIg_" role="37vLTx">
-              <node concept="37vLTw" id="1RYTbd8BiOm" role="2Oq$k0">
-                <ref role="3cqZAo" node="61G6TdDvb9F" resolve="that" />
-              </node>
-              <node concept="2OwXpG" id="19fWAfxSIgA" role="2OqNvi">
-                <ref role="2Oxat5" node="1z4$59jbqu2" resolve="convertsToCache" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="19fWAfxSIgB" role="37vLTJ">
-              <node concept="Xjq3P" id="19fWAfxSIgC" role="2Oq$k0" />
-              <node concept="2OwXpG" id="19fWAfxSIgD" role="2OqNvi">
-                <ref role="2Oxat5" node="1z4$59jbqu2" resolve="convertsToCache" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="19fWAfxSIgM" role="3cqZAp">
-          <node concept="37vLTI" id="19fWAfxSIgN" role="3clFbG">
-            <node concept="2OqwBi" id="19fWAfxSIgO" role="37vLTx">
-              <node concept="37vLTw" id="1RYTbd8Bjur" role="2Oq$k0">
-                <ref role="3cqZAo" node="61G6TdDvb9F" resolve="that" />
-              </node>
-              <node concept="2OwXpG" id="19fWAfxSIgP" role="2OqNvi">
-                <ref role="2Oxat5" node="1z4$59jbquf" resolve="coerceToConceptCache" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="19fWAfxSIgQ" role="37vLTJ">
-              <node concept="Xjq3P" id="19fWAfxSIgR" role="2Oq$k0" />
-              <node concept="2OwXpG" id="19fWAfxSIgS" role="2OqNvi">
-                <ref role="2Oxat5" node="1z4$59jbquf" resolve="coerceToConceptCache" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="19fWAfxSIh1" role="3cqZAp">
-          <node concept="37vLTI" id="19fWAfxSIh2" role="3clFbG">
-            <node concept="2OqwBi" id="19fWAfxSIh3" role="37vLTx">
-              <node concept="37vLTw" id="1RYTbd8Bkc1" role="2Oq$k0">
-                <ref role="3cqZAo" node="61G6TdDvb9F" resolve="that" />
-              </node>
-              <node concept="2OwXpG" id="19fWAfxSIh4" role="2OqNvi">
-                <ref role="2Oxat5" node="1RYTbd7W1Xa" resolve="coerceToCache" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="19fWAfxSIh5" role="37vLTJ">
-              <node concept="Xjq3P" id="19fWAfxSIh6" role="2Oq$k0" />
-              <node concept="2OwXpG" id="19fWAfxSIh7" role="2OqNvi">
-                <ref role="2Oxat5" node="1RYTbd7W1Xa" resolve="coerceToCache" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="55xYlrmyEVi" role="3cqZAp">
-          <node concept="37vLTI" id="55xYlrmyRAC" role="3clFbG">
-            <node concept="2OqwBi" id="55xYlrmyXx4" role="37vLTx">
-              <node concept="37vLTw" id="55xYlrmyUjN" role="2Oq$k0">
-                <ref role="3cqZAo" node="61G6TdDvb9F" resolve="that" />
-              </node>
-              <node concept="2OwXpG" id="55xYlrmz2lQ" role="2OqNvi">
-                <ref role="2Oxat5" node="55xYlrlYSeQ" resolve="feedbackReportItems" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="55xYlrmyI6P" role="37vLTJ">
-              <node concept="Xjq3P" id="55xYlrmyEVg" role="2Oq$k0" />
-              <node concept="2OwXpG" id="55xYlrmyMU5" role="2OqNvi">
-                <ref role="2Oxat5" node="55xYlrlYSeQ" resolve="feedbackReportItems" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="19fWAfxSIhc" role="3cqZAp">
-          <node concept="2OqwBi" id="19fWAfxSIhd" role="3clFbG">
-            <node concept="37vLTw" id="1RYTbd8BkTB" role="2Oq$k0">
-              <ref role="3cqZAo" node="61G6TdDvb9F" resolve="that" />
-            </node>
-            <node concept="liA8E" id="19fWAfxSIhe" role="2OqNvi">
-              <ref role="37wK5l" node="7gMIJIycJB4" resolve="disengage" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="WJTIIoWBV8" role="jymVt" />
-    <node concept="3clFb_" id="6QH_LDtcYUC" role="jymVt">
-      <property role="TrG5h" value="putType" />
-      <node concept="37vLTG" id="6QH_LDtd1QE" role="3clF46">
-        <property role="TrG5h" value="ref" />
-        <node concept="3uibUv" id="6QH_LDtd2q6" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="6QH_LDtd2re" role="3clF46">
-        <property role="TrG5h" value="type" />
-        <node concept="3Tqbb2" id="6QH_LDtd2YG" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="6QH_LDtcYUE" role="3clF45" />
-      <node concept="3Tmbuc" id="1z4$59je4SI" role="1B3o_S" />
-      <node concept="3clFbS" id="6QH_LDtcYUG" role="3clF47">
-        <node concept="3clFbF" id="6QH_LDtde1j" role="3cqZAp">
-          <node concept="37vLTI" id="6QH_LDtdeVn" role="3clFbG">
-            <node concept="37vLTw" id="6QH_LDtdeYh" role="37vLTx">
-              <ref role="3cqZAo" node="6QH_LDtd2re" resolve="type" />
-            </node>
-            <node concept="3EllGN" id="6QH_LDtdeIn" role="37vLTJ">
-              <node concept="37vLTw" id="6QH_LDtdeN7" role="3ElVtu">
-                <ref role="3cqZAo" node="6QH_LDtd1QE" resolve="ref" />
-              </node>
-              <node concept="37vLTw" id="6QH_LDtde1i" role="3ElQJh">
-                <ref role="3cqZAo" node="6QH_LDtcJq4" resolve="typeNodes" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2ceN1hCNz5d" role="jymVt" />
-    <node concept="3clFb_" id="6$gg4kA3UdB" role="jymVt">
-      <property role="TrG5h" value="putAllTypes" />
-      <node concept="37vLTG" id="6$gg4kA3ZRS" role="3clF46">
-        <property role="TrG5h" value="loc2typeNode" />
-        <node concept="3rvAFt" id="6$gg4kA43IH" role="1tU5fm">
-          <node concept="3Tqbb2" id="6$gg4kA43II" role="3rvSg0" />
-          <node concept="2sp9CU" id="2ceN1hCNDBy" role="3rvQeY" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="6$gg4kA3UdD" role="3clF45" />
-      <node concept="3Tmbuc" id="1z4$59jdnAu" role="1B3o_S" />
-      <node concept="3clFbS" id="6$gg4kA3UdF" role="3clF47">
-        <node concept="1DcWWT" id="6$gg4kA4iRr" role="3cqZAp">
-          <node concept="3clFbS" id="6$gg4kA4iRs" role="2LFqv$">
-            <node concept="3cpWs8" id="6$gg4kA4iRt" role="3cqZAp">
-              <node concept="3cpWsn" id="6$gg4kA4iRu" role="3cpWs9">
-                <property role="TrG5h" value="typeNode" />
-                <node concept="3Tqbb2" id="6$gg4kA4iRv" role="1tU5fm" />
-                <node concept="2OqwBi" id="6$gg4kA4iRw" role="33vP2m">
-                  <node concept="37vLTw" id="6$gg4kA4iRx" role="2Oq$k0">
-                    <ref role="3cqZAo" node="6$gg4kA4iRP" resolve="m" />
-                  </node>
-                  <node concept="3AV6Ez" id="6$gg4kA4iRy" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="6$gg4kA4iRz" role="3cqZAp">
-              <node concept="3clFbS" id="6$gg4kA4iR$" role="3clFbx">
-                <node concept="3clFbF" id="6$gg4kA4iR_" role="3cqZAp">
-                  <node concept="1rXfSq" id="6$gg4kA4wVR" role="3clFbG">
-                    <ref role="37wK5l" node="6QH_LDtcYUC" resolve="putType" />
-                    <node concept="2OqwBi" id="6$gg4kA4iRD" role="37wK5m">
-                      <node concept="37vLTw" id="6$gg4kA4iRE" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6$gg4kA4iRP" resolve="m" />
-                      </node>
-                      <node concept="3AY5_j" id="6$gg4kA4iRF" role="2OqNvi" />
-                    </node>
-                    <node concept="2OqwBi" id="6$gg4kA4iRG" role="37wK5m">
-                      <node concept="37vLTw" id="6$gg4kA4iRH" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6$gg4kA4iRP" resolve="m" />
-                      </node>
-                      <node concept="3AV6Ez" id="6$gg4kA4iRI" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3y3z36" id="6$gg4kA4iRJ" role="3clFbw">
-                <node concept="10Nm6u" id="6$gg4kA4iRK" role="3uHU7w" />
-                <node concept="37vLTw" id="6$gg4kA4iRL" role="3uHU7B">
-                  <ref role="3cqZAo" node="6$gg4kA4iRu" resolve="typeNode" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="6$gg4kA4iRM" role="1DdaDG">
-            <node concept="37vLTw" id="6$gg4kA4n0X" role="2Oq$k0">
-              <ref role="3cqZAo" node="6$gg4kA3ZRS" resolve="loc2typeNode" />
-            </node>
-            <node concept="3CFNJx" id="6$gg4kA4iRO" role="2OqNvi" />
-          </node>
-          <node concept="3cpWsn" id="6$gg4kA4iRP" role="1Duv9x">
-            <property role="TrG5h" value="m" />
-            <node concept="3f3tKP" id="6$gg4kA4iRQ" role="1tU5fm">
-              <node concept="3Tqbb2" id="6$gg4kA4iRS" role="3f3$T$" />
-              <node concept="2sp9CU" id="2ceN1hCNEl7" role="3f3zw5" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="9dktABH5SO" role="jymVt" />
-    <node concept="3clFb_" id="3Pxu0s8oq7g" role="jymVt">
-      <property role="TrG5h" value="dropInvalidated" />
-      <node concept="37vLTG" id="3Pxu0s8oGkp" role="3clF46">
-        <property role="TrG5h" value="origins" />
-        <node concept="3vKaQO" id="3Pxu0s8oPzD" role="1tU5fm">
-          <node concept="3Tqbb2" id="3Pxu0s8oQ7M" role="3O5elw" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="3Pxu0s8oq7i" role="3clF45" />
-      <node concept="3Tmbuc" id="3Pxu0s8ow0S" role="1B3o_S" />
-      <node concept="3clFbS" id="3Pxu0s8oq7k" role="3clF47">
-        <node concept="3clFbJ" id="3Pxu0s8stqM" role="3cqZAp">
-          <node concept="3clFbS" id="3Pxu0s8stqO" role="3clFbx">
-            <node concept="1DcWWT" id="1RYTbd8yMXZ" role="3cqZAp">
-              <node concept="3clFbS" id="1RYTbd8yMY2" role="2LFqv$">
-                <node concept="3clFbF" id="1RYTbd8yO8m" role="3cqZAp">
-                  <node concept="2OqwBi" id="1RYTbd8yOHD" role="3clFbG">
-                    <node concept="37vLTw" id="1RYTbd8yO8l" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6QH_LDtcJq4" resolve="typeNodes" />
-                    </node>
-                    <node concept="kI3uX" id="1RYTbd8yP__" role="2OqNvi">
-                      <node concept="2OqwBi" id="3Pxu0s8pLBG" role="kIiFs">
-                        <node concept="liA8E" id="3Pxu0s8q08k" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                        </node>
-                        <node concept="2JrnkZ" id="3Pxu0s8pLBL" role="2Oq$k0">
-                          <node concept="37vLTw" id="1RYTbd8yPEm" role="2JrQYb">
-                            <ref role="3cqZAo" node="1RYTbd8yMY3" resolve="org" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWsn" id="1RYTbd8yMY3" role="1Duv9x">
-                <property role="TrG5h" value="org" />
-                <node concept="3Tqbb2" id="3Pxu0s8pxQe" role="1tU5fm" />
-              </node>
-              <node concept="37vLTw" id="3Pxu0s8prXL" role="1DdaDG">
-                <ref role="3cqZAo" node="3Pxu0s8oGkp" resolve="origins" />
-              </node>
-            </node>
-          </node>
-          <node concept="3y3z36" id="3Pxu0s8sAcJ" role="3clFbw">
-            <node concept="10Nm6u" id="3Pxu0s8sE0C" role="3uHU7w" />
-            <node concept="37vLTw" id="3Pxu0s8syH8" role="3uHU7B">
-              <ref role="3cqZAo" node="3Pxu0s8oGkp" resolve="origins" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="55xYlrm1Q7d" role="jymVt" />
-    <node concept="3clFb_" id="55xYlrm1XFI" role="jymVt">
-      <property role="TrG5h" value="changedBasis" />
-      <node concept="37vLTG" id="55xYlrm2bLA" role="3clF46">
-        <property role="TrG5h" value="invalidatedBasis" />
-        <node concept="3vKaQO" id="55xYlrm2lce" role="1tU5fm">
-          <node concept="3uibUv" id="55xYlrm2lJL" role="3O5elw">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="6DQTzHy7UEu" role="3clF46">
-        <property role="TrG5h" value="validatedBasis" />
-        <node concept="3vKaQO" id="6DQTzHy7UEv" role="1tU5fm">
-          <node concept="3uibUv" id="6DQTzHy7UEw" role="3O5elw">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="55xYlrm1XFK" role="3clF45" />
-      <node concept="3Tmbuc" id="55xYlrm2gPO" role="1B3o_S" />
-      <node concept="3clFbS" id="55xYlrm1XFM" role="3clF47">
-        <node concept="3cpWs8" id="1tzntNA8OZb" role="3cqZAp">
-          <node concept="3cpWsn" id="1tzntNA8OZc" role="3cpWs9">
-            <property role="TrG5h" value="invalidatedSet" />
-            <node concept="2hMVRd" id="1tzntNA8Ndf" role="1tU5fm">
-              <node concept="3uibUv" id="1tzntNA8Ndi" role="2hN53Y">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="1tzntNA8OZd" role="33vP2m">
-              <node concept="2i4dXS" id="1tzntNA8OZe" role="2ShVmc">
-                <node concept="3uibUv" id="1tzntNA8OZf" role="HW$YZ">
-                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                </node>
-                <node concept="37vLTw" id="1tzntNA8OZg" role="I$8f6">
-                  <ref role="3cqZAo" node="55xYlrm2bLA" resolve="invalidatedBasis" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6DQTzHy8jIj" role="3cqZAp">
-          <node concept="3cpWsn" id="6DQTzHy8jIk" role="3cpWs9">
-            <property role="TrG5h" value="validatedSet" />
-            <node concept="2hMVRd" id="6DQTzHy8jIl" role="1tU5fm">
-              <node concept="3uibUv" id="6DQTzHy8jIm" role="2hN53Y">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="6DQTzHy8jIn" role="33vP2m">
-              <node concept="2i4dXS" id="6DQTzHy8jIo" role="2ShVmc">
-                <node concept="3uibUv" id="6DQTzHy8jIp" role="HW$YZ">
-                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                </node>
-                <node concept="37vLTw" id="6DQTzHy8vzb" role="I$8f6">
-                  <ref role="3cqZAo" node="6DQTzHy7UEu" resolve="validatedBasis" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="55xYlrm3Caj" role="3cqZAp">
-          <node concept="3cpWsn" id="55xYlrm3Cak" role="3cpWs9">
-            <property role="TrG5h" value="itr" />
-            <node concept="2YL$Hu" id="55xYlrm3Ajm" role="1tU5fm">
-              <node concept="3uibUv" id="55xYlrm3Ajp" role="uOL27">
-                <ref role="3uigEE" to="hano:1FOQehwovmW" resolve="FeedbackReportItem" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="55xYlrm3Cal" role="33vP2m">
-              <node concept="37vLTw" id="55xYlrm3Cam" role="2Oq$k0">
-                <ref role="3cqZAo" node="55xYlrlYSeQ" resolve="feedbackReportItems" />
-              </node>
-              <node concept="uNJiE" id="55xYlrm3Can" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-        <node concept="2$JKZl" id="55xYlrm3S1z" role="3cqZAp">
-          <node concept="3clFbS" id="55xYlrm3S1_" role="2LFqv$">
-            <node concept="3cpWs8" id="55xYlrm4eoW" role="3cqZAp">
-              <node concept="3cpWsn" id="55xYlrm4eoX" role="3cpWs9">
-                <property role="TrG5h" value="item" />
-                <node concept="3uibUv" id="55xYlrm4cTh" role="1tU5fm">
-                  <ref role="3uigEE" to="hano:1FOQehwovmW" resolve="FeedbackReportItem" />
-                </node>
-                <node concept="2OqwBi" id="55xYlrm4eoY" role="33vP2m">
-                  <node concept="37vLTw" id="55xYlrm4eoZ" role="2Oq$k0">
-                    <ref role="3cqZAo" node="55xYlrm3Cak" resolve="itr" />
-                  </node>
-                  <node concept="v1n4t" id="55xYlrm4ep0" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="55xYlrm624P" role="3cqZAp">
-              <node concept="3clFbS" id="55xYlrm625r" role="3clFbx">
-                <node concept="3clFbF" id="55xYlrm66a_" role="3cqZAp">
-                  <node concept="2OqwBi" id="55xYlrm69k5" role="3clFbG">
-                    <node concept="37vLTw" id="55xYlrm66a$" role="2Oq$k0">
-                      <ref role="3cqZAo" node="55xYlrm3Cak" resolve="itr" />
-                    </node>
-                    <node concept="2YMH90" id="55xYlrm6dNr" role="2OqNvi" />
-                  </node>
-                </node>
-                <node concept="3clFbH" id="6DQTzHy9dVE" role="3cqZAp" />
-              </node>
-              <node concept="2OqwBi" id="1tzntNA9RNm" role="3clFbw">
-                <node concept="1eOMI4" id="1tzntNAanbB" role="2Oq$k0">
-                  <node concept="2OqwBi" id="1tzntNAanb$" role="1eOMHV">
-                    <node concept="37vLTw" id="1tzntNAanb_" role="2Oq$k0">
-                      <ref role="3cqZAo" node="55xYlrm4eoX" resolve="item" />
-                    </node>
-                    <node concept="liA8E" id="1tzntNAanbA" role="2OqNvi">
-                      <ref role="37wK5l" to="hano:55xYlrlZupy" resolve="getFeedbackBasis" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="2HwmR7" id="1tzntNA9VKj" role="2OqNvi">
-                  <node concept="1bVj0M" id="1tzntNA9VKl" role="23t8la">
-                    <node concept="3clFbS" id="1tzntNA9VKm" role="1bW5cS">
-                      <node concept="3clFbF" id="1tzntNAa0vT" role="3cqZAp">
-                        <node concept="2OqwBi" id="1tzntNAa4XI" role="3clFbG">
-                          <node concept="37vLTw" id="1tzntNAa0vS" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1tzntNA8OZc" resolve="invalidatedSet" />
-                          </node>
-                          <node concept="3JPx81" id="1tzntNAaac9" role="2OqNvi">
-                            <node concept="37vLTw" id="1tzntNAaeJF" role="25WWJ7">
-                              <ref role="3cqZAo" node="6E5fMGvfKS4" resolve="it" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="gl6BB" id="6E5fMGvfKS4" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6E5fMGvfKS5" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3eNFk2" id="6DQTzHy8HgM" role="3eNLev">
-                <node concept="3clFbS" id="6DQTzHy8HgO" role="3eOfB_">
-                  <node concept="3clFbF" id="6DQTzHy90dK" role="3cqZAp">
-                    <node concept="2OqwBi" id="6DQTzHy90dL" role="3clFbG">
-                      <node concept="37vLTw" id="6DQTzHy90dM" role="2Oq$k0">
-                        <ref role="3cqZAo" node="55xYlrm3Cak" resolve="itr" />
-                      </node>
-                      <node concept="2YMH90" id="6DQTzHy90dN" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="6DQTzHy8LOJ" role="3eO9$A">
-                  <node concept="1eOMI4" id="6DQTzHy8LOK" role="2Oq$k0">
-                    <node concept="2OqwBi" id="6DQTzHy8LOL" role="1eOMHV">
-                      <node concept="37vLTw" id="6DQTzHy8LOM" role="2Oq$k0">
-                        <ref role="3cqZAo" node="55xYlrm4eoX" resolve="item" />
-                      </node>
-                      <node concept="liA8E" id="6DQTzHy8LON" role="2OqNvi">
-                        <ref role="37wK5l" to="hano:55xYlrlZupy" resolve="getFeedbackBasis" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2HxqBE" id="6DQTzHy8QOu" role="2OqNvi">
-                    <node concept="1bVj0M" id="6DQTzHy8QOw" role="23t8la">
-                      <node concept="3clFbS" id="6DQTzHy8QOx" role="1bW5cS">
-                        <node concept="3clFbF" id="6DQTzHy8QOy" role="3cqZAp">
-                          <node concept="2OqwBi" id="6DQTzHy8QOz" role="3clFbG">
-                            <node concept="37vLTw" id="6DQTzHy8W35" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6DQTzHy8jIk" resolve="validatedSet" />
-                            </node>
-                            <node concept="3JPx81" id="6DQTzHy8QO_" role="2OqNvi">
-                              <node concept="37vLTw" id="6DQTzHy8QOA" role="25WWJ7">
-                                <ref role="3cqZAo" node="6E5fMGvfKS6" resolve="it" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="gl6BB" id="6E5fMGvfKS6" role="1bW2Oz">
-                        <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6E5fMGvfKS7" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="55xYlrm3WJr" role="2$JKZa">
-            <node concept="37vLTw" id="55xYlrm3WJs" role="2Oq$k0">
-              <ref role="3cqZAo" node="55xYlrm3Cak" resolve="itr" />
-            </node>
-            <node concept="v0PNk" id="55xYlrm3WJt" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1RYTbd8yeWc" role="jymVt" />
-    <node concept="3clFb_" id="9dktABHyKF" role="jymVt">
-      <property role="TrG5h" value="addReportItems" />
-      <node concept="3Tmbuc" id="1RYTbd8yjvV" role="1B3o_S" />
-      <node concept="3clFbS" id="9dktABHyKK" role="3clF47">
-        <node concept="1DcWWT" id="5Qx6_659TBk" role="3cqZAp">
-          <node concept="3clFbS" id="5Qx6_659TBn" role="2LFqv$">
-            <node concept="3clFbF" id="5Qx6_659U4$" role="3cqZAp">
-              <node concept="1rXfSq" id="5Qx6_659U4z" role="3clFbG">
-                <ref role="37wK5l" node="3yEb0I3WCjJ" resolve="addReportItem" />
-                <node concept="37vLTw" id="5Qx6_659UfK" role="37wK5m">
-                  <ref role="3cqZAo" node="5Qx6_659TBo" resolve="it" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="5Qx6_659TBo" role="1Duv9x">
-            <property role="TrG5h" value="it" />
-            <node concept="3uibUv" id="5Qx6_659TBs" role="1tU5fm">
-              <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-            </node>
-          </node>
-          <node concept="37vLTw" id="5Qx6_659TBt" role="1DdaDG">
-            <ref role="3cqZAo" node="9dktABHGeF" resolve="items" />
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="9dktABHyKL" role="3clF45" />
-      <node concept="37vLTG" id="9dktABHGeF" role="3clF46">
-        <property role="TrG5h" value="items" />
-        <node concept="A3Dl8" id="9dktABHGeD" role="1tU5fm">
-          <node concept="3qUE_q" id="WJTIIp2b5Y" role="A3Ik2">
-            <node concept="3uibUv" id="WJTIIp2bRp" role="3qUE_r">
-              <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3yEb0I3SVca" role="jymVt" />
-    <node concept="3clFb_" id="3yEb0I3WCjJ" role="jymVt">
-      <property role="TrG5h" value="addReportItem" />
-      <node concept="3Tmbuc" id="1z4$59jjQI7" role="1B3o_S" />
-      <node concept="3clFbS" id="3yEb0I3WCjL" role="3clF47">
-        <node concept="3clFbJ" id="5Qx6_659UzK" role="3cqZAp">
-          <node concept="3clFbS" id="5Qx6_659UzM" role="3clFbx">
-            <node concept="3cpWs8" id="5Qx6_659VvF" role="3cqZAp">
-              <node concept="3cpWsn" id="5Qx6_659VvG" role="3cpWs9">
-                <property role="TrG5h" value="fbReportItem" />
-                <node concept="3uibUv" id="1XMs8FbY54j" role="1tU5fm">
-                  <ref role="3uigEE" to="hano:1FOQehwovmW" resolve="FeedbackReportItem" />
-                </node>
-                <node concept="1eOMI4" id="5Qx6_659VvH" role="33vP2m">
-                  <node concept="10QFUN" id="5Qx6_659VvI" role="1eOMHV">
-                    <node concept="3uibUv" id="1XMs8FbY6qw" role="10QFUM">
-                      <ref role="3uigEE" to="hano:1FOQehwovmW" resolve="FeedbackReportItem" />
-                    </node>
-                    <node concept="37vLTw" id="5Qx6_659VvK" role="10QFUP">
-                      <ref role="3cqZAo" node="3yEb0I3WCjS" resolve="ri" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="55xYlrm11ju" role="3cqZAp">
-              <node concept="2OqwBi" id="55xYlrm15g5" role="3clFbG">
-                <node concept="37vLTw" id="55xYlrm11js" role="2Oq$k0">
-                  <ref role="3cqZAo" node="55xYlrlYSeQ" resolve="feedbackReportItems" />
-                </node>
-                <node concept="TSZUe" id="55xYlrm1adu" role="2OqNvi">
-                  <node concept="37vLTw" id="55xYlrm1esv" role="25WWJ7">
-                    <ref role="3cqZAo" node="5Qx6_659VvG" resolve="tri" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="5Qx6_659UYL" role="3cqZAp" />
-          </node>
-          <node concept="2ZW3vV" id="5Qx6_659UNc" role="3clFbw">
-            <node concept="3uibUv" id="1XMs8FbY4OE" role="2ZW6by">
-              <ref role="3uigEE" to="hano:1FOQehwovmW" resolve="FeedbackReportItem" />
-            </node>
-            <node concept="37vLTw" id="5Qx6_659UAK" role="2ZW6bz">
-              <ref role="3cqZAo" node="3yEb0I3WCjS" resolve="ri" />
-            </node>
-          </node>
-          <node concept="9aQIb" id="5Qx6_659VJ$" role="9aQIa">
-            <node concept="3clFbS" id="5Qx6_659VJ_" role="9aQI4">
-              <node concept="3clFbF" id="3yEb0I3WCjM" role="3cqZAp">
-                <node concept="2OqwBi" id="3yEb0I3WCjN" role="3clFbG">
-                  <node concept="37vLTw" id="3yEb0I3WCjO" role="2Oq$k0">
-                    <ref role="3cqZAo" node="9dktABNSdT" resolve="auxReportItems" />
-                  </node>
-                  <node concept="TSZUe" id="3yEb0I3WJXl" role="2OqNvi">
-                    <node concept="37vLTw" id="3yEb0I3WJXn" role="25WWJ7">
-                      <ref role="3cqZAo" node="3yEb0I3WCjS" resolve="ri" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="3yEb0I3WCjR" role="3clF45" />
-      <node concept="37vLTG" id="3yEb0I3WCjS" role="3clF46">
-        <property role="TrG5h" value="reportItem" />
-        <node concept="3uibUv" id="3yEb0I3WI$k" role="1tU5fm">
-          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1RYTbd8z5Fo" role="jymVt" />
-    <node concept="3clFb_" id="1z4$59j_T$f" role="jymVt">
-      <property role="TrG5h" value="putConvertsTo" />
-      <node concept="37vLTG" id="1z4$59j_T$g" role="3clF46">
-        <property role="TrG5h" value="source" />
-        <node concept="3Tqbb2" id="1z4$59j_T$h" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1z4$59j_T$i" role="3clF46">
-        <property role="TrG5h" value="target" />
-        <node concept="3Tqbb2" id="1z4$59j_T$j" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="3FEFhOSMRSr" role="3clF46">
-        <property role="TrG5h" value="strong" />
-        <node concept="10P_77" id="3FEFhOSMXvZ" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1z4$59jArJv" role="3clF46">
-        <property role="TrG5h" value="value" />
-        <node concept="3uibUv" id="1z4$59jAvh0" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="1z4$59jAb$4" role="3clF45" />
-      <node concept="3Tmbuc" id="1z4$59jA5CB" role="1B3o_S" />
-      <node concept="3clFbS" id="1z4$59j_T$m" role="3clF47">
-        <node concept="3cpWs8" id="1z4$59j_T$n" role="3cqZAp">
-          <node concept="3cpWsn" id="1z4$59j_T$o" role="3cpWs9">
-            <property role="TrG5h" value="map" />
-            <node concept="3uibUv" id="1z4$59j_T$p" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-              <node concept="3uibUv" id="1z4$59j_T$q" role="11_B2D">
-                <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-              </node>
-              <node concept="3uibUv" id="1z4$59j_T$r" role="11_B2D">
-                <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="1z4$59j_T$s" role="33vP2m">
-              <node concept="37vLTw" id="1z4$59j_T$t" role="2Oq$k0">
-                <ref role="3cqZAo" node="1z4$59jbqu2" resolve="convertsToCache" />
-              </node>
-              <node concept="liA8E" id="1z4$59j_T$u" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Map.computeIfAbsent(java.lang.Object,java.util.function.Function)" resolve="computeIfAbsent" />
-                <node concept="2ShNRf" id="1z4$59j_T$v" role="37wK5m">
-                  <node concept="1pGfFk" id="1z4$59j_T$w" role="2ShVmc">
-                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                    <node concept="37vLTw" id="1z4$59j_T$x" role="37wK5m">
-                      <ref role="3cqZAo" node="1z4$59j_T$g" resolve="source" />
-                    </node>
-                    <node concept="37vLTw" id="3FEFhOSNdMP" role="37wK5m">
-                      <ref role="3cqZAo" node="3FEFhOSMRSr" resolve="strong" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="1bVj0M" id="1z4$59jAITP" role="37wK5m">
-                  <node concept="3clFbS" id="1z4$59jAITR" role="1bW5cS">
-                    <node concept="3clFbF" id="1z4$59jBkHv" role="3cqZAp">
-                      <node concept="2ShNRf" id="1z4$59jBkHx" role="3clFbG">
-                        <node concept="1pGfFk" id="1z4$59jBkHy" role="2ShVmc">
-                          <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
-                          <node concept="3uibUv" id="1z4$59jBqNC" role="1pMfVU">
-                            <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                          </node>
-                          <node concept="3uibUv" id="1z4$59jBkH$" role="1pMfVU">
-                            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="1z4$59jBPhN" role="3cqZAp" />
-                  </node>
-                  <node concept="37vLTG" id="1z4$59jAOZA" role="1bW2Oz">
-                    <property role="TrG5h" value="k" />
-                    <node concept="3uibUv" id="1z4$59jBHWz" role="1tU5fm">
-                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1z4$59jBU6z" role="3cqZAp">
-          <node concept="2OqwBi" id="1z4$59jBZbE" role="3clFbG">
-            <node concept="37vLTw" id="1z4$59jBU6x" role="2Oq$k0">
-              <ref role="3cqZAo" node="1z4$59j_T$o" resolve="map" />
-            </node>
-            <node concept="liA8E" id="1z4$59jC17z" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
-              <node concept="2ShNRf" id="1z4$59jC3ch" role="37wK5m">
-                <node concept="1pGfFk" id="1z4$59jC3ci" role="2ShVmc">
-                  <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                  <node concept="37vLTw" id="1z4$59jC3cj" role="37wK5m">
-                    <ref role="3cqZAo" node="1z4$59j_T$i" resolve="target" />
-                  </node>
-                  <node concept="37vLTw" id="3FEFhOSNnqc" role="37wK5m">
-                    <ref role="3cqZAo" node="3FEFhOSMRSr" resolve="strong" />
-                  </node>
-                </node>
-              </node>
-              <node concept="37vLTw" id="1z4$59jC4cd" role="37wK5m">
-                <ref role="3cqZAo" node="1z4$59jArJv" resolve="value" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1z4$59j_T$L" role="jymVt" />
-    <node concept="3clFb_" id="1z4$59j_T$M" role="jymVt">
-      <property role="TrG5h" value="putCoerceToConcept" />
-      <node concept="37vLTG" id="1z4$59j_T$N" role="3clF46">
-        <property role="TrG5h" value="source" />
-        <node concept="3Tqbb2" id="1z4$59j_T$O" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1z4$59j_T$P" role="3clF46">
-        <property role="TrG5h" value="targetConcept" />
-        <node concept="3bZ5Sz" id="1z4$59j_T$Q" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="3FEFhOSNwFV" role="3clF46">
-        <property role="TrG5h" value="strong" />
-        <node concept="10P_77" id="3FEFhOSN_$w" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1z4$59jCDvg" role="3clF46">
-        <property role="TrG5h" value="value" />
-        <node concept="3uibUv" id="1z4$59j_T$R" role="1tU5fm">
-          <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-          <node concept="3uibUv" id="1z4$59j_T$S" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-          </node>
-          <node concept="3Tqbb2" id="1z4$59j_T$T" role="11_B2D" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1z4$59jCu0p" role="1B3o_S" />
-      <node concept="3clFbS" id="1z4$59j_T$V" role="3clF47">
-        <node concept="3cpWs8" id="1z4$59j_T$W" role="3cqZAp">
-          <node concept="3cpWsn" id="1z4$59j_T$X" role="3cpWs9">
-            <property role="TrG5h" value="map" />
-            <node concept="3uibUv" id="1z4$59j_T$Y" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-              <node concept="3bZ5Sz" id="1z4$59j_T$Z" role="11_B2D" />
-              <node concept="3uibUv" id="1z4$59j_T_0" role="11_B2D">
-                <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                <node concept="3uibUv" id="1z4$59j_T_1" role="11_B2D">
-                  <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                </node>
-                <node concept="3Tqbb2" id="1z4$59j_T_2" role="11_B2D" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="1z4$59j_T_3" role="33vP2m">
-              <node concept="37vLTw" id="1z4$59j_T_4" role="2Oq$k0">
-                <ref role="3cqZAo" node="1z4$59jbquf" resolve="coerceToConceptCache" />
-              </node>
-              <node concept="liA8E" id="1z4$59jD9Dj" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Map.computeIfAbsent(java.lang.Object,java.util.function.Function)" resolve="computeIfAbsent" />
-                <node concept="2ShNRf" id="1z4$59j_T_6" role="37wK5m">
-                  <node concept="1pGfFk" id="1z4$59j_T_7" role="2ShVmc">
-                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                    <node concept="37vLTw" id="1z4$59j_T_8" role="37wK5m">
-                      <ref role="3cqZAo" node="1z4$59j_T$N" resolve="source" />
-                    </node>
-                    <node concept="37vLTw" id="3FEFhOSNJP$" role="37wK5m">
-                      <ref role="3cqZAo" node="3FEFhOSNwFV" resolve="strong" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="1bVj0M" id="1z4$59jDdd8" role="37wK5m">
-                  <node concept="3clFbS" id="1z4$59jDdda" role="1bW5cS">
-                    <node concept="3clFbF" id="1z4$59jDfFG" role="3cqZAp">
-                      <node concept="2ShNRf" id="1z4$59jDfFI" role="3clFbG">
-                        <node concept="1pGfFk" id="1z4$59jDfFJ" role="2ShVmc">
-                          <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
-                          <node concept="3bZ5Sz" id="1z4$59jDfFK" role="1pMfVU" />
-                          <node concept="3uibUv" id="1z4$59jDfFL" role="1pMfVU">
-                            <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                            <node concept="3uibUv" id="1z4$59jDfFM" role="11_B2D">
-                              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                            </node>
-                            <node concept="3Tqbb2" id="1z4$59jDfFN" role="11_B2D" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="1z4$59jDh2B" role="3cqZAp" />
-                  </node>
-                  <node concept="37vLTG" id="1z4$59jDdNd" role="1bW2Oz">
-                    <property role="TrG5h" value="k" />
-                    <node concept="3uibUv" id="1z4$59jDegB" role="1tU5fm">
-                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1z4$59jDnEs" role="3cqZAp">
-          <node concept="2OqwBi" id="1z4$59jDsfM" role="3clFbG">
-            <node concept="37vLTw" id="1z4$59jDnEq" role="2Oq$k0">
-              <ref role="3cqZAo" node="1z4$59j_T$X" resolve="map" />
-            </node>
-            <node concept="liA8E" id="1z4$59jDv7q" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
-              <node concept="37vLTw" id="1z4$59jDxz3" role="37wK5m">
-                <ref role="3cqZAo" node="1z4$59j_T$P" resolve="targetConcept" />
-              </node>
-              <node concept="37vLTw" id="1z4$59jDyo0" role="37wK5m">
-                <ref role="3cqZAo" node="1z4$59jCDvg" resolve="value" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="1z4$59jC$0G" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="1z4$59j_Tg8" role="jymVt" />
-    <node concept="3clFb_" id="1RYTbd7Wq1N" role="jymVt">
-      <property role="TrG5h" value="putCoerceTo" />
-      <node concept="37vLTG" id="1RYTbd7Wq1O" role="3clF46">
-        <property role="TrG5h" value="source" />
-        <node concept="3Tqbb2" id="1RYTbd7Wq1P" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1RYTbd7Wq1Q" role="3clF46">
-        <property role="TrG5h" value="target" />
-        <node concept="3Tqbb2" id="1RYTbd7WA2b" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="3FEFhOSNP6e" role="3clF46">
-        <property role="TrG5h" value="strong" />
-        <node concept="10P_77" id="3FEFhOSNUIF" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1RYTbd7Wq1S" role="3clF46">
-        <property role="TrG5h" value="value" />
-        <node concept="3uibUv" id="1RYTbd7Wq1T" role="1tU5fm">
-          <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-          <node concept="3uibUv" id="1RYTbd7Wq1U" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-          </node>
-          <node concept="3Tqbb2" id="1RYTbd7Wq1V" role="11_B2D" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1RYTbd7Wq1W" role="1B3o_S" />
-      <node concept="3clFbS" id="1RYTbd7Wq1X" role="3clF47">
-        <node concept="3cpWs8" id="1RYTbd7Wq1Y" role="3cqZAp">
-          <node concept="3cpWsn" id="1RYTbd7Wq1Z" role="3cpWs9">
-            <property role="TrG5h" value="map" />
-            <node concept="3uibUv" id="1RYTbd7Wq20" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-              <node concept="3uibUv" id="1RYTbd7WD52" role="11_B2D">
-                <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-              </node>
-              <node concept="3uibUv" id="1RYTbd7Wq22" role="11_B2D">
-                <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                <node concept="3uibUv" id="1RYTbd7Wq23" role="11_B2D">
-                  <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                </node>
-                <node concept="3Tqbb2" id="1RYTbd7Wq24" role="11_B2D" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="1RYTbd7Wq25" role="33vP2m">
-              <node concept="37vLTw" id="1RYTbd7WB1d" role="2Oq$k0">
-                <ref role="3cqZAo" node="1RYTbd7W1Xa" resolve="coerceToCache" />
-              </node>
-              <node concept="liA8E" id="1RYTbd7Wq27" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Map.computeIfAbsent(java.lang.Object,java.util.function.Function)" resolve="computeIfAbsent" />
-                <node concept="2ShNRf" id="1RYTbd7Wq28" role="37wK5m">
-                  <node concept="1pGfFk" id="1RYTbd7Wq29" role="2ShVmc">
-                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                    <node concept="37vLTw" id="1RYTbd7Wq2a" role="37wK5m">
-                      <ref role="3cqZAo" node="1RYTbd7Wq1O" resolve="source" />
-                    </node>
-                    <node concept="37vLTw" id="3FEFhOSO9cB" role="37wK5m">
-                      <ref role="3cqZAo" node="3FEFhOSNP6e" resolve="strong" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="1bVj0M" id="1RYTbd7Wq2b" role="37wK5m">
-                  <node concept="3clFbS" id="1RYTbd7Wq2c" role="1bW5cS">
-                    <node concept="3clFbF" id="1RYTbd7Wq2d" role="3cqZAp">
-                      <node concept="2ShNRf" id="1RYTbd7Wq2e" role="3clFbG">
-                        <node concept="1pGfFk" id="1RYTbd7Wq2f" role="2ShVmc">
-                          <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
-                          <node concept="3uibUv" id="1RYTbd7WCaL" role="1pMfVU">
-                            <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                          </node>
-                          <node concept="3uibUv" id="1RYTbd7Wq2h" role="1pMfVU">
-                            <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                            <node concept="3uibUv" id="1RYTbd7Wq2i" role="11_B2D">
-                              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                            </node>
-                            <node concept="3Tqbb2" id="1RYTbd7Wq2j" role="11_B2D" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="1RYTbd7Wq2k" role="3cqZAp" />
-                  </node>
-                  <node concept="37vLTG" id="1RYTbd7Wq2l" role="1bW2Oz">
-                    <property role="TrG5h" value="k" />
-                    <node concept="3uibUv" id="1RYTbd7Wq2m" role="1tU5fm">
-                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1RYTbd7Wq2n" role="3cqZAp">
-          <node concept="2OqwBi" id="1RYTbd7Wq2o" role="3clFbG">
-            <node concept="37vLTw" id="1RYTbd7Wq2p" role="2Oq$k0">
-              <ref role="3cqZAo" node="1RYTbd7Wq1Z" resolve="map" />
-            </node>
-            <node concept="liA8E" id="1RYTbd7Wq2q" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
-              <node concept="2ShNRf" id="1RYTbd7WE3l" role="37wK5m">
-                <node concept="1pGfFk" id="1RYTbd7WFCj" role="2ShVmc">
-                  <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                  <node concept="37vLTw" id="1RYTbd7WFNi" role="37wK5m">
-                    <ref role="3cqZAo" node="1RYTbd7Wq1Q" resolve="target" />
-                  </node>
-                  <node concept="37vLTw" id="3FEFhOSOjEd" role="37wK5m">
-                    <ref role="3cqZAo" node="3FEFhOSNP6e" resolve="strong" />
-                  </node>
-                </node>
-              </node>
-              <node concept="37vLTw" id="1RYTbd7Wq2s" role="37wK5m">
-                <ref role="3cqZAo" node="1RYTbd7Wq1S" resolve="value" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="1RYTbd7Wq2t" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="1RYTbd7Wq1M" role="jymVt" />
-    <node concept="3clFb_" id="6QH_LDtcxgE" role="jymVt">
-      <property role="TrG5h" value="clear" />
-      <node concept="3cqZAl" id="6QH_LDtcxgF" role="3clF45" />
-      <node concept="3Tmbuc" id="6$gg4kBx$Na" role="1B3o_S" />
-      <node concept="3clFbS" id="6QH_LDtcxgH" role="3clF47">
-        <node concept="3clFbF" id="6QH_LDtcPAS" role="3cqZAp">
-          <node concept="2OqwBi" id="6QH_LDtcPXw" role="3clFbG">
-            <node concept="37vLTw" id="6QH_LDtcPAQ" role="2Oq$k0">
-              <ref role="3cqZAo" node="6QH_LDtcJq4" resolve="typeNodes" />
-            </node>
-            <node concept="1yHZxX" id="6QH_LDtcQtN" role="2OqNvi" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="7gMIJIygifm" role="3cqZAp">
-          <node concept="2OqwBi" id="7gMIJIygjyZ" role="3clFbG">
-            <node concept="37vLTw" id="7gMIJIygifk" role="2Oq$k0">
-              <ref role="3cqZAo" node="9dktABNSdT" resolve="auxReportItems" />
-            </node>
-            <node concept="2Kehj3" id="7gMIJIygkoY" role="2OqNvi" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="1z4$59jmFIT" role="3cqZAp">
-          <node concept="2OqwBi" id="1z4$59jmFIU" role="3clFbG">
-            <node concept="37vLTw" id="1z4$59jmFIV" role="2Oq$k0">
-              <ref role="3cqZAo" node="1z4$59jbqu2" resolve="convertsToCache" />
-            </node>
-            <node concept="liA8E" id="1z4$59jmFIW" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.clear()" resolve="clear" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1z4$59jmFIX" role="3cqZAp">
-          <node concept="2OqwBi" id="1z4$59jmFIY" role="3clFbG">
-            <node concept="37vLTw" id="1z4$59jmFIZ" role="2Oq$k0">
-              <ref role="3cqZAo" node="1z4$59jbquf" resolve="coerceToConceptCache" />
-            </node>
-            <node concept="liA8E" id="1z4$59jmFJ0" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.clear()" resolve="clear" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1RYTbd7Wcwv" role="3cqZAp">
-          <node concept="2OqwBi" id="1RYTbd7Wcww" role="3clFbG">
-            <node concept="37vLTw" id="1RYTbd7Wenf" role="2Oq$k0">
-              <ref role="3cqZAo" node="1RYTbd7W1Xa" resolve="coerceToCache" />
-            </node>
-            <node concept="liA8E" id="1RYTbd7Wcwy" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.clear()" resolve="clear" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="357z3MC8kBC" role="jymVt" />
-    <node concept="312cEg" id="6QH_LDtcJq4" role="jymVt">
-      <property role="TrG5h" value="typeNodes" />
-      <node concept="3Tm6S6" id="6QH_LDtcJq5" role="1B3o_S" />
-      <node concept="3rvAFt" id="6QH_LDtcKFO" role="1tU5fm">
-        <node concept="2sp9CU" id="4ZGicUZao_b" role="3rvQeY" />
-        <node concept="3Tqbb2" id="6QH_LDtcNj4" role="3rvSg0" />
-      </node>
-      <node concept="2ShNRf" id="6QH_LDtcNmE" role="33vP2m">
-        <node concept="3rGOSV" id="6QH_LDtcNl_" role="2ShVmc">
-          <node concept="2sp9CU" id="4ZGicUZaoVg" role="3rHrn6" />
-          <node concept="3Tqbb2" id="6QH_LDtcNlB" role="3rHtpV" />
-        </node>
-      </node>
-    </node>
-    <node concept="3Tm1VV" id="6QH_LDtcxh4" role="1B3o_S" />
-    <node concept="312cEg" id="9dktABNSdT" role="jymVt">
-      <property role="TrG5h" value="auxReportItems" />
-      <node concept="3Tm6S6" id="9dktABNSdU" role="1B3o_S" />
-      <node concept="_YKpA" id="9dktABNYb_" role="1tU5fm">
-        <node concept="3uibUv" id="9dktABNYgf" role="_ZDj9">
-          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="9dktABNY_8" role="33vP2m">
-        <node concept="Tc6Ow" id="9dktABNY$6" role="2ShVmc">
-          <node concept="3uibUv" id="9dktABNY$7" role="HW$YZ">
-            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="312cEg" id="55xYlrlYSeQ" role="jymVt">
-      <property role="TrG5h" value="feedbackReportItems" />
-      <node concept="3Tm6S6" id="55xYlrlYSeR" role="1B3o_S" />
-      <node concept="_YKpA" id="55xYlrm0KfP" role="1tU5fm">
-        <node concept="3uibUv" id="55xYlrm0VFU" role="_ZDj9">
-          <ref role="3uigEE" to="hano:1FOQehwovmW" resolve="FeedbackReportItem" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="55xYlrlZ6Mj" role="33vP2m">
-        <node concept="Tc6Ow" id="55xYlrm0Y_K" role="2ShVmc">
-          <node concept="3uibUv" id="55xYlrm10G4" role="HW$YZ">
-            <ref role="3uigEE" to="hano:1FOQehwovmW" resolve="FeedbackReportItem" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="312cEg" id="1DIG_2lNsYk" role="jymVt">
-      <property role="TrG5h" value="invalidFeedbackKeys" />
-      <node concept="3Tm6S6" id="1DIG_2lNnYK" role="1B3o_S" />
-      <node concept="3vKaQO" id="1DIG_2lNr2_" role="1tU5fm">
-        <node concept="3uibUv" id="1DIG_2lNs3s" role="3O5elw">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="1DIG_2lNwQc" role="33vP2m">
-        <node concept="2i4dXS" id="1DIG_2lNyPb" role="2ShVmc">
-          <node concept="3uibUv" id="1DIG_2lN$1p" role="HW$YZ">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="312cEg" id="1z4$59jbqu2" role="jymVt">
-      <property role="TrG5h" value="convertsToCache" />
-      <node concept="3Tm6S6" id="1z4$59jbqu3" role="1B3o_S" />
-      <node concept="3uibUv" id="1z4$59jbqu4" role="1tU5fm">
-        <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-        <node concept="3uibUv" id="1z4$59jbqu5" role="11_B2D">
-          <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-        </node>
-        <node concept="3uibUv" id="1z4$59jbqu6" role="11_B2D">
-          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-          <node concept="3uibUv" id="1z4$59jbqu7" role="11_B2D">
-            <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-          </node>
-          <node concept="3uibUv" id="1z4$59jbqu8" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-          </node>
-        </node>
-      </node>
-      <node concept="2ShNRf" id="1z4$59jbqu9" role="33vP2m">
-        <node concept="1pGfFk" id="1z4$59jbqua" role="2ShVmc">
-          <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
-          <node concept="3uibUv" id="1z4$59jbqub" role="1pMfVU">
-            <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-          </node>
-          <node concept="3uibUv" id="1z4$59jbquc" role="1pMfVU">
-            <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-            <node concept="3uibUv" id="1z4$59jbqud" role="11_B2D">
-              <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-            </node>
-            <node concept="3uibUv" id="1z4$59jbque" role="11_B2D">
-              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="312cEg" id="1z4$59jbquf" role="jymVt">
-      <property role="TrG5h" value="coerceToConceptCache" />
-      <node concept="3Tm6S6" id="1z4$59jbqug" role="1B3o_S" />
-      <node concept="3uibUv" id="1z4$59jbquh" role="1tU5fm">
-        <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-        <node concept="3uibUv" id="1z4$59jbqui" role="11_B2D">
-          <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-        </node>
-        <node concept="3uibUv" id="1z4$59jbquj" role="11_B2D">
-          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-          <node concept="3bZ5Sz" id="1z4$59jbquk" role="11_B2D" />
-          <node concept="3uibUv" id="1z4$59jbqul" role="11_B2D">
-            <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-            <node concept="3uibUv" id="1z4$59jbqum" role="11_B2D">
-              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-            </node>
-            <node concept="3Tqbb2" id="1z4$59jbqun" role="11_B2D" />
-          </node>
-        </node>
-      </node>
-      <node concept="2ShNRf" id="1z4$59jbquo" role="33vP2m">
-        <node concept="1pGfFk" id="1z4$59jbqup" role="2ShVmc">
-          <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
-          <node concept="3uibUv" id="1z4$59jbquq" role="1pMfVU">
-            <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-          </node>
-          <node concept="3uibUv" id="1z4$59jbqur" role="1pMfVU">
-            <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-            <node concept="3bZ5Sz" id="1z4$59jbqus" role="11_B2D" />
-            <node concept="3uibUv" id="1z4$59jbqut" role="11_B2D">
-              <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-              <node concept="3uibUv" id="1z4$59jbquu" role="11_B2D">
-                <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-              </node>
-              <node concept="3Tqbb2" id="1z4$59jbquv" role="11_B2D" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="312cEg" id="1RYTbd7W1Xa" role="jymVt">
-      <property role="TrG5h" value="coerceToCache" />
-      <node concept="3Tm6S6" id="1RYTbd7W1Xb" role="1B3o_S" />
-      <node concept="3uibUv" id="1RYTbd7W1Xc" role="1tU5fm">
-        <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-        <node concept="3uibUv" id="1RYTbd7W1Xd" role="11_B2D">
-          <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-        </node>
-        <node concept="3uibUv" id="1RYTbd7W1Xe" role="11_B2D">
-          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-          <node concept="3uibUv" id="1RYTbd7WfcT" role="11_B2D">
-            <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-          </node>
-          <node concept="3uibUv" id="1RYTbd7W1Xg" role="11_B2D">
-            <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-            <node concept="3uibUv" id="1RYTbd7W1Xh" role="11_B2D">
-              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-            </node>
-            <node concept="3Tqbb2" id="1RYTbd7W1Xi" role="11_B2D" />
-          </node>
-        </node>
-      </node>
-      <node concept="2ShNRf" id="1RYTbd7W1Xj" role="33vP2m">
-        <node concept="1pGfFk" id="1RYTbd7W1Xk" role="2ShVmc">
-          <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
-          <node concept="3uibUv" id="1RYTbd7W1Xl" role="1pMfVU">
-            <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-          </node>
-          <node concept="3uibUv" id="1RYTbd7W1Xm" role="1pMfVU">
-            <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-            <node concept="3uibUv" id="1RYTbd7WfQC" role="11_B2D">
-              <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-            </node>
-            <node concept="3uibUv" id="1RYTbd7W1Xo" role="11_B2D">
-              <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-              <node concept="3uibUv" id="1RYTbd7W1Xp" role="11_B2D">
-                <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-              </node>
-              <node concept="3Tqbb2" id="1RYTbd7W1Xq" role="11_B2D" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3UR2Jj" id="6$gg4kB0QnP" role="lGtFl">
-      <node concept="TZ5HA" id="6$gg4kB0QnQ" role="TZ5H$">
-        <node concept="1dT_AC" id="6$gg4kB0QnR" role="1dT_Ay">
-          <property role="1dT_AB" value="Index of types that are stored in a specially constructed temporary model." />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="6$gg4kB5HHa" role="TZ5H$">
-        <node concept="1dT_AC" id="6$gg4kB5HHb" role="1dT_Ay">
-          <property role="1dT_AB" value="The models used here require no write access to be updated." />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="6$gg4kB5Yln" role="TZ5H$">
-        <node concept="1dT_AC" id="6$gg4kB5Ylo" role="1dT_Ay">
-          <property role="1dT_AB" value="They are also completely silent." />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="9dktABH5NW" role="TZ5H$">
-        <node concept="1dT_AC" id="9dktABH5NX" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="9dktABH5Pf" role="TZ5H$">
-        <node concept="1dT_AC" id="9dktABH5Pg" role="1dT_Ay">
-          <property role="1dT_AB" value="Additionally keep the list of issues reported while type checking." />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="62kWyaxSWY2" role="TZ5H$">
-        <node concept="1dT_AC" id="62kWyaxSWY3" role="1dT_Ay">
-          <property role="1dT_AB" value="" />
-        </node>
-      </node>
-      <node concept="TZ5HA" id="62kWyaxSWYc" role="TZ5H$">
-        <node concept="1dT_AC" id="62kWyaxSWYd" role="1dT_Ay">
-          <property role="1dT_AB" value="FIXME: ensure all public operations are thread-safe." />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1z4$59jkFLL" role="jymVt" />
-    <node concept="312cEu" id="1z4$59jbqsu" role="jymVt">
-      <property role="TrG5h" value="MatchSNodeWrapper" />
-      <node concept="2tJIrI" id="1z4$59jbqsv" role="jymVt" />
-      <node concept="3clFbW" id="1z4$59jbqsw" role="jymVt">
-        <node concept="3cqZAl" id="1z4$59jbqsx" role="3clF45" />
-        <node concept="3Tm1VV" id="1z4$59jbqsy" role="1B3o_S" />
-        <node concept="3clFbS" id="1z4$59jbqsz" role="3clF47">
-          <node concept="3clFbJ" id="1z4$59jbqs$" role="3cqZAp">
-            <node concept="3clFbS" id="1z4$59jbqs_" role="3clFbx">
-              <node concept="YS8fn" id="1z4$59jbqsA" role="3cqZAp">
-                <node concept="2ShNRf" id="1z4$59jbqsB" role="YScLw">
-                  <node concept="1pGfFk" id="1z4$59jbqsC" role="2ShVmc">
-                    <ref role="37wK5l" to="wyt6:~NullPointerException.&lt;init&gt;()" resolve="NullPointerException" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbC" id="1z4$59jbqsD" role="3clFbw">
-              <node concept="10Nm6u" id="1z4$59jbqsE" role="3uHU7w" />
-              <node concept="37vLTw" id="1z4$59jbqsF" role="3uHU7B">
-                <ref role="3cqZAo" node="1z4$59jbqsT" resolve="wrapped" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="1z4$59jbqsG" role="3cqZAp">
-            <node concept="37vLTI" id="1z4$59jbqsH" role="3clFbG">
-              <node concept="2OqwBi" id="1z4$59jbqsI" role="37vLTJ">
-                <node concept="Xjq3P" id="1z4$59jbqsJ" role="2Oq$k0" />
-                <node concept="2OwXpG" id="1z4$59jbqsK" role="2OqNvi">
-                  <ref role="2Oxat5" node="1z4$59jbqtG" resolve="wrapped" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="1z4$59jbqsL" role="37vLTx">
-                <ref role="3cqZAo" node="1z4$59jbqsT" resolve="wrapped" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="3FEFhOSKJFk" role="3cqZAp">
-            <node concept="37vLTI" id="3FEFhOSKJFm" role="3clFbG">
-              <node concept="2OqwBi" id="3FEFhOSKO0w" role="37vLTJ">
-                <node concept="Xjq3P" id="3FEFhOSKS4v" role="2Oq$k0" />
-                <node concept="2OwXpG" id="3FEFhOSKO0z" role="2OqNvi">
-                  <ref role="2Oxat5" node="3FEFhOSKJFg" resolve="strong" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="3FEFhOSKJFq" role="37vLTx">
-                <ref role="3cqZAo" node="3FEFhOSKovP" resolve="strong" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="5Hi6MebqBVI" role="3cqZAp">
-            <node concept="37vLTI" id="5Hi6MebqBVJ" role="3clFbG">
-              <node concept="2OqwBi" id="5Hi6MebqBVK" role="37vLTJ">
-                <node concept="Xjq3P" id="5Hi6MebqBVL" role="2Oq$k0" />
-                <node concept="2OwXpG" id="5Hi6MebqBVM" role="2OqNvi">
-                  <ref role="2Oxat5" node="1z4$59jbqtC" resolve="hash" />
-                </node>
-              </node>
-              <node concept="17qRlL" id="5Hi6MebqBVN" role="37vLTx">
-                <node concept="1eOMI4" id="5Hi6MebqBVO" role="3uHU7w">
-                  <node concept="3K4zz7" id="5Hi6MebqBVP" role="1eOMHV">
-                    <node concept="3cmrfG" id="5Hi6MebqBVQ" role="3K4E3e">
-                      <property role="3cmrfH" value="17" />
-                    </node>
-                    <node concept="3cmrfG" id="5Hi6MebqBVR" role="3K4GZi">
-                      <property role="3cmrfH" value="37" />
-                    </node>
-                    <node concept="37vLTw" id="5Hi6MebqBVS" role="3K4Cdx">
-                      <ref role="3cqZAo" node="3FEFhOSKovP" resolve="strong" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="5Hi6MebqTPm" role="3uHU7B">
-                  <node concept="10M0yZ" id="5Hi6MebqNQ6" role="2Oq$k0">
-                    <ref role="3cqZAo" to="w1kc:~SNodeHashStrategy.WholeTreeAndIgnoreAttributes" resolve="WholeTreeAndIgnoreAttributes" />
-                    <ref role="1PxDUh" to="w1kc:~SNodeHashStrategy" resolve="SNodeHashStrategy" />
-                  </node>
-                  <node concept="liA8E" id="5Hi6Mebr13I" role="2OqNvi">
-                    <ref role="37wK5l" to="w1kc:~SNodeHashStrategy.hash(org.jetbrains.mps.openapi.model.SNode)" resolve="hash" />
-                    <node concept="37vLTw" id="5Hi6Mebr6V8" role="37wK5m">
-                      <ref role="3cqZAo" node="1z4$59jbqsT" resolve="wrapped" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="37vLTG" id="1z4$59jbqsT" role="3clF46">
-          <property role="TrG5h" value="wrapped" />
-          <node concept="3Tqbb2" id="1z4$59jbqsU" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="3FEFhOSKovP" role="3clF46">
-          <property role="TrG5h" value="strong" />
-          <node concept="10P_77" id="3FEFhOSKuag" role="1tU5fm" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="1z4$59jbqsV" role="jymVt" />
-      <node concept="3clFb_" id="1z4$59jbqsW" role="jymVt">
-        <property role="TrG5h" value="equals" />
-        <node concept="3Tm1VV" id="1z4$59jbqsX" role="1B3o_S" />
-        <node concept="10P_77" id="1z4$59jbqsY" role="3clF45" />
-        <node concept="37vLTG" id="1z4$59jbqsZ" role="3clF46">
-          <property role="TrG5h" value="that" />
-          <node concept="3uibUv" id="1z4$59jbqt0" role="1tU5fm">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="1z4$59jbqt1" role="3clF47">
-          <node concept="3clFbJ" id="1z4$59jbqt2" role="3cqZAp">
-            <node concept="3clFbS" id="1z4$59jbqt3" role="3clFbx">
-              <node concept="3cpWs6" id="1z4$59jbqt4" role="3cqZAp">
-                <node concept="3clFbT" id="1z4$59jbqt5" role="3cqZAk" />
-              </node>
-            </node>
-            <node concept="3clFbC" id="1z4$59jbqt6" role="3clFbw">
-              <node concept="10Nm6u" id="1z4$59jbqt7" role="3uHU7w" />
-              <node concept="37vLTw" id="1z4$59jbqt8" role="3uHU7B">
-                <ref role="3cqZAo" node="1z4$59jbqsZ" resolve="that" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbJ" id="1z4$59jbqt9" role="3cqZAp">
-            <node concept="3clFbS" id="1z4$59jbqta" role="3clFbx">
-              <node concept="3cpWs6" id="1z4$59jbqtb" role="3cqZAp">
-                <node concept="3clFbT" id="1z4$59jbqtc" role="3cqZAk" />
-              </node>
-            </node>
-            <node concept="3fqX7Q" id="1z4$59jbqtd" role="3clFbw">
-              <node concept="2ZW3vV" id="1z4$59jbqte" role="3fr31v">
-                <node concept="3uibUv" id="1z4$59jbqtf" role="2ZW6by">
-                  <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                </node>
-                <node concept="37vLTw" id="1z4$59jbqtg" role="2ZW6bz">
-                  <ref role="3cqZAo" node="1z4$59jbqsZ" resolve="that" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs8" id="7Aoa2yUxAiB" role="3cqZAp">
-            <node concept="3cpWsn" id="7Aoa2yUxAiC" role="3cpWs9">
-              <property role="TrG5h" value="thisWrapped" />
-              <node concept="3Tqbb2" id="7Aoa2yUxyYL" role="1tU5fm" />
-              <node concept="2OqwBi" id="7Aoa2yUxAiD" role="33vP2m">
-                <node concept="Xjq3P" id="7Aoa2yUxAiE" role="2Oq$k0" />
-                <node concept="2OwXpG" id="7Aoa2yUxAiF" role="2OqNvi">
-                  <ref role="2Oxat5" node="1z4$59jbqtG" resolve="wrapped" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs8" id="7Aoa2yUxUiy" role="3cqZAp">
-            <node concept="3cpWsn" id="7Aoa2yUxUiz" role="3cpWs9">
-              <property role="TrG5h" value="thatWrapped" />
-              <node concept="3Tqbb2" id="7Aoa2yUxQUp" role="1tU5fm" />
-              <node concept="2OqwBi" id="7Aoa2yUxUi$" role="33vP2m">
-                <node concept="1eOMI4" id="7Aoa2yUxUi_" role="2Oq$k0">
-                  <node concept="10QFUN" id="7Aoa2yUxUiA" role="1eOMHV">
-                    <node concept="3uibUv" id="7Aoa2yUxUiB" role="10QFUM">
-                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                    </node>
-                    <node concept="37vLTw" id="7Aoa2yUxUiC" role="10QFUP">
-                      <ref role="3cqZAo" node="1z4$59jbqsZ" resolve="that" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="2OwXpG" id="7Aoa2yUxUiD" role="2OqNvi">
-                  <ref role="2Oxat5" node="1z4$59jbqtG" resolve="wrapped" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="7Aoa2yUuJjd" role="3cqZAp">
-            <node concept="1Wc70l" id="7Aoa2yUxi9U" role="3clFbG">
-              <node concept="1rXfSq" id="7Aoa2yUyi0l" role="3uHU7w">
-                <ref role="37wK5l" node="7Aoa2yUyucP" resolve="matchNodes" />
-                <node concept="37vLTw" id="7Aoa2yUyi0j" role="37wK5m">
-                  <ref role="3cqZAo" node="7Aoa2yUxAiC" resolve="thisWrapped" />
-                </node>
-                <node concept="37vLTw" id="7Aoa2yUyi0k" role="37wK5m">
-                  <ref role="3cqZAo" node="7Aoa2yUxUiz" resolve="thatWrapped" />
-                </node>
-              </node>
-              <node concept="3clFbC" id="7Aoa2yUxoht" role="3uHU7B">
-                <node concept="2OqwBi" id="7Aoa2yUxohu" role="3uHU7B">
-                  <node concept="Xjq3P" id="7Aoa2yUxohv" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="7Aoa2yUxohw" role="2OqNvi">
-                    <ref role="2Oxat5" node="3FEFhOSKJFg" resolve="strong" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="7Aoa2yUxohx" role="3uHU7w">
-                  <node concept="1eOMI4" id="7Aoa2yUxohy" role="2Oq$k0">
-                    <node concept="10QFUN" id="7Aoa2yUxohz" role="1eOMHV">
-                      <node concept="3uibUv" id="7Aoa2yUxoh$" role="10QFUM">
-                        <ref role="3uigEE" node="1z4$59jbqsu" resolve="MatchSNodeWrapper" />
-                      </node>
-                      <node concept="37vLTw" id="7Aoa2yUxoh_" role="10QFUP">
-                        <ref role="3cqZAo" node="1z4$59jbqsZ" resolve="that" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2OwXpG" id="7Aoa2yUxohA" role="2OqNvi">
-                    <ref role="2Oxat5" node="3FEFhOSKJFg" resolve="strong" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="1z4$59jbqts" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="7Aoa2yUyqmt" role="jymVt" />
-      <node concept="3clFb_" id="1z4$59jbqtu" role="jymVt">
-        <property role="TrG5h" value="hashCode" />
-        <node concept="3Tm1VV" id="1z4$59jbqtv" role="1B3o_S" />
-        <node concept="10Oyi0" id="1z4$59jbqtw" role="3clF45" />
-        <node concept="3clFbS" id="1z4$59jbqtx" role="3clF47">
-          <node concept="3clFbF" id="1z4$59jbqty" role="3cqZAp">
-            <node concept="2OqwBi" id="1z4$59jbqtz" role="3clFbG">
-              <node concept="Xjq3P" id="1z4$59jbqt$" role="2Oq$k0" />
-              <node concept="2OwXpG" id="1z4$59jbqt_" role="2OqNvi">
-                <ref role="2Oxat5" node="1z4$59jbqtC" resolve="hash" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="1z4$59jbqtA" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="7Aoa2yUvfUY" role="jymVt" />
-      <node concept="2YIFZL" id="7Aoa2yUyucP" role="jymVt">
-        <property role="TrG5h" value="matchNodes" />
-        <node concept="3clFbS" id="7Aoa2yUyhZU" role="3clF47">
-          <node concept="3cpWs6" id="7Aoa2yUyhZV" role="3cqZAp">
-            <node concept="2OqwBi" id="7Aoa2yUyhZW" role="3cqZAk">
-              <node concept="2ShNRf" id="7Aoa2yUyhZX" role="2Oq$k0">
-                <node concept="1pGfFk" id="7Aoa2yUyhZY" role="2ShVmc">
-                  <property role="373rjd" value="true" />
-                  <ref role="37wK5l" to="w1kc:~SNodeMatcher.&lt;init&gt;(jetbrains.mps.smodel.SNodeMatcher$PropertyMatchStrategy,jetbrains.mps.smodel.SNodeMatcher$AssociationMatchStrategy,jetbrains.mps.smodel.SNodeMatcher$AggregationMatchStrategy)" resolve="SNodeMatcher" />
-                  <node concept="37Ijox" id="7Aoa2yUyhZZ" role="37wK5m">
-                    <ref role="37Ijqf" node="7Aoa2yUvnZ2" resolve="matchProperties" />
-                    <node concept="2FaPjH" id="7Aoa2yUyi00" role="wWaWy">
-                      <node concept="3uibUv" id="7Aoa2yUyi01" role="2FaQuo">
-                        <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2ShNRf" id="7Aoa2yUyi02" role="37wK5m">
-                    <node concept="1pGfFk" id="7Aoa2yUyi03" role="2ShVmc">
-                      <property role="373rjd" value="true" />
-                      <ref role="37wK5l" to="w1kc:~SNodeMatcher$IdenticalTargetNode.&lt;init&gt;()" resolve="SNodeMatcher.IdenticalTargetNode" />
-                    </node>
-                  </node>
-                  <node concept="2ShNRf" id="7Aoa2yUyi04" role="37wK5m">
-                    <node concept="1pGfFk" id="7Aoa2yUyi05" role="2ShVmc">
-                      <property role="373rjd" value="true" />
-                      <ref role="37wK5l" to="w1kc:~SNodeMatcher$SameOrderChildMatch.&lt;init&gt;()" resolve="SNodeMatcher.SameOrderChildMatch" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="liA8E" id="7Aoa2yUyi06" role="2OqNvi">
-                <ref role="37wK5l" to="w1kc:~SNodeMatcher.match(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode)" resolve="match" />
-                <node concept="37vLTw" id="7Aoa2yUyi0e" role="37wK5m">
-                  <ref role="3cqZAo" node="7Aoa2yUyi09" resolve="thisWrapped" />
-                </node>
-                <node concept="37vLTw" id="7Aoa2yUyi0d" role="37wK5m">
-                  <ref role="3cqZAo" node="7Aoa2yUyi0b" resolve="thatWrapped" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="37vLTG" id="7Aoa2yUyi09" role="3clF46">
-          <property role="TrG5h" value="thisWrapped" />
-          <node concept="3Tqbb2" id="7Aoa2yUyi0a" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="7Aoa2yUyi0b" role="3clF46">
-          <property role="TrG5h" value="thatWrapped" />
-          <node concept="3Tqbb2" id="7Aoa2yUyi0c" role="1tU5fm" />
-        </node>
-        <node concept="10P_77" id="7Aoa2yUyi0i" role="3clF45" />
-        <node concept="3Tm6S6" id="7Aoa2yUyi0h" role="1B3o_S" />
-        <node concept="P$JXv" id="7Aoa2yUyOKd" role="lGtFl">
-          <node concept="TZ5HA" id="7Aoa2yUyOKe" role="TZ5H$">
-            <node concept="1dT_AC" id="7Aoa2yUyOKf" role="1dT_Ay">
-              <property role="1dT_AB" value="Extracted from MatchingUtil" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="1z4$59jbqtt" role="jymVt" />
-      <node concept="2YIFZL" id="7Aoa2yUvnZ2" role="jymVt">
-        <property role="TrG5h" value="matchProperties" />
-        <node concept="37vLTG" id="7Aoa2yUvnZ3" role="3clF46">
-          <property role="TrG5h" value="node1" />
-          <node concept="3uibUv" id="7Aoa2yUvnZ4" role="1tU5fm">
-            <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="7Aoa2yUvnZ5" role="3clF46">
-          <property role="TrG5h" value="node2" />
-          <node concept="3uibUv" id="7Aoa2yUvnZ6" role="1tU5fm">
-            <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="7Aoa2yUvnZ7" role="3clF46">
-          <property role="TrG5h" value="property" />
-          <node concept="3uibUv" id="7Aoa2yUvnZ8" role="1tU5fm">
-            <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="7Aoa2yUvnZ9" role="3clF47">
-          <node concept="3SKdUt" id="7Aoa2yUvnZW" role="3cqZAp">
-            <node concept="1PaTwC" id="7Aoa2yUvnZX" role="1aUNEU">
-              <node concept="3oM_SD" id="7Aoa2yUvnZZ" role="1PaTwD">
-                <property role="3oM_SC" value="use" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo00" role="1PaTwD">
-                <property role="3oM_SC" value="of" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo01" role="1PaTwD">
-                <property role="3oM_SC" value="SNode.getProperty()" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo02" role="1PaTwD">
-                <property role="3oM_SC" value="directly" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo03" role="1PaTwD">
-                <property role="3oM_SC" value="(not" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo04" role="1PaTwD">
-                <property role="3oM_SC" value="SNodeAccessUtil.getProperty())" />
-              </node>
-            </node>
-          </node>
-          <node concept="3SKdUt" id="7Aoa2yUvo05" role="3cqZAp">
-            <node concept="1PaTwC" id="7Aoa2yUvo06" role="1aUNEU">
-              <node concept="3oM_SD" id="7Aoa2yUvo08" role="1PaTwD">
-                <property role="3oM_SC" value="as" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo09" role="1PaTwD">
-                <property role="3oM_SC" value="we" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0a" role="1PaTwD">
-                <property role="3oM_SC" value="are" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0b" role="1PaTwD">
-                <property role="3oM_SC" value="checking" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0c" role="1PaTwD">
-                <property role="3oM_SC" value="for" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0d" role="1PaTwD">
-                <property role="3oM_SC" value="structural" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0e" role="1PaTwD">
-                <property role="3oM_SC" value="equality." />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0f" role="1PaTwD">
-                <property role="3oM_SC" value="If" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0g" role="1PaTwD">
-                <property role="3oM_SC" value="there's" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0h" role="1PaTwD">
-                <property role="3oM_SC" value="e.g." />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0i" role="1PaTwD">
-                <property role="3oM_SC" value="a" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0j" role="1PaTwD">
-                <property role="3oM_SC" value="'derived'" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0k" role="1PaTwD">
-                <property role="3oM_SC" value="property" />
-              </node>
-            </node>
-          </node>
-          <node concept="3SKdUt" id="7Aoa2yUvo0l" role="3cqZAp">
-            <node concept="1PaTwC" id="7Aoa2yUvo0m" role="1aUNEU">
-              <node concept="3oM_SD" id="7Aoa2yUvo0o" role="1PaTwD">
-                <property role="3oM_SC" value="==" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0p" role="1PaTwD">
-                <property role="3oM_SC" value="getName()" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0q" role="1PaTwD">
-                <property role="3oM_SC" value="+" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0r" role="1PaTwD">
-                <property role="3oM_SC" value="getNodeId()," />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0s" role="1PaTwD">
-                <property role="3oM_SC" value="its" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0t" role="1PaTwD">
-                <property role="3oM_SC" value="values" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0u" role="1PaTwD">
-                <property role="3oM_SC" value="from" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0v" role="1PaTwD">
-                <property role="3oM_SC" value="SNodeAccessUtil" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0w" role="1PaTwD">
-                <property role="3oM_SC" value="would" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0x" role="1PaTwD">
-                <property role="3oM_SC" value="differ" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0y" role="1PaTwD">
-                <property role="3oM_SC" value="and" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0z" role="1PaTwD">
-                <property role="3oM_SC" value="nodes" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0$" role="1PaTwD">
-                <property role="3oM_SC" value="would" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0_" role="1PaTwD">
-                <property role="3oM_SC" value="not" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0A" role="1PaTwD">
-                <property role="3oM_SC" value="match" />
-              </node>
-            </node>
-          </node>
-          <node concept="3SKdUt" id="7Aoa2yUvo0B" role="3cqZAp">
-            <node concept="1PaTwC" id="7Aoa2yUvo0C" role="1aUNEU">
-              <node concept="3oM_SD" id="7Aoa2yUvo0E" role="1PaTwD">
-                <property role="3oM_SC" value="(assuming" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0F" role="1PaTwD">
-                <property role="3oM_SC" value="NodeId" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0G" role="1PaTwD">
-                <property role="3oM_SC" value="is" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0H" role="1PaTwD">
-                <property role="3oM_SC" value="different" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0I" role="1PaTwD">
-                <property role="3oM_SC" value="and" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0J" role="1PaTwD">
-                <property role="3oM_SC" value="nodes" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0K" role="1PaTwD">
-                <property role="3oM_SC" value="otherwise" />
-              </node>
-              <node concept="3oM_SD" id="7Aoa2yUvo0L" role="1PaTwD">
-                <property role="3oM_SC" value="match)." />
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs8" id="7Aoa2yUvnZb" role="3cqZAp">
-            <node concept="3cpWsn" id="7Aoa2yUvnZa" role="3cpWs9">
-              <property role="TrG5h" value="stringValue1" />
-              <node concept="3uibUv" id="7Aoa2yUvnZc" role="1tU5fm">
-                <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-              </node>
-              <node concept="2OqwBi" id="7Aoa2yUvxj4" role="33vP2m">
-                <node concept="37vLTw" id="7Aoa2yUvu2C" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7Aoa2yUvnZ3" resolve="node1" />
-                </node>
-                <node concept="liA8E" id="7Aoa2yUvxj5" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SNode.getProperty(org.jetbrains.mps.openapi.language.SProperty)" resolve="getProperty" />
-                  <node concept="37vLTw" id="7Aoa2yUvxj6" role="37wK5m">
-                    <ref role="3cqZAo" node="7Aoa2yUvnZ7" resolve="property" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs8" id="7Aoa2yUvnZg" role="3cqZAp">
-            <node concept="3cpWsn" id="7Aoa2yUvnZf" role="3cpWs9">
-              <property role="TrG5h" value="stringValue2" />
-              <node concept="3uibUv" id="7Aoa2yUvnZh" role="1tU5fm">
-                <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-              </node>
-              <node concept="2OqwBi" id="7Aoa2yUvzJj" role="33vP2m">
-                <node concept="37vLTw" id="7Aoa2yUvu3L" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7Aoa2yUvnZ5" resolve="node2" />
-                </node>
-                <node concept="liA8E" id="7Aoa2yUvzJk" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SNode.getProperty(org.jetbrains.mps.openapi.language.SProperty)" resolve="getProperty" />
-                  <node concept="37vLTw" id="7Aoa2yUvzJl" role="37wK5m">
-                    <ref role="3cqZAo" node="7Aoa2yUvnZ7" resolve="property" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs8" id="7Aoa2yUvnZl" role="3cqZAp">
-            <node concept="3cpWsn" id="7Aoa2yUvnZk" role="3cpWs9">
-              <property role="TrG5h" value="propertyValue1" />
-              <node concept="3uibUv" id="7Aoa2yUvnZm" role="1tU5fm">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs8" id="7Aoa2yUvnZo" role="3cqZAp">
-            <node concept="3cpWsn" id="7Aoa2yUvnZn" role="3cpWs9">
-              <property role="TrG5h" value="propertyValue2" />
-              <node concept="3uibUv" id="7Aoa2yUvnZp" role="1tU5fm">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbJ" id="7Aoa2yUvnZq" role="3cqZAp">
-            <node concept="2OqwBi" id="7Aoa2yUvuzb" role="3clFbw">
-              <node concept="37vLTw" id="7Aoa2yUvu7b" role="2Oq$k0">
-                <ref role="3cqZAo" node="7Aoa2yUvnZ7" resolve="property" />
-              </node>
-              <node concept="liA8E" id="7Aoa2yUvuzc" role="2OqNvi">
-                <ref role="37wK5l" to="c17a:~SConceptFeature.isValid()" resolve="isValid" />
-              </node>
-            </node>
-            <node concept="9aQIb" id="7Aoa2yUvnZG" role="9aQIa">
-              <node concept="3clFbS" id="7Aoa2yUvnZH" role="9aQI4">
-                <node concept="3clFbF" id="7Aoa2yUvnZI" role="3cqZAp">
-                  <node concept="37vLTI" id="7Aoa2yUvnZJ" role="3clFbG">
-                    <node concept="37vLTw" id="7Aoa2yUvnZK" role="37vLTJ">
-                      <ref role="3cqZAo" node="7Aoa2yUvnZk" resolve="propertyValue1" />
-                    </node>
-                    <node concept="37vLTw" id="7Aoa2yUvnZL" role="37vLTx">
-                      <ref role="3cqZAo" node="7Aoa2yUvnZa" resolve="stringValue1" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="7Aoa2yUvnZM" role="3cqZAp">
-                  <node concept="37vLTI" id="7Aoa2yUvnZN" role="3clFbG">
-                    <node concept="37vLTw" id="7Aoa2yUvnZO" role="37vLTJ">
-                      <ref role="3cqZAo" node="7Aoa2yUvnZn" resolve="propertyValue2" />
-                    </node>
-                    <node concept="37vLTw" id="7Aoa2yUvnZP" role="37vLTx">
-                      <ref role="3cqZAo" node="7Aoa2yUvnZf" resolve="stringValue2" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbS" id="7Aoa2yUvnZt" role="3clFbx">
-              <node concept="3cpWs8" id="7Aoa2yUvnZv" role="3cqZAp">
-                <node concept="3cpWsn" id="7Aoa2yUvnZu" role="3cpWs9">
-                  <property role="TrG5h" value="dataType" />
-                  <node concept="3uibUv" id="7Aoa2yUvnZw" role="1tU5fm">
-                    <ref role="3uigEE" to="c17a:~SDataType" resolve="SDataType" />
-                  </node>
-                  <node concept="2OqwBi" id="7Aoa2yUvuwR" role="33vP2m">
-                    <node concept="37vLTw" id="7Aoa2yUvu4U" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7Aoa2yUvnZ7" resolve="property" />
-                    </node>
-                    <node concept="liA8E" id="7Aoa2yUvuwS" role="2OqNvi">
-                      <ref role="37wK5l" to="c17a:~SProperty.getType()" resolve="getType" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="7Aoa2yUvnZy" role="3cqZAp">
-                <node concept="37vLTI" id="7Aoa2yUvnZz" role="3clFbG">
-                  <node concept="37vLTw" id="7Aoa2yUvnZ$" role="37vLTJ">
-                    <ref role="3cqZAo" node="7Aoa2yUvnZk" resolve="propertyValue1" />
-                  </node>
-                  <node concept="2OqwBi" id="7Aoa2yUvurp" role="37vLTx">
-                    <node concept="37vLTw" id="7Aoa2yUvu62" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7Aoa2yUvnZu" resolve="dataType" />
-                    </node>
-                    <node concept="liA8E" id="7Aoa2yUvurq" role="2OqNvi">
-                      <ref role="37wK5l" to="c17a:~SDataType.fromString(java.lang.String)" resolve="fromString" />
-                      <node concept="37vLTw" id="7Aoa2yUvurr" role="37wK5m">
-                        <ref role="3cqZAo" node="7Aoa2yUvnZa" resolve="stringValue1" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="7Aoa2yUvnZB" role="3cqZAp">
-                <node concept="37vLTI" id="7Aoa2yUvnZC" role="3clFbG">
-                  <node concept="37vLTw" id="7Aoa2yUvnZD" role="37vLTJ">
-                    <ref role="3cqZAo" node="7Aoa2yUvnZn" resolve="propertyValue2" />
-                  </node>
-                  <node concept="2OqwBi" id="7Aoa2yUvut2" role="37vLTx">
-                    <node concept="37vLTw" id="7Aoa2yUvu1v" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7Aoa2yUvnZu" resolve="dataType" />
-                    </node>
-                    <node concept="liA8E" id="7Aoa2yUvut3" role="2OqNvi">
-                      <ref role="37wK5l" to="c17a:~SDataType.fromString(java.lang.String)" resolve="fromString" />
-                      <node concept="37vLTw" id="7Aoa2yUvut4" role="37wK5m">
-                        <ref role="3cqZAo" node="7Aoa2yUvnZf" resolve="stringValue2" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs6" id="7Aoa2yUvnZQ" role="3cqZAp">
-            <node concept="2YIFZM" id="7Aoa2yUvtZM" role="3cqZAk">
-              <ref role="1Pybhc" to="33ny:~Objects" resolve="Objects" />
-              <ref role="37wK5l" to="33ny:~Objects.equals(java.lang.Object,java.lang.Object)" resolve="equals" />
-              <node concept="37vLTw" id="7Aoa2yUvtZN" role="37wK5m">
-                <ref role="3cqZAo" node="7Aoa2yUvnZk" resolve="propertyValue1" />
-              </node>
-              <node concept="37vLTw" id="7Aoa2yUvtZO" role="37wK5m">
-                <ref role="3cqZAo" node="7Aoa2yUvnZn" resolve="propertyValue2" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3Tm6S6" id="7Aoa2yUvnZU" role="1B3o_S" />
-        <node concept="10P_77" id="7Aoa2yUvnZV" role="3clF45" />
-        <node concept="P$JXv" id="7Aoa2yUv$TU" role="lGtFl">
-          <node concept="TZ5HA" id="7Aoa2yUv$TV" role="TZ5H$">
-            <node concept="1dT_AC" id="7Aoa2yUv$TW" role="1dT_Ay">
-              <property role="1dT_AB" value="Copied from MatchingUtil" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="1z4$59jbqtB" role="jymVt" />
-      <node concept="312cEg" id="1z4$59jbqtC" role="jymVt">
-        <property role="TrG5h" value="hash" />
-        <node concept="3Tm6S6" id="1z4$59jbqtD" role="1B3o_S" />
-        <node concept="10Oyi0" id="1z4$59jbqtE" role="1tU5fm" />
-      </node>
-      <node concept="3Tmbuc" id="1z4$59jkQe9" role="1B3o_S" />
-      <node concept="312cEg" id="1z4$59jbqtG" role="jymVt">
-        <property role="TrG5h" value="wrapped" />
-        <node concept="3Tm6S6" id="1z4$59jbqtH" role="1B3o_S" />
-        <node concept="3Tqbb2" id="1z4$59jbqtI" role="1tU5fm" />
-      </node>
-      <node concept="3UR2Jj" id="1z4$59jbqtJ" role="lGtFl">
-        <node concept="TZ5HA" id="1z4$59jbqtK" role="TZ5H$">
-          <node concept="1dT_AC" id="1z4$59jbqtL" role="1dT_Ay">
-            <property role="1dT_AB" value="A wrapper for SNode instances that delegates hashCode/equals methods to those defined in" />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="1z4$59jbqtM" role="TZ5H$">
-          <node concept="1dT_AC" id="1z4$59jbqtN" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
-          </node>
-          <node concept="1dT_AA" id="1z4$59jbqtO" role="1dT_Ay">
-            <node concept="92FcH" id="1z4$59jbqtP" role="qph3F">
-              <node concept="TZ5HA" id="1z4$59jbqtQ" role="2XjZqd" />
-              <node concept="VXe08" id="1z4$59jbqtR" role="92FcQ">
-                <ref role="VXe09" to="ggp6:~MatchingUtil" resolve="MatchingUtil" />
-              </node>
-            </node>
-          </node>
-          <node concept="1dT_AC" id="1z4$59jbqtS" role="1dT_Ay">
-            <property role="1dT_AB" value="." />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="1z4$59jbqtT" role="TZ5H$">
-          <node concept="1dT_AC" id="1z4$59jbqtU" role="1dT_Ay">
-            <property role="1dT_AB" value="" />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="1z4$59jbqtV" role="TZ5H$">
-          <node concept="1dT_AC" id="1z4$59jbqtW" role="1dT_Ay">
-            <property role="1dT_AB" value="Instances of this class can be used as keys in hash map/set." />
-          </node>
-        </node>
-      </node>
-      <node concept="312cEg" id="3FEFhOSKJFg" role="jymVt">
-        <property role="TrG5h" value="strong" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3Tm6S6" id="3FEFhOSKJFh" role="1B3o_S" />
-        <node concept="10P_77" id="3FEFhOSKJFj" role="1tU5fm" />
-      </node>
-    </node>
-  </node>
   <node concept="312cEu" id="NKt6yn81z$">
     <property role="3GE5qa" value="launch.step" />
     <property role="TrG5h" value="TypecheckingStep" />
@@ -6335,30 +3717,35 @@
   </node>
   <node concept="312cEu" id="7kaxm0sEy3e">
     <property role="TrG5h" value="TypecheckingService" />
+    <node concept="2tJIrI" id="qsErMwdQ_$" role="jymVt" />
+    <node concept="Wx3nA" id="qsErMwdY8l" role="jymVt">
+      <property role="TrG5h" value="LOG" />
+      <node concept="3Tm6S6" id="qsErMwdY8n" role="1B3o_S" />
+      <node concept="3uibUv" id="qsErMwe9Y5" role="1tU5fm">
+        <ref role="3uigEE" to="wwqx:~Logger" resolve="Logger" />
+      </node>
+      <node concept="2YIFZM" id="qsErMwebHd" role="33vP2m">
+        <ref role="37wK5l" to="wwqx:~Logger.getLogger(java.lang.Class)" resolve="getLogger" />
+        <ref role="1Pybhc" to="wwqx:~Logger" resolve="Logger" />
+        <node concept="3VsKOn" id="qsErMwedTp" role="37wK5m">
+          <ref role="3VsUkX" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="qsErMwdVlw" role="jymVt" />
     <node concept="Wx3nA" id="6$F3Z5zitgp" role="jymVt">
       <property role="TrG5h" value="RULES_PROCESSING" />
       <node concept="3uibUv" id="6$F3Z5zitgr" role="1tU5fm">
         <ref role="3uigEE" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
         <node concept="3uibUv" id="6$F3Z5zi$1T" role="11_B2D">
           <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RulesProcessing" />
-          <node concept="3qTvmN" id="3GXzdW$9ifj" role="11_B2D" />
         </node>
       </node>
-      <node concept="2ShNRf" id="6$F3Z5zitgt" role="33vP2m">
-        <node concept="1pGfFk" id="6$F3Z5zitgu" role="2ShVmc">
-          <ref role="37wK5l" node="7i3KM7g1T3X" resolve="CachedData.DataFlavour" />
-          <node concept="3uibUv" id="6$F3Z5ziCpK" role="1pMfVU">
-            <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RulesProcessing" />
-            <node concept="3qTvmN" id="3GXzdW$9jlU" role="11_B2D" />
-          </node>
-          <node concept="2OqwBi" id="6$F3Z5zitgw" role="37wK5m">
-            <node concept="3VsKOn" id="6$F3Z5zitgx" role="2Oq$k0">
-              <ref role="3VsUkX" to="hano:CGeqIk8WWU" resolve="RulesProcessing" />
-            </node>
-            <node concept="liA8E" id="6$F3Z5zitgy" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Class.getName()" resolve="getName" />
-            </node>
-          </node>
+      <node concept="2YIFZM" id="qsErMwtKMJ" role="33vP2m">
+        <ref role="37wK5l" node="7Aoa2yVep9e" resolve="of" />
+        <ref role="1Pybhc" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
+        <node concept="3VsKOn" id="6$F3Z5zitgx" role="37wK5m">
+          <ref role="3VsUkX" to="hano:CGeqIk8WWU" resolve="RulesProcessing" />
         </node>
       </node>
       <node concept="3Tmbuc" id="61G6TdCrivj" role="1B3o_S" />
@@ -6483,20 +3870,11 @@
           <ref role="3uigEE" to="hano:70Wv0dJhQb2" resolve="OriginIndex" />
         </node>
       </node>
-      <node concept="2ShNRf" id="7i3KM7gAW32" role="33vP2m">
-        <node concept="1pGfFk" id="7i3KM7gAW33" role="2ShVmc">
-          <ref role="37wK5l" node="7i3KM7g1T3X" resolve="CachedData.DataFlavour" />
-          <node concept="3uibUv" id="6nFpYlvfkY4" role="1pMfVU">
-            <ref role="3uigEE" to="hano:70Wv0dJhQb2" resolve="OriginIndex" />
-          </node>
-          <node concept="2OqwBi" id="6nFpYluEEpY" role="37wK5m">
-            <node concept="3VsKOn" id="7i3KM7gAW35" role="2Oq$k0">
-              <ref role="3VsUkX" to="hano:70Wv0dJhQb2" resolve="OriginIndex" />
-            </node>
-            <node concept="liA8E" id="6nFpYluEM1s" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Class.getName()" resolve="getName" />
-            </node>
-          </node>
+      <node concept="2YIFZM" id="qsErMwtI72" role="33vP2m">
+        <ref role="37wK5l" node="7Aoa2yVep9e" resolve="of" />
+        <ref role="1Pybhc" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
+        <node concept="3VsKOn" id="7i3KM7gAW35" role="37wK5m">
+          <ref role="3VsUkX" to="hano:70Wv0dJhQb2" resolve="OriginIndex" />
         </node>
       </node>
       <node concept="3Tmbuc" id="6PWFJfG5BWT" role="1B3o_S" />
@@ -6510,20 +3888,11 @@
           <ref role="3uigEE" to="ugy2:6PWFJfG5LMK" resolve="Memo" />
         </node>
       </node>
-      <node concept="2ShNRf" id="6PWFJfG61KI" role="33vP2m">
-        <node concept="1pGfFk" id="6PWFJfG61KJ" role="2ShVmc">
-          <ref role="37wK5l" node="7i3KM7g1T3X" resolve="CachedData.DataFlavour" />
-          <node concept="3uibUv" id="6PWFJfG6ofG" role="1pMfVU">
-            <ref role="3uigEE" to="ugy2:6PWFJfG5LMK" resolve="Memo" />
-          </node>
-          <node concept="2OqwBi" id="6PWFJfG61KL" role="37wK5m">
-            <node concept="3VsKOn" id="6PWFJfG61KM" role="2Oq$k0">
-              <ref role="3VsUkX" to="ugy2:6PWFJfG5LMK" resolve="Memo" />
-            </node>
-            <node concept="liA8E" id="6PWFJfG61KN" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Class.getName()" resolve="getName" />
-            </node>
-          </node>
+      <node concept="2YIFZM" id="qsErMwtNQE" role="33vP2m">
+        <ref role="37wK5l" node="7Aoa2yVep9e" resolve="of" />
+        <ref role="1Pybhc" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
+        <node concept="3VsKOn" id="6PWFJfG61KM" role="37wK5m">
+          <ref role="3VsUkX" to="ugy2:6PWFJfG5LMK" resolve="Memo" />
         </node>
       </node>
       <node concept="3Tmbuc" id="6PWFJfG61KO" role="1B3o_S" />
@@ -6872,9 +4241,12 @@
                 <ref role="3cqZAo" node="4ot3PHR96MQ" resolve="config" />
               </node>
               <node concept="2ShNRf" id="9UUIHNdQII" role="37wK5m">
-                <node concept="1pGfFk" id="9UUIHNdX9E" role="2ShVmc">
+                <node concept="1pGfFk" id="qsErMwesKU" role="2ShVmc">
                   <property role="373rjd" value="true" />
-                  <ref role="37wK5l" to="et5u:~MessageCollector.&lt;init&gt;()" resolve="MessageCollector" />
+                  <ref role="37wK5l" to="et5u:~LogHandler.&lt;init&gt;(jetbrains.mps.logging.Logger)" resolve="LogHandler" />
+                  <node concept="37vLTw" id="qsErMwetqa" role="37wK5m">
+                    <ref role="3cqZAo" node="qsErMwdY8l" resolve="LOG" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -6922,9 +4294,12 @@
                 <ref role="3cqZAo" node="6YTH7uESh8z" resolve="repository" />
               </node>
               <node concept="2ShNRf" id="6YTH7uESh8M" role="37wK5m">
-                <node concept="1pGfFk" id="6YTH7uESh8N" role="2ShVmc">
+                <node concept="1pGfFk" id="qsErMwetYa" role="2ShVmc">
                   <property role="373rjd" value="true" />
-                  <ref role="37wK5l" to="et5u:~MessageCollector.&lt;init&gt;()" resolve="MessageCollector" />
+                  <ref role="37wK5l" to="et5u:~LogHandler.&lt;init&gt;(jetbrains.mps.logging.Logger)" resolve="LogHandler" />
+                  <node concept="37vLTw" id="qsErMwetYy" role="37wK5m">
+                    <ref role="3cqZAo" node="qsErMwdY8l" resolve="LOG" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -7378,60 +4753,77 @@
       </node>
     </node>
     <node concept="2tJIrI" id="1C_jAsqyx9p" role="jymVt" />
-    <node concept="3clFb_" id="1z4$59ixOPQ" role="jymVt">
+    <node concept="3clFb_" id="7Aoa2yVmEth" role="jymVt">
       <property role="TrG5h" value="check" />
-      <node concept="3clFbS" id="1z4$59ioBVz" role="3clF47">
-        <node concept="3clFbF" id="1C_jAsqyL4O" role="3cqZAp">
-          <node concept="1rXfSq" id="1C_jAsqyL4M" role="3clFbG">
+      <node concept="3clFbS" id="7Aoa2yVmEti" role="3clF47">
+        <node concept="3clFbF" id="7Aoa2yVmEtj" role="3cqZAp">
+          <node concept="1rXfSq" id="7Aoa2yVmEtk" role="3clFbG">
             <ref role="37wK5l" node="1C_jAsqgrq4" resolve="submit" />
-            <node concept="2ShNRf" id="1C_jAsqyMMn" role="37wK5m">
-              <node concept="1pGfFk" id="1C_jAsqyMMo" role="2ShVmc">
-                <ref role="37wK5l" node="6v6oK26pH7x" resolve="CheckRequest" />
-                <node concept="2YIFZM" id="1C_jAsqzs_L" role="37wK5m">
-                  <ref role="1Pybhc" node="5EDW3XDYg8Y" resolve="TypecheckingQueries" />
-                  <ref role="37wK5l" node="5EDW3XDYggE" resolve="check" />
-                  <node concept="37vLTw" id="1C_jAsqzs_M" role="37wK5m">
-                    <ref role="3cqZAo" node="1z4$59ioBVI" resolve="root" />
-                  </node>
-                  <node concept="2OqwBi" id="1C_jAsqzs_N" role="37wK5m">
-                    <node concept="37vLTw" id="1C_jAsqzs_O" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1z4$59jKKYm" resolve="state" />
+            <node concept="2OqwBi" id="7Aoa2yVmPPX" role="37wK5m">
+              <node concept="2ShNRf" id="7Aoa2yVmEtl" role="2Oq$k0">
+                <node concept="1pGfFk" id="7Aoa2yVmEtm" role="2ShVmc">
+                  <ref role="37wK5l" node="6v6oK26pH7x" resolve="CheckRequest" />
+                  <node concept="2YIFZM" id="7Aoa2yVmEtn" role="37wK5m">
+                    <ref role="1Pybhc" node="5EDW3XDYg8Y" resolve="TypecheckingQueries" />
+                    <ref role="37wK5l" node="5EDW3XDYggE" resolve="check" />
+                    <node concept="37vLTw" id="7Aoa2yVmEto" role="37wK5m">
+                      <ref role="3cqZAo" node="7Aoa2yVmEts" resolve="root" />
                     </node>
-                    <node concept="liA8E" id="1C_jAsqzs_P" role="2OqNvi">
-                      <ref role="37wK5l" node="1T5MAgPidDk" resolve="typeCollector" />
+                    <node concept="2OqwBi" id="7Aoa2yVmEtp" role="37wK5m">
+                      <node concept="37vLTw" id="7Aoa2yVmEtq" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1z4$59jKKYm" resolve="state" />
+                      </node>
+                      <node concept="liA8E" id="7Aoa2yVmEtr" role="2OqNvi">
+                        <ref role="37wK5l" node="1T5MAgPidDk" resolve="typeCollector" />
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="liA8E" id="7Aoa2yVmUk6" role="2OqNvi">
+                <ref role="37wK5l" node="1z4$59iFAPj" resolve="withReportConsumer" />
+                <node concept="37vLTw" id="7Aoa2yVmZwv" role="37wK5m">
+                  <ref role="3cqZAo" node="7Aoa2yVmJ3g" resolve="reportSink" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="1z4$59ioBVI" role="3clF46">
+      <node concept="37vLTG" id="7Aoa2yVmEts" role="3clF46">
         <property role="TrG5h" value="root" />
-        <node concept="3Tqbb2" id="1z4$59ioBVJ" role="1tU5fm" />
+        <node concept="3Tqbb2" id="7Aoa2yVmEtt" role="1tU5fm" />
       </node>
-      <node concept="3uibUv" id="1z4$59ioKOU" role="3clF45">
-        <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
-        <node concept="3uibUv" id="1z4$59ir0G$" role="11_B2D">
-          <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+      <node concept="37vLTG" id="7Aoa2yVmJ3g" role="3clF46">
+        <property role="TrG5h" value="reportSink" />
+        <node concept="3uibUv" id="7Aoa2yVmLjS" role="1tU5fm">
+          <ref role="3uigEE" to="82uw:~Consumer" resolve="Consumer" />
+          <node concept="3uibUv" id="7Aoa2yVmMtU" role="11_B2D">
+            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+          </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="1z4$59ioBVL" role="1B3o_S" />
-      <node concept="P$JXv" id="1RYTbd80Ynz" role="lGtFl">
-        <node concept="TZ5HA" id="1RYTbd80Yn$" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd80Yn_" role="1dT_Ay">
+      <node concept="3uibUv" id="7Aoa2yVmEtu" role="3clF45">
+        <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
+        <node concept="3uibUv" id="7Aoa2yVoRON" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7Aoa2yVmEtw" role="1B3o_S" />
+      <node concept="P$JXv" id="7Aoa2yVmEtx" role="lGtFl">
+        <node concept="TZ5HA" id="7Aoa2yVmEty" role="TZ5H$">
+          <node concept="1dT_AC" id="7Aoa2yVmEtz" role="1dT_Ay">
             <property role="1dT_AB" value="Checks all types within a root." />
           </node>
         </node>
-        <node concept="TZ5HA" id="1RYTbd81l6N" role="TZ5H$">
-          <node concept="1dT_AC" id="1RYTbd81l6O" role="1dT_Ay">
+        <node concept="TZ5HA" id="7Aoa2yVmEt$" role="TZ5H$">
+          <node concept="1dT_AC" id="7Aoa2yVmEt_" role="1dT_Ay">
             <property role="1dT_AB" value="Must be called in a read action. " />
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="1z4$59iqPzG" role="jymVt" />
+    <node concept="2tJIrI" id="7Aoa2yVmEtg" role="jymVt" />
     <node concept="3clFb_" id="1z4$59iI7cZ" role="jymVt">
       <property role="TrG5h" value="typeOf" />
       <node concept="3clFbS" id="1z4$59iqSOR" role="3clF47">
@@ -7858,7 +5250,7 @@
         <node concept="3Tqbb2" id="19OC90lY7R" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="9dktABQj94" role="3clF45">
-        <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+        <ref role="3uigEE" node="7Aoa2yVdSP8" resolve="ReportedTypes" />
       </node>
       <node concept="3Tm1VV" id="19OC90lY7T" role="1B3o_S" />
       <node concept="3clFbS" id="19OC90lY7U" role="3clF47">
@@ -7900,21 +5292,35 @@
           </node>
         </node>
         <node concept="3clFbF" id="9dktABPYMK" role="3cqZAp">
-          <node concept="2OqwBi" id="9dktABQvXC" role="3clFbG">
-            <node concept="37vLTw" id="1z4$59jKVQJ" role="2Oq$k0">
-              <ref role="3cqZAo" node="1z4$59jKKYm" resolve="state" />
-            </node>
-            <node concept="liA8E" id="9dktABQvXE" role="2OqNvi">
-              <ref role="37wK5l" node="4Z$O9mrQJgp" resolve="cachedTypecheckingResults" />
-              <node concept="2OqwBi" id="9dktABQvXF" role="37wK5m">
-                <node concept="2JrnkZ" id="9dktABQvXG" role="2Oq$k0">
-                  <node concept="37vLTw" id="9dktABQvXH" role="2JrQYb">
-                    <ref role="3cqZAo" node="19OC90lY7Q" resolve="root" />
+          <node concept="2OqwBi" id="7Aoa2yVHOl9" role="3clFbG">
+            <node concept="2OqwBi" id="7Aoa2yVHJxG" role="2Oq$k0">
+              <node concept="2OqwBi" id="9dktABQvXC" role="2Oq$k0">
+                <node concept="37vLTw" id="1z4$59jKVQJ" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1z4$59jKKYm" resolve="state" />
+                </node>
+                <node concept="liA8E" id="9dktABQvXE" role="2OqNvi">
+                  <ref role="37wK5l" node="7Aoa2yVAE2W" resolve="getCacheHolder" />
+                  <node concept="2OqwBi" id="9dktABQvXF" role="37wK5m">
+                    <node concept="2JrnkZ" id="9dktABQvXG" role="2Oq$k0">
+                      <node concept="37vLTw" id="9dktABQvXH" role="2JrQYb">
+                        <ref role="3cqZAo" node="19OC90lY7Q" resolve="root" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="9dktABQvXI" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                    </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="9dktABQvXI" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                </node>
+              </node>
+              <node concept="liA8E" id="7Aoa2yVHLOM" role="2OqNvi">
+                <ref role="37wK5l" node="7Aoa2yVBu8W" resolve="getCachedData" />
+              </node>
+            </node>
+            <node concept="liA8E" id="7Aoa2yVHQBd" role="2OqNvi">
+              <ref role="37wK5l" node="7i3KM7g1KV4" resolve="get" />
+              <node concept="10M0yZ" id="7Aoa2yVHYY4" role="37wK5m">
+                <ref role="3cqZAo" node="7Aoa2yVefYI" resolve="REPORTED_TYPES" />
+                <ref role="1PxDUh" node="6v6oK26pH7t" resolve="CheckRequest" />
               </node>
             </node>
           </node>
@@ -7923,6 +5329,11 @@
       <node concept="P$JXv" id="19OC90lY8V" role="lGtFl">
         <node concept="TZ5HA" id="19OC90lY8W" role="TZ5H$">
           <node concept="1dT_AC" id="19OC90lY8X" role="1dT_Ay">
+            <property role="1dT_AB" value="Only used by tests!" />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="7Aoa2yVI3Ud" role="TZ5H$">
+          <node concept="1dT_AC" id="7Aoa2yVI3Ue" role="1dT_Ay">
             <property role="1dT_AB" value="Does not launch any typechecking." />
           </node>
         </node>
@@ -7931,6 +5342,12 @@
             <property role="1dT_AB" value="Must be called in a read action." />
           </node>
         </node>
+        <node concept="TZ5HI" id="7Aoa2yVAg47" role="3nqlJM">
+          <node concept="TZ5HA" id="7Aoa2yVAg48" role="3HnX3l" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="7Aoa2yVAg49" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="4duYm8_iT_v" role="jymVt" />
@@ -8377,41 +5794,36 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5cBWTAehaSr" role="jymVt" />
-    <node concept="3clFb_" id="4Z$O9mrQJgp" role="jymVt">
-      <property role="TrG5h" value="cachedTypecheckingResults" />
-      <node concept="37vLTG" id="4Z$O9mrQJle" role="3clF46">
+    <node concept="3clFb_" id="7Aoa2yVAE2W" role="jymVt">
+      <property role="TrG5h" value="getCacheHolder" />
+      <node concept="37vLTG" id="7Aoa2yVAM2J" role="3clF46">
         <property role="TrG5h" value="unitRef" />
-        <node concept="3uibUv" id="4vBwiiVtQ7u" role="1tU5fm">
+        <node concept="3uibUv" id="7Aoa2yVAM2K" role="1tU5fm">
           <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
         </node>
       </node>
-      <node concept="3uibUv" id="1FOQehxetAn" role="3clF45">
-        <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+      <node concept="3uibUv" id="7Aoa2yVAGZR" role="3clF45">
+        <ref role="3uigEE" node="4Z$O9mrQJw7" resolve="CacheHolder" />
       </node>
-      <node concept="3Tm1VV" id="4Z$O9mrQJgs" role="1B3o_S" />
-      <node concept="3clFbS" id="4Z$O9mrQJgt" role="3clF47">
-        <node concept="3clFbF" id="syqlb1RVlG" role="3cqZAp">
-          <node concept="2EnYce" id="syqlb1S0oh" role="3clFbG">
-            <node concept="2OqwBi" id="syqlb1RVUb" role="2Oq$k0">
-              <node concept="liA8E" id="syqlb1RWzr" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
-                <node concept="37vLTw" id="syqlb1RXBJ" role="37wK5m">
-                  <ref role="3cqZAo" node="4Z$O9mrQJle" resolve="unitRef" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="3GLv42N87bF" role="2Oq$k0">
-                <ref role="3cqZAo" node="4Z$O9mrTa0z" resolve="unitCacheHolders" />
+      <node concept="3Tm1VV" id="7Aoa2yVAE2Z" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVAE30" role="3clF47">
+        <node concept="3clFbF" id="7Aoa2yVAPzy" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVAPz$" role="3clFbG">
+            <node concept="liA8E" id="7Aoa2yVAPz_" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
+              <node concept="37vLTw" id="7Aoa2yVAPzA" role="37wK5m">
+                <ref role="3cqZAo" node="7Aoa2yVAM2J" resolve="unitRef" />
               </node>
             </node>
-            <node concept="liA8E" id="syqlb1S1aB" role="2OqNvi">
-              <ref role="37wK5l" node="5AFANm9Mi2l" resolve="getCache" />
+            <node concept="37vLTw" id="7Aoa2yVAPzB" role="2Oq$k0">
+              <ref role="3cqZAo" node="4Z$O9mrTa0z" resolve="unitCacheHolders" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="P$JXv" id="5lxnBcU3Uwk" role="lGtFl">
-        <node concept="TZ5HA" id="5lxnBcU3Uwl" role="TZ5H$">
-          <node concept="1dT_AC" id="5lxnBcU3Uwm" role="1dT_Ay">
+      <node concept="P$JXv" id="7Aoa2yVAQUW" role="lGtFl">
+        <node concept="TZ5HA" id="7Aoa2yVAQUX" role="TZ5H$">
+          <node concept="1dT_AC" id="7Aoa2yVAQUY" role="1dT_Ay">
             <property role="1dT_AB" value="FIXME used from tests" />
           </node>
         </node>
@@ -8455,7 +5867,7 @@
                 <ref role="3cqZAo" node="At0yqMWanq" resolve="ch" />
               </node>
               <node concept="liA8E" id="At0yqMWv2C" role="2OqNvi">
-                <ref role="37wK5l" node="At0yqMWnw7" resolve="isCacheUpToDate" />
+                <ref role="37wK5l" node="At0yqMWnw7" resolve="isCachedDataCurrent" />
               </node>
             </node>
             <node concept="3clFbT" id="At0yqMWwnM" role="3K4GZi" />
@@ -8483,509 +5895,234 @@
           </node>
         </node>
       </node>
+      <node concept="2AHcQZ" id="7Aoa2yVzAef" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+      </node>
     </node>
     <node concept="2tJIrI" id="1T5MAgPi6KS" role="jymVt" />
-    <node concept="3clFb_" id="4Dkptq1OPR7" role="jymVt">
-      <property role="TrG5h" value="updateUnitTypecheckingResults" />
-      <node concept="37vLTG" id="4Dkptq1P8RD" role="3clF46">
+    <node concept="3clFb_" id="7Aoa2yVgCDl" role="jymVt">
+      <property role="TrG5h" value="updateUnitCachedData" />
+      <node concept="37vLTG" id="7Aoa2yVgCDm" role="3clF46">
         <property role="TrG5h" value="unit" />
-        <node concept="3Tqbb2" id="3DPJ8QIpiGE" role="1tU5fm" />
+        <node concept="3Tqbb2" id="7Aoa2yVgCDn" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="4Dkptq1PaWS" role="3clF46">
+      <node concept="37vLTG" id="7Aoa2yVgCDo" role="3clF46">
         <property role="TrG5h" value="updater" />
-        <node concept="3uibUv" id="44XN1Jd7Htv" role="1tU5fm">
-          <ref role="3uigEE" to="82uw:~Function" resolve="Function" />
-          <node concept="3uibUv" id="44XN1Jd7Htw" role="11_B2D">
-            <ref role="3uigEE" node="4Dkptq1Qcxp" resolve="CacheUpdatable" />
+        <node concept="3uibUv" id="7Aoa2yVgIiL" role="1tU5fm">
+          <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+          <node concept="3uibUv" id="7Aoa2yVgKSe" role="11_B2D">
+            <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
           </node>
-          <node concept="3uibUv" id="44XN1Jd7Htx" role="11_B2D">
-            <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="4Dkptq1PRAw" role="3clF45">
-        <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-      </node>
-      <node concept="3clFbS" id="4Dkptq1OPRb" role="3clF47">
-        <node concept="3cpWs8" id="4Dkptq1Powj" role="3cqZAp">
-          <node concept="3cpWsn" id="4Dkptq1Powk" role="3cpWs9">
-            <property role="TrG5h" value="holder" />
-            <property role="3TUv4t" value="true" />
-            <node concept="3uibUv" id="4Dkptq1Powl" role="1tU5fm">
-              <ref role="3uigEE" node="4Z$O9mrQJw7" resolve="CacheHolder" />
-            </node>
-            <node concept="1rXfSq" id="4Dkptq1Powm" role="33vP2m">
-              <ref role="37wK5l" node="61G6TdC33Bp" resolve="getOrCreateUnitCacheHolder" />
-              <node concept="37vLTw" id="4Dkptq1Pown" role="37wK5m">
-                <ref role="3cqZAo" node="4Dkptq1P8RD" resolve="unit" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="61G6TdCdwQB" role="3cqZAp" />
-        <node concept="3SKdUt" id="7rpiEA1pkDV" role="3cqZAp">
-          <node concept="1PaTwC" id="7rpiEA1pkDW" role="1aUNEU">
-            <node concept="3oM_SD" id="7rpiEA1pkDY" role="1PaTwD">
-              <property role="3oM_SC" value="get" />
-            </node>
-            <node concept="3oM_SD" id="7rpiEA1plRu" role="1PaTwD">
-              <property role="3oM_SC" value="a" />
-            </node>
-            <node concept="3oM_SD" id="7rpiEA1plRE" role="1PaTwD">
-              <property role="3oM_SC" value="mutex" />
-            </node>
-            <node concept="3oM_SD" id="7rpiEA1plS0" role="1PaTwD">
-              <property role="3oM_SC" value="on" />
-            </node>
-            <node concept="3oM_SD" id="7rpiEA1plS5" role="1PaTwD">
-              <property role="3oM_SC" value="holder" />
-            </node>
-            <node concept="3oM_SD" id="7rpiEA1plSk" role="1PaTwD">
-              <property role="3oM_SC" value="so" />
-            </node>
-            <node concept="3oM_SD" id="7rpiEA1plS$" role="1PaTwD">
-              <property role="3oM_SC" value="that" />
-            </node>
-            <node concept="3oM_SD" id="7rpiEA1plSG" role="1PaTwD">
-              <property role="3oM_SC" value="two" />
-            </node>
-            <node concept="3oM_SD" id="7rpiEA1plVh" role="1PaTwD">
-              <property role="3oM_SC" value="update" />
-            </node>
-            <node concept="3oM_SD" id="7rpiEA1plSY" role="1PaTwD">
-              <property role="3oM_SC" value="sessions" />
-            </node>
-            <node concept="3oM_SD" id="7rpiEA1plTq" role="1PaTwD">
-              <property role="3oM_SC" value="can't" />
-            </node>
-            <node concept="3oM_SD" id="7rpiEA1plT_" role="1PaTwD">
-              <property role="3oM_SC" value="be" />
-            </node>
-            <node concept="3oM_SD" id="7rpiEA1plTL" role="1PaTwD">
-              <property role="3oM_SC" value="run" />
-            </node>
-            <node concept="3oM_SD" id="7rpiEA1plU7" role="1PaTwD">
-              <property role="3oM_SC" value="in" />
-            </node>
-            <node concept="3oM_SD" id="7rpiEA1plUB" role="1PaTwD">
-              <property role="3oM_SC" value="parallel" />
-            </node>
-          </node>
-        </node>
-        <node concept="1HWtB8" id="44XN1Jd7MH$" role="3cqZAp">
-          <node concept="37vLTw" id="44XN1Jd7NSg" role="1HWFw0">
-            <ref role="3cqZAo" node="4Dkptq1Powk" resolve="holder" />
-          </node>
-          <node concept="3clFbS" id="44XN1Jd7MHC" role="1HWHxc">
-            <node concept="3cpWs6" id="61G6TdDmXZf" role="3cqZAp">
-              <node concept="1rXfSq" id="61G6TdDn6aa" role="3cqZAk">
-                <ref role="37wK5l" node="61G6TdDl9fp" resolve="updateCache" />
-                <node concept="37vLTw" id="61G6TdDnatz" role="37wK5m">
-                  <ref role="3cqZAo" node="4Dkptq1Powk" resolve="holder" />
-                </node>
-                <node concept="37vLTw" id="61G6TdDncCB" role="37wK5m">
-                  <ref role="3cqZAo" node="4Dkptq1PaWS" resolve="updater" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="4Dkptq1Pczm" role="lGtFl">
-        <node concept="TZ5HA" id="4Dkptq1Pczn" role="TZ5H$">
-          <node concept="1dT_AC" id="4Dkptq1Pczo" role="1dT_Ay" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7gMIJIxITDB" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="4Dkptq1Q4Fm" role="jymVt" />
-    <node concept="3clFb_" id="2hQbw6GScMc" role="jymVt">
-      <property role="TrG5h" value="updateSharedTypecheckingResults" />
-      <node concept="37vLTG" id="2hQbw6GSoyv" role="3clF46">
-        <property role="TrG5h" value="validater" />
-        <node concept="3uibUv" id="2hQbw6GSoyw" role="1tU5fm">
-          <ref role="3uigEE" to="82uw:~Function" resolve="Function" />
-          <node concept="3uibUv" id="2hQbw6GSoyx" role="11_B2D">
-            <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-          </node>
-          <node concept="3uibUv" id="2hQbw6GSqqA" role="11_B2D">
+          <node concept="3uibUv" id="7Aoa2yVlOxn" role="11_B2D">
             <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="2hQbw6GSqxC" role="3clF46">
-        <property role="TrG5h" value="updater" />
-        <node concept="3uibUv" id="2hQbw6GSqxD" role="1tU5fm">
-          <ref role="3uigEE" to="82uw:~Function" resolve="Function" />
-          <node concept="3uibUv" id="2hQbw6GSqxE" role="11_B2D">
-            <ref role="3uigEE" node="4Dkptq1Qcxp" resolve="CacheUpdatable" />
-          </node>
-          <node concept="3uibUv" id="2hQbw6GSqxF" role="11_B2D">
-            <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="2hQbw6GSeuq" role="3clF45">
-        <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-      </node>
-      <node concept="3Tm1VV" id="2hQbw6GScMf" role="1B3o_S" />
-      <node concept="3clFbS" id="2hQbw6GScMg" role="3clF47">
-        <node concept="3cpWs8" id="2hQbw6GStUH" role="3cqZAp">
-          <node concept="3cpWsn" id="2hQbw6GStUI" role="3cpWs9">
+      <node concept="3cqZAl" id="7Aoa2yVgT4L" role="3clF45" />
+      <node concept="3clFbS" id="7Aoa2yVgCDt" role="3clF47">
+        <node concept="3cpWs8" id="7Aoa2yVgCDu" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVgCDv" role="3cpWs9">
             <property role="TrG5h" value="holder" />
             <property role="3TUv4t" value="true" />
-            <node concept="3uibUv" id="2hQbw6GStUJ" role="1tU5fm">
+            <node concept="3uibUv" id="7Aoa2yVgCDw" role="1tU5fm">
               <ref role="3uigEE" node="4Z$O9mrQJw7" resolve="CacheHolder" />
             </node>
-            <node concept="37vLTw" id="2hQbw6GStUK" role="33vP2m">
-              <ref role="3cqZAo" node="1T5MAgPeszY" resolve="sharedCacheHolder" />
+            <node concept="1rXfSq" id="7Aoa2yVgCDx" role="33vP2m">
+              <ref role="37wK5l" node="61G6TdC33Bp" resolve="getOrCreateUnitCacheHolder" />
+              <node concept="37vLTw" id="7Aoa2yVgCDy" role="37wK5m">
+                <ref role="3cqZAo" node="7Aoa2yVgCDm" resolve="unit" />
+              </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="2hQbw6GStUL" role="3cqZAp" />
-        <node concept="3SKdUt" id="2hQbw6GStUM" role="3cqZAp">
-          <node concept="1PaTwC" id="2hQbw6GStUN" role="1aUNEU">
-            <node concept="3oM_SD" id="2hQbw6GStUO" role="1PaTwD">
+        <node concept="3clFbH" id="7Aoa2yVgCDz" role="3cqZAp" />
+        <node concept="3SKdUt" id="7Aoa2yVgCD$" role="3cqZAp">
+          <node concept="1PaTwC" id="7Aoa2yVgCD_" role="1aUNEU">
+            <node concept="3oM_SD" id="7Aoa2yVgCDA" role="1PaTwD">
               <property role="3oM_SC" value="get" />
             </node>
-            <node concept="3oM_SD" id="2hQbw6GStUP" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVgCDB" role="1PaTwD">
               <property role="3oM_SC" value="a" />
             </node>
-            <node concept="3oM_SD" id="2hQbw6GStUQ" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVgCDC" role="1PaTwD">
               <property role="3oM_SC" value="mutex" />
             </node>
-            <node concept="3oM_SD" id="2hQbw6GStUR" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVgCDD" role="1PaTwD">
               <property role="3oM_SC" value="on" />
             </node>
-            <node concept="3oM_SD" id="2hQbw6GStUS" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVgCDE" role="1PaTwD">
               <property role="3oM_SC" value="holder" />
             </node>
-            <node concept="3oM_SD" id="2hQbw6GStUT" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVgCDF" role="1PaTwD">
               <property role="3oM_SC" value="so" />
             </node>
-            <node concept="3oM_SD" id="2hQbw6GStUU" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVgCDG" role="1PaTwD">
               <property role="3oM_SC" value="that" />
             </node>
-            <node concept="3oM_SD" id="2hQbw6GStUV" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVgCDH" role="1PaTwD">
               <property role="3oM_SC" value="two" />
             </node>
-            <node concept="3oM_SD" id="2hQbw6GStUW" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVgCDI" role="1PaTwD">
               <property role="3oM_SC" value="update" />
             </node>
-            <node concept="3oM_SD" id="2hQbw6GStUX" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVgCDJ" role="1PaTwD">
               <property role="3oM_SC" value="sessions" />
             </node>
-            <node concept="3oM_SD" id="2hQbw6GStUY" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVgCDK" role="1PaTwD">
               <property role="3oM_SC" value="can't" />
             </node>
-            <node concept="3oM_SD" id="2hQbw6GStUZ" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVgCDL" role="1PaTwD">
               <property role="3oM_SC" value="be" />
             </node>
-            <node concept="3oM_SD" id="2hQbw6GStV0" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVgCDM" role="1PaTwD">
               <property role="3oM_SC" value="run" />
             </node>
-            <node concept="3oM_SD" id="2hQbw6GStV1" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVgCDN" role="1PaTwD">
               <property role="3oM_SC" value="in" />
             </node>
-            <node concept="3oM_SD" id="2hQbw6GStV2" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVgCDO" role="1PaTwD">
               <property role="3oM_SC" value="parallel" />
             </node>
           </node>
         </node>
-        <node concept="1HWtB8" id="2hQbw6GStV3" role="3cqZAp">
-          <node concept="37vLTw" id="2hQbw6GStV4" role="1HWFw0">
-            <ref role="3cqZAo" node="2hQbw6GStUI" resolve="holder" />
+        <node concept="1HWtB8" id="7Aoa2yVgCDP" role="3cqZAp">
+          <node concept="37vLTw" id="7Aoa2yVgCDQ" role="1HWFw0">
+            <ref role="3cqZAo" node="7Aoa2yVgCDv" resolve="holder" />
           </node>
-          <node concept="3clFbS" id="2hQbw6GStV5" role="1HWHxc">
-            <node concept="3cpWs8" id="2hQbw6GSzAC" role="3cqZAp">
-              <node concept="3cpWsn" id="2hQbw6GSzAD" role="3cpWs9">
-                <property role="TrG5h" value="cache" />
-                <node concept="3uibUv" id="2hQbw6GSzy$" role="1tU5fm">
-                  <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+          <node concept="3clFbS" id="7Aoa2yVgCDR" role="1HWHxc">
+            <node concept="3clFbF" id="7Aoa2yVjby5" role="3cqZAp">
+              <node concept="2OqwBi" id="7Aoa2yVjdaD" role="3clFbG">
+                <node concept="37vLTw" id="7Aoa2yVjby3" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7Aoa2yVgCDv" resolve="holder" />
                 </node>
-                <node concept="2OqwBi" id="2hQbw6GSzAE" role="33vP2m">
-                  <node concept="37vLTw" id="2hQbw6GSzAF" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2hQbw6GStUI" resolve="holder" />
+                <node concept="liA8E" id="7Aoa2yVje_9" role="2OqNvi">
+                  <ref role="37wK5l" node="7Aoa2yVj0AN" resolve="updateCachedData" />
+                  <node concept="37vLTw" id="7Aoa2yVjhuT" role="37wK5m">
+                    <ref role="3cqZAo" node="7Aoa2yVgCDo" resolve="updater" />
                   </node>
-                  <node concept="liA8E" id="2hQbw6GSzAG" role="2OqNvi">
-                    <ref role="37wK5l" node="5AFANm9Mi2l" resolve="getCache" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="2hQbw6GSB1x" role="3cqZAp">
-              <node concept="3clFbS" id="2hQbw6GSB1z" role="3clFbx">
-                <node concept="3cpWs8" id="2hQbw6GSDtv" role="3cqZAp">
-                  <node concept="3cpWsn" id="2hQbw6GSDtw" role="3cpWs9">
-                    <property role="TrG5h" value="cacheValid" />
-                    <node concept="3uibUv" id="2hQbw6GSDrx" role="1tU5fm">
-                      <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                    </node>
-                    <node concept="2OqwBi" id="2hQbw6GSDtx" role="33vP2m">
-                      <node concept="37vLTw" id="2hQbw6GSDty" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2hQbw6GSoyv" resolve="validater" />
-                      </node>
-                      <node concept="liA8E" id="2hQbw6GSDtz" role="2OqNvi">
-                        <ref role="37wK5l" to="82uw:~Function.apply(java.lang.Object)" resolve="apply" />
-                        <node concept="37vLTw" id="2hQbw6GSDt$" role="37wK5m">
-                          <ref role="3cqZAo" node="2hQbw6GSzAD" resolve="cache" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="2hQbw6GSIb6" role="3cqZAp">
-                  <node concept="3clFbS" id="2hQbw6GSIb8" role="3clFbx">
-                    <node concept="3cpWs6" id="2hQbw6GSIh3" role="3cqZAp">
-                      <node concept="37vLTw" id="2hQbw6GSJV9" role="3cqZAk">
-                        <ref role="3cqZAo" node="2hQbw6GSzAD" resolve="cache" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="37vLTw" id="2hQbw6GSIfJ" role="3clFbw">
-                    <ref role="3cqZAo" node="2hQbw6GSDtw" resolve="cacheValid" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3y3z36" id="2hQbw6GSBOb" role="3clFbw">
-                <node concept="10Nm6u" id="2hQbw6GSC3T" role="3uHU7w" />
-                <node concept="37vLTw" id="2hQbw6GSBHc" role="3uHU7B">
-                  <ref role="3cqZAo" node="2hQbw6GSzAD" resolve="cache" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="2hQbw6GSOJo" role="3cqZAp" />
-            <node concept="3cpWs6" id="2hQbw6GStV6" role="3cqZAp">
-              <node concept="1rXfSq" id="2hQbw6GStV7" role="3cqZAk">
-                <ref role="37wK5l" node="61G6TdDl9fp" resolve="updateCache" />
-                <node concept="37vLTw" id="2hQbw6GStV8" role="37wK5m">
-                  <ref role="3cqZAo" node="2hQbw6GStUI" resolve="holder" />
-                </node>
-                <node concept="37vLTw" id="2hQbw6GStV9" role="37wK5m">
-                  <ref role="3cqZAo" node="2hQbw6GSqxC" resolve="updater" />
                 </node>
               </node>
             </node>
           </node>
         </node>
       </node>
+      <node concept="P$JXv" id="7Aoa2yVgCDW" role="lGtFl">
+        <node concept="TZ5HA" id="7Aoa2yVgCDX" role="TZ5H$">
+          <node concept="1dT_AC" id="7Aoa2yVgCDY" role="1dT_Ay">
+            <property role="1dT_AB" value="FIXME either node&lt; &gt; or node-ref" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7Aoa2yVgCDZ" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="2hQbw6GSSnt" role="jymVt" />
-    <node concept="3clFb_" id="1z4$59jvV_B" role="jymVt">
-      <property role="TrG5h" value="getOrUpdateValue" />
-      <node concept="37vLTG" id="1z4$59jw8FC" role="3clF46">
-        <property role="TrG5h" value="getter" />
-        <node concept="3uibUv" id="1z4$59jwb$Y" role="1tU5fm">
-          <ref role="3uigEE" to="82uw:~Function" resolve="Function" />
-          <node concept="3uibUv" id="1z4$59jwduz" role="11_B2D">
-            <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-          </node>
-          <node concept="16syzq" id="1z4$59jwdXF" role="11_B2D">
-            <ref role="16sUi3" node="1z4$59jw2yB" resolve="T" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="1z4$59jwe4J" role="3clF46">
+    <node concept="2tJIrI" id="4Dkptq1Q4Fm" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVqV_s" role="jymVt">
+      <property role="TrG5h" value="updateSharedCachedData" />
+      <node concept="37vLTG" id="7Aoa2yVqV_v" role="3clF46">
         <property role="TrG5h" value="updater" />
-        <node concept="3uibUv" id="1z4$59jwgdF" role="1tU5fm">
-          <ref role="3uigEE" to="82uw:~Function" resolve="Function" />
-          <node concept="3uibUv" id="1z4$59jwh5X" role="11_B2D">
-            <ref role="3uigEE" node="4Dkptq1Qcxp" resolve="CacheUpdatable" />
+        <node concept="3uibUv" id="7Aoa2yVqV_w" role="1tU5fm">
+          <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+          <node concept="3uibUv" id="7Aoa2yVqV_x" role="11_B2D">
+            <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
           </node>
-          <node concept="3uibUv" id="1z4$59jwiuK" role="11_B2D">
-            <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+          <node concept="3uibUv" id="7Aoa2yVqV_y" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
           </node>
         </node>
       </node>
-      <node concept="16syzq" id="1z4$59jw6Ag" role="3clF45">
-        <ref role="16sUi3" node="1z4$59jw2yB" resolve="T" />
-      </node>
-      <node concept="3Tmbuc" id="1z4$59jvXjJ" role="1B3o_S" />
-      <node concept="3clFbS" id="1z4$59jvV_F" role="3clF47">
-        <node concept="3cpWs8" id="1z4$59jwiUO" role="3cqZAp">
-          <node concept="3cpWsn" id="1z4$59jwiUP" role="3cpWs9">
+      <node concept="3cqZAl" id="7Aoa2yVqV_z" role="3clF45" />
+      <node concept="3clFbS" id="7Aoa2yVqV_$" role="3clF47">
+        <node concept="3cpWs8" id="7Aoa2yVqV__" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVqV_A" role="3cpWs9">
             <property role="TrG5h" value="holder" />
             <property role="3TUv4t" value="true" />
-            <node concept="3uibUv" id="1z4$59jwiUQ" role="1tU5fm">
+            <node concept="3uibUv" id="7Aoa2yVqV_B" role="1tU5fm">
               <ref role="3uigEE" node="4Z$O9mrQJw7" resolve="CacheHolder" />
             </node>
-            <node concept="37vLTw" id="1T5MAgPeHno" role="33vP2m">
+            <node concept="37vLTw" id="7Aoa2yVra6R" role="33vP2m">
               <ref role="3cqZAo" node="1T5MAgPeszY" resolve="sharedCacheHolder" />
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="7gMIJIy7ZRt" role="3cqZAp" />
-        <node concept="3cpWs8" id="7gMIJIy81We" role="3cqZAp">
-          <node concept="3cpWsn" id="7gMIJIy81Wf" role="3cpWs9">
-            <property role="TrG5h" value="result" />
-            <node concept="16syzq" id="7gMIJIy80Jl" role="1tU5fm">
-              <ref role="16sUi3" node="1z4$59jw2yB" resolve="T" />
-            </node>
-          </node>
-        </node>
-        <node concept="3SKdUt" id="1z4$59jwiUV" role="3cqZAp">
-          <node concept="1PaTwC" id="1z4$59jwiUW" role="1aUNEU">
-            <node concept="3oM_SD" id="1z4$59jwiUX" role="1PaTwD">
+        <node concept="3clFbH" id="7Aoa2yVqV_E" role="3cqZAp" />
+        <node concept="3SKdUt" id="7Aoa2yVqV_F" role="3cqZAp">
+          <node concept="1PaTwC" id="7Aoa2yVqV_G" role="1aUNEU">
+            <node concept="3oM_SD" id="7Aoa2yVqV_H" role="1PaTwD">
               <property role="3oM_SC" value="get" />
             </node>
-            <node concept="3oM_SD" id="1z4$59jwiUY" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVqV_I" role="1PaTwD">
               <property role="3oM_SC" value="a" />
             </node>
-            <node concept="3oM_SD" id="1z4$59jwiUZ" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVqV_J" role="1PaTwD">
               <property role="3oM_SC" value="mutex" />
             </node>
-            <node concept="3oM_SD" id="1z4$59jwiV0" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVqV_K" role="1PaTwD">
               <property role="3oM_SC" value="on" />
             </node>
-            <node concept="3oM_SD" id="1z4$59jwiV1" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVqV_L" role="1PaTwD">
               <property role="3oM_SC" value="holder" />
             </node>
-            <node concept="3oM_SD" id="1z4$59jwiV2" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVqV_M" role="1PaTwD">
               <property role="3oM_SC" value="so" />
             </node>
-            <node concept="3oM_SD" id="1z4$59jwiV3" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVqV_N" role="1PaTwD">
               <property role="3oM_SC" value="that" />
             </node>
-            <node concept="3oM_SD" id="1z4$59jwiV4" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVqV_O" role="1PaTwD">
               <property role="3oM_SC" value="two" />
             </node>
-            <node concept="3oM_SD" id="1z4$59jwiV5" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVqV_P" role="1PaTwD">
               <property role="3oM_SC" value="update" />
             </node>
-            <node concept="3oM_SD" id="1z4$59jwiV6" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVqV_Q" role="1PaTwD">
               <property role="3oM_SC" value="sessions" />
             </node>
-            <node concept="3oM_SD" id="1z4$59jwiV7" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVqV_R" role="1PaTwD">
               <property role="3oM_SC" value="can't" />
             </node>
-            <node concept="3oM_SD" id="1z4$59jwiV8" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVqV_S" role="1PaTwD">
               <property role="3oM_SC" value="be" />
             </node>
-            <node concept="3oM_SD" id="1z4$59jwiV9" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVqV_T" role="1PaTwD">
               <property role="3oM_SC" value="run" />
             </node>
-            <node concept="3oM_SD" id="1z4$59jwiVa" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVqV_U" role="1PaTwD">
               <property role="3oM_SC" value="in" />
             </node>
-            <node concept="3oM_SD" id="1z4$59jwiVb" role="1PaTwD">
+            <node concept="3oM_SD" id="7Aoa2yVqV_V" role="1PaTwD">
               <property role="3oM_SC" value="parallel" />
             </node>
           </node>
         </node>
-        <node concept="1HWtB8" id="1z4$59jwiVc" role="3cqZAp">
-          <node concept="37vLTw" id="1z4$59jwiVd" role="1HWFw0">
-            <ref role="3cqZAo" node="1z4$59jwiUP" resolve="holder" />
+        <node concept="1HWtB8" id="7Aoa2yVqV_W" role="3cqZAp">
+          <node concept="37vLTw" id="7Aoa2yVqV_X" role="1HWFw0">
+            <ref role="3cqZAo" node="7Aoa2yVqV_A" resolve="holder" />
           </node>
-          <node concept="3clFbS" id="1z4$59jwiVe" role="1HWHxc">
-            <node concept="3cpWs8" id="1z4$59jwZvJ" role="3cqZAp">
-              <node concept="3cpWsn" id="1z4$59jwZvK" role="3cpWs9">
-                <property role="TrG5h" value="cache" />
-                <node concept="3uibUv" id="1z4$59jwYfy" role="1tU5fm">
-                  <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+          <node concept="3clFbS" id="7Aoa2yVqV_Y" role="1HWHxc">
+            <node concept="3clFbF" id="7Aoa2yVqV_Z" role="3cqZAp">
+              <node concept="2OqwBi" id="7Aoa2yVqVA0" role="3clFbG">
+                <node concept="37vLTw" id="7Aoa2yVqVA1" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7Aoa2yVqV_A" resolve="holder" />
                 </node>
-                <node concept="2OqwBi" id="1z4$59jwZvL" role="33vP2m">
-                  <node concept="37vLTw" id="1z4$59jwZvM" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1z4$59jwiUP" resolve="holder" />
+                <node concept="liA8E" id="7Aoa2yVqVA2" role="2OqNvi">
+                  <ref role="37wK5l" node="7Aoa2yVj0AN" resolve="updateCachedData" />
+                  <node concept="37vLTw" id="7Aoa2yVqVA3" role="37wK5m">
+                    <ref role="3cqZAo" node="7Aoa2yVqV_v" resolve="updater" />
                   </node>
-                  <node concept="liA8E" id="1z4$59jwZvN" role="2OqNvi">
-                    <ref role="37wK5l" node="5AFANm9Mi2l" resolve="getCache" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="1z4$59jx5Js" role="3cqZAp">
-              <node concept="3clFbS" id="1z4$59jx5Ju" role="3clFbx">
-                <node concept="3cpWs8" id="1z4$59jwNwO" role="3cqZAp">
-                  <node concept="3cpWsn" id="1z4$59jwNwP" role="3cpWs9">
-                    <property role="TrG5h" value="t" />
-                    <node concept="16syzq" id="1z4$59jwNrN" role="1tU5fm">
-                      <ref role="16sUi3" node="1z4$59jw2yB" resolve="T" />
-                    </node>
-                    <node concept="2OqwBi" id="1z4$59jwNwQ" role="33vP2m">
-                      <node concept="37vLTw" id="1z4$59jwNwR" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1z4$59jw8FC" resolve="getter" />
-                      </node>
-                      <node concept="liA8E" id="1z4$59jwNwS" role="2OqNvi">
-                        <ref role="37wK5l" to="82uw:~Function.apply(java.lang.Object)" resolve="apply" />
-                        <node concept="37vLTw" id="1z4$59jwZvO" role="37wK5m">
-                          <ref role="3cqZAo" node="1z4$59jwZvK" resolve="cache" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="1z4$59jwQW_" role="3cqZAp">
-                  <node concept="3clFbS" id="1z4$59jwQWR" role="3clFbx">
-                    <node concept="3cpWs6" id="1z4$59jwT6B" role="3cqZAp">
-                      <node concept="37vLTw" id="1z4$59jwTOa" role="3cqZAk">
-                        <ref role="3cqZAo" node="1z4$59jwNwP" resolve="t" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3y3z36" id="1z4$59jwQNt" role="3clFbw">
-                    <node concept="10Nm6u" id="1z4$59jwQRj" role="3uHU7w" />
-                    <node concept="37vLTw" id="1z4$59jwNwU" role="3uHU7B">
-                      <ref role="3cqZAo" node="1z4$59jwNwP" resolve="t" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3y3z36" id="1z4$59jx8Ng" role="3clFbw">
-                <node concept="10Nm6u" id="1z4$59jx9AM" role="3uHU7w" />
-                <node concept="37vLTw" id="1z4$59jx8DN" role="3uHU7B">
-                  <ref role="3cqZAo" node="1z4$59jwZvK" resolve="cache" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="1z4$59jwiUU" role="3cqZAp" />
-            <node concept="3clFbF" id="1z4$59jxlvo" role="3cqZAp">
-              <node concept="37vLTI" id="1z4$59jxlvq" role="3clFbG">
-                <node concept="1rXfSq" id="1z4$59jxifb" role="37vLTx">
-                  <ref role="37wK5l" node="61G6TdDl9fp" resolve="updateCache" />
-                  <node concept="37vLTw" id="1z4$59jxifc" role="37wK5m">
-                    <ref role="3cqZAo" node="1z4$59jwiUP" resolve="holder" />
-                  </node>
-                  <node concept="37vLTw" id="1z4$59jxifd" role="37wK5m">
-                    <ref role="3cqZAo" node="1z4$59jwe4J" resolve="updater" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="1z4$59jxoEJ" role="37vLTJ">
-                  <ref role="3cqZAo" node="1z4$59jwZvK" resolve="cache" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="7gMIJIy83EG" role="3cqZAp">
-              <node concept="37vLTI" id="7gMIJIy83EI" role="3clFbG">
-                <node concept="2OqwBi" id="7gMIJIy81Wg" role="37vLTx">
-                  <node concept="37vLTw" id="7gMIJIy81Wh" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1z4$59jw8FC" resolve="getter" />
-                  </node>
-                  <node concept="liA8E" id="7gMIJIy81Wi" role="2OqNvi">
-                    <ref role="37wK5l" to="82uw:~Function.apply(java.lang.Object)" resolve="apply" />
-                    <node concept="37vLTw" id="7gMIJIy81Wj" role="37wK5m">
-                      <ref role="3cqZAo" node="1z4$59jwZvK" resolve="cache" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="7gMIJIy83EM" role="37vLTJ">
-                  <ref role="3cqZAo" node="7gMIJIy81Wf" resolve="result" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="1z4$59jxDN6" role="3cqZAp" />
-        <node concept="3cpWs6" id="1z4$59jwiVf" role="3cqZAp">
-          <node concept="37vLTw" id="7gMIJIy81Wk" role="3cqZAk">
-            <ref role="3cqZAo" node="7gMIJIy81Wf" resolve="result" />
-          </node>
+      </node>
+      <node concept="P$JXv" id="7Aoa2yVqVA4" role="lGtFl">
+        <node concept="TZ5HA" id="7Aoa2yVqVA5" role="TZ5H$">
+          <node concept="1dT_AC" id="7Aoa2yVqVA6" role="1dT_Ay" />
         </node>
       </node>
-      <node concept="16euLQ" id="1z4$59jw2yB" role="16eVyc">
-        <property role="TrG5h" value="T" />
-      </node>
+      <node concept="3Tm1VV" id="7Aoa2yVqVA7" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="3OUB6BAOeij" role="jymVt" />
+    <node concept="2tJIrI" id="7Aoa2yVqV_r" role="jymVt" />
     <node concept="3clFb_" id="5HVB6JS1Tc9" role="jymVt">
       <property role="TrG5h" value="clearAllCaches" />
       <node concept="3cqZAl" id="5HVB6JS1Tcb" role="3clF45" />
@@ -9014,7 +6151,7 @@
                       <ref role="3cqZAo" node="7Mte5SKj5zG" resolve="holder" />
                     </node>
                     <node concept="liA8E" id="7Mte5SKj7mb" role="2OqNvi">
-                      <ref role="37wK5l" node="3u5wJtfjHf" resolve="clearAll" />
+                      <ref role="37wK5l" node="5MNibEMYjj8" resolve="clearAllData" />
                     </node>
                   </node>
                 </node>
@@ -9033,7 +6170,7 @@
               <ref role="3cqZAo" node="1T5MAgPeszY" resolve="sharedCacheHolder" />
             </node>
             <node concept="liA8E" id="1RYTbd7__7C" role="2OqNvi">
-              <ref role="37wK5l" node="3u5wJtfjHf" resolve="clearAll" />
+              <ref role="37wK5l" node="5MNibEMYjj8" resolve="clearAllData" />
             </node>
           </node>
         </node>
@@ -9088,7 +6225,7 @@
                           <ref role="3cqZAo" node="4duYm8_ndvB" resolve="holder" />
                         </node>
                         <node concept="liA8E" id="4duYm8_ndvL" role="2OqNvi">
-                          <ref role="37wK5l" node="3u5wJtfjHf" resolve="clearAll" />
+                          <ref role="37wK5l" node="5MNibEMYjj8" resolve="clearAllData" />
                         </node>
                       </node>
                     </node>
@@ -9126,154 +6263,6 @@
       <node concept="3Tm1VV" id="1RYTbd7EJns" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="5HVB6JRqPto" role="jymVt" />
-    <node concept="3clFb_" id="61G6TdDl9fp" role="jymVt">
-      <property role="TrG5h" value="updateCache" />
-      <node concept="37vLTG" id="61G6TdDlDMs" role="3clF46">
-        <property role="TrG5h" value="holder" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="61G6TdDlI1s" role="1tU5fm">
-          <ref role="3uigEE" node="4Z$O9mrQJw7" resolve="CacheHolder" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="61G6TdDlN8B" role="3clF46">
-        <property role="TrG5h" value="updater" />
-        <node concept="3uibUv" id="61G6TdDlN8C" role="1tU5fm">
-          <ref role="3uigEE" to="82uw:~Function" resolve="Function" />
-          <node concept="3uibUv" id="61G6TdDlN8D" role="11_B2D">
-            <ref role="3uigEE" node="4Dkptq1Qcxp" resolve="CacheUpdatable" />
-          </node>
-          <node concept="3uibUv" id="61G6TdDlN8E" role="11_B2D">
-            <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="61G6TdDlvlw" role="3clF45">
-        <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-      </node>
-      <node concept="3Tm6S6" id="61G6TdDllRx" role="1B3o_S" />
-      <node concept="3clFbS" id="61G6TdDl9ft" role="3clF47">
-        <node concept="3clFbF" id="61G6TdDm7MC" role="3cqZAp">
-          <node concept="2OqwBi" id="61G6TdDlW3K" role="3clFbG">
-            <node concept="37vLTw" id="61G6TdDlW3L" role="2Oq$k0">
-              <ref role="3cqZAo" node="61G6TdDlN8B" resolve="updater" />
-            </node>
-            <node concept="liA8E" id="61G6TdDlW3M" role="2OqNvi">
-              <ref role="37wK5l" to="82uw:~Function.apply(java.lang.Object)" resolve="apply" />
-              <node concept="2ShNRf" id="61G6TdDlW3N" role="37wK5m">
-                <node concept="YeOm9" id="61G6TdDlW3O" role="2ShVmc">
-                  <node concept="1Y3b0j" id="61G6TdDlW3P" role="YeSDq">
-                    <property role="2bfB8j" value="true" />
-                    <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                    <ref role="1Y3XeK" node="4Dkptq1Qcxp" resolve="CacheUpdatable" />
-                    <node concept="3Tm1VV" id="61G6TdDlW3Q" role="1B3o_S" />
-                    <node concept="2tJIrI" id="61G6TdDlW3R" role="jymVt" />
-                    <node concept="3clFb_" id="61G6TdDlW3S" role="jymVt">
-                      <property role="TrG5h" value="cacheHolder" />
-                      <node concept="3uibUv" id="61G6TdDlW3T" role="3clF45">
-                        <ref role="3uigEE" node="4Z$O9mrQJw7" resolve="CacheHolder" />
-                      </node>
-                      <node concept="3Tm1VV" id="61G6TdDlW3U" role="1B3o_S" />
-                      <node concept="3clFbS" id="61G6TdDlW3V" role="3clF47">
-                        <node concept="3clFbF" id="61G6TdDlW3W" role="3cqZAp">
-                          <node concept="37vLTw" id="61G6TdDlW3X" role="3clFbG">
-                            <ref role="3cqZAo" node="61G6TdDlDMs" resolve="holder" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2AHcQZ" id="61G6TdDlW3Y" role="2AJF6D">
-                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                      </node>
-                    </node>
-                    <node concept="2tJIrI" id="61G6TdDlW3Z" role="jymVt" />
-                    <node concept="3clFb_" id="61G6TdDlW4M" role="jymVt">
-                      <property role="TrG5h" value="update" />
-                      <node concept="37vLTG" id="61G6TdDlW4N" role="3clF46">
-                        <property role="TrG5h" value="action" />
-                        <node concept="3uibUv" id="61G6TdDlW4O" role="1tU5fm">
-                          <ref role="3uigEE" to="82uw:~Consumer" resolve="Consumer" />
-                          <node concept="3uibUv" id="1z4$59jrRs6" role="11_B2D">
-                            <ref role="3uigEE" node="1z4$59jqeoH" resolve="TypecheckingResultsCache.Update" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3uibUv" id="61G6TdDlW4Q" role="3clF45">
-                        <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-                      </node>
-                      <node concept="3Tm1VV" id="61G6TdDlW4R" role="1B3o_S" />
-                      <node concept="3clFbS" id="61G6TdDlW4S" role="3clF47">
-                        <node concept="3cpWs8" id="61G6TdDlW4T" role="3cqZAp">
-                          <node concept="3cpWsn" id="61G6TdDlW4U" role="3cpWs9">
-                            <property role="TrG5h" value="updatedCache" />
-                            <node concept="3uibUv" id="61G6TdDlW4V" role="1tU5fm">
-                              <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-                            </node>
-                            <node concept="2OqwBi" id="61G6TdDlW4W" role="33vP2m">
-                              <node concept="37vLTw" id="61G6TdDlW4X" role="2Oq$k0">
-                                <ref role="3cqZAo" node="61G6TdDlDMs" resolve="holder" />
-                              </node>
-                              <node concept="liA8E" id="61G6TdDlW4Y" role="2OqNvi">
-                                <ref role="37wK5l" node="5Qx6_65_i3k" resolve="updateCache" />
-                                <node concept="2ShNRf" id="55xYlrlA2kc" role="37wK5m">
-                                  <node concept="1pGfFk" id="55xYlrlA2kd" role="2ShVmc">
-                                    <ref role="37wK5l" node="5cBWTAejXzY" resolve="TypecheckingResultsCache" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbH" id="61G6TdDlW56" role="3cqZAp" />
-                        <node concept="3SKdUt" id="61G6TdDlW57" role="3cqZAp">
-                          <node concept="1PaTwC" id="61G6TdDlW58" role="1aUNEU">
-                            <node concept="3oM_SD" id="61G6TdDlW59" role="1PaTwD">
-                              <property role="3oM_SC" value="TODO:" />
-                            </node>
-                            <node concept="3oM_SD" id="61G6TdDlW5a" role="1PaTwD">
-                              <property role="3oM_SC" value="catch" />
-                            </node>
-                            <node concept="3oM_SD" id="61G6TdDlW5b" role="1PaTwD">
-                              <property role="3oM_SC" value="errors" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="61G6TdDlW5c" role="3cqZAp">
-                          <node concept="2OqwBi" id="61G6TdDlW5d" role="3clFbG">
-                            <node concept="37vLTw" id="61G6TdDlW5e" role="2Oq$k0">
-                              <ref role="3cqZAo" node="61G6TdDlW4N" resolve="action" />
-                            </node>
-                            <node concept="liA8E" id="61G6TdDlW5f" role="2OqNvi">
-                              <ref role="37wK5l" to="82uw:~Consumer.accept(java.lang.Object)" resolve="accept" />
-                              <node concept="2OqwBi" id="1z4$59jrRR4" role="37wK5m">
-                                <node concept="37vLTw" id="61G6TdDlW5g" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="61G6TdDlW4U" resolve="updatedCache" />
-                                </node>
-                                <node concept="liA8E" id="1z4$59jrS3x" role="2OqNvi">
-                                  <ref role="37wK5l" node="1z4$59jrfhG" resolve="update" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbH" id="55xYlrlA4tO" role="3cqZAp" />
-                        <node concept="3clFbF" id="61G6TdDlW5o" role="3cqZAp">
-                          <node concept="37vLTw" id="61G6TdDlW5p" role="3clFbG">
-                            <ref role="3cqZAo" node="61G6TdDlW4U" resolve="updatedCache" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2AHcQZ" id="61G6TdDlW5q" role="2AJF6D">
-                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="61G6TdDmge$" role="jymVt" />
     <node concept="3clFb_" id="61G6TdC33Bp" role="jymVt">
       <property role="TrG5h" value="getOrCreateUnitCacheHolder" />
       <node concept="37vLTG" id="61G6TdC33Bq" role="3clF46">
@@ -9517,52 +6506,47 @@
       <node concept="3clFbS" id="4Z$O9mrTmmj" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="4Z$O9mrTm$z" role="jymVt" />
-    <node concept="3clFb_" id="5AFANm9Mi2l" role="jymVt">
-      <property role="TrG5h" value="getCache" />
-      <node concept="3uibUv" id="5AFANm9Miw_" role="3clF45">
-        <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+    <node concept="3clFb_" id="7Aoa2yVBu8W" role="jymVt">
+      <property role="TrG5h" value="getCachedData" />
+      <node concept="3uibUv" id="7Aoa2yVBvcP" role="3clF45">
+        <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
       </node>
-      <node concept="3Tm1VV" id="5AFANm9Mi2o" role="1B3o_S" />
-      <node concept="3clFbS" id="5AFANm9Mi2p" role="3clF47">
-        <node concept="3clFbF" id="17DrR$SYNQi" role="3cqZAp">
-          <node concept="37vLTw" id="17DrR$SYNQg" role="3clFbG">
-            <ref role="3cqZAo" node="4Z$O9mrQJ$h" resolve="cache" />
+      <node concept="3Tm1VV" id="7Aoa2yVBu8Z" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVBu90" role="3clF47">
+        <node concept="3clFbF" id="7Aoa2yVBwIW" role="3cqZAp">
+          <node concept="37vLTw" id="7Aoa2yVBwIV" role="3clFbG">
+            <ref role="3cqZAo" node="51a$_pPNotH" resolve="cachedData" />
+          </node>
+        </node>
+      </node>
+      <node concept="P$JXv" id="7Aoa2yVBw7s" role="lGtFl">
+        <node concept="TZ5HA" id="7Aoa2yVBw7t" role="TZ5H$">
+          <node concept="1dT_AC" id="7Aoa2yVBw7u" role="1dT_Ay">
+            <property role="1dT_AB" value="FIXME used from tests" />
           </node>
         </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4Z$O9mrQJI7" role="jymVt" />
     <node concept="3clFb_" id="At0yqMWnw7" role="jymVt">
-      <property role="TrG5h" value="isCacheUpToDate" />
+      <property role="TrG5h" value="isCachedDataCurrent" />
       <node concept="10P_77" id="At0yqMWoXs" role="3clF45" />
       <node concept="3clFbS" id="At0yqMWnwa" role="3clF47">
-        <node concept="3clFbF" id="At0yqMWqe8" role="3cqZAp">
-          <node concept="3fqX7Q" id="At0yqN0ZAY" role="3clFbG">
-            <node concept="2OqwBi" id="At0yqN0ZB0" role="3fr31v">
-              <node concept="2OqwBi" id="At0yqN0ZB1" role="2Oq$k0">
-                <node concept="37vLTw" id="At0yqN0ZB2" role="2Oq$k0">
-                  <ref role="3cqZAo" node="51a$_pPNotH" resolve="uniqueKey2data" />
-                </node>
-                <node concept="T8wYR" id="At0yqN0ZB3" role="2OqNvi" />
+        <node concept="3clFbF" id="7Aoa2yV4JxQ" role="3cqZAp">
+          <node concept="1Wc70l" id="7Aoa2yViVs9" role="3clFbG">
+            <node concept="3y3z36" id="7Aoa2yViVUQ" role="3uHU7B">
+              <node concept="10Nm6u" id="7Aoa2yViW8D" role="3uHU7w" />
+              <node concept="37vLTw" id="7Aoa2yViVCG" role="3uHU7B">
+                <ref role="3cqZAo" node="51a$_pPNotH" resolve="cachedData" />
               </node>
-              <node concept="2HwmR7" id="At0yqN0ZB4" role="2OqNvi">
-                <node concept="1bVj0M" id="At0yqN0ZB5" role="23t8la">
-                  <node concept="3clFbS" id="At0yqN0ZB6" role="1bW5cS">
-                    <node concept="3clFbF" id="At0yqN0ZB7" role="3cqZAp">
-                      <node concept="2OqwBi" id="At0yqN0ZB8" role="3clFbG">
-                        <node concept="37vLTw" id="At0yqN0ZB9" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6E5fMGvfKS8" resolve="it" />
-                        </node>
-                        <node concept="liA8E" id="At0yqN0ZBa" role="2OqNvi">
-                          <ref role="37wK5l" node="At0yqMRQt2" resolve="anyNeedsUpdate" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="gl6BB" id="6E5fMGvfKS8" role="1bW2Oz">
-                    <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6E5fMGvfKS9" role="1tU5fm" />
-                  </node>
+            </node>
+            <node concept="3fqX7Q" id="7Aoa2yV4KB2" role="3uHU7w">
+              <node concept="2OqwBi" id="7Aoa2yV4KB4" role="3fr31v">
+                <node concept="37vLTw" id="7Aoa2yV4KB5" role="2Oq$k0">
+                  <ref role="3cqZAo" node="51a$_pPNotH" resolve="cachedData" />
+                </node>
+                <node concept="liA8E" id="7Aoa2yV4KB6" role="2OqNvi">
+                  <ref role="37wK5l" node="At0yqMRQt2" resolve="anyNeedsUpdate" />
                 </node>
               </node>
             </node>
@@ -9572,266 +6556,122 @@
       <node concept="3Tm1VV" id="At0yqMWoKC" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="At0yqMWlVE" role="jymVt" />
-    <node concept="3clFb_" id="5Qx6_65_i3k" role="jymVt">
-      <property role="TrG5h" value="updateCache" />
-      <node concept="37vLTG" id="6b6o3l3huA6" role="3clF46">
-        <property role="TrG5h" value="newCache" />
-        <node concept="3uibUv" id="6b6o3l3huRk" role="1tU5fm">
-          <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+    <node concept="3clFb_" id="7Aoa2yVj0AN" role="jymVt">
+      <property role="TrG5h" value="updateCachedData" />
+      <node concept="37vLTG" id="7Aoa2yVj1Iv" role="3clF46">
+        <property role="TrG5h" value="updater" />
+        <node concept="3uibUv" id="7Aoa2yVj1T_" role="1tU5fm">
+          <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+          <node concept="3uibUv" id="7Aoa2yVj1VV" role="11_B2D">
+            <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
+          </node>
+          <node concept="3uibUv" id="7Aoa2yVjDdE" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+          </node>
         </node>
       </node>
-      <node concept="3uibUv" id="5Qx6_65_i3t" role="3clF45">
-        <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-      </node>
-      <node concept="3Tm1VV" id="5Qx6_65_i3u" role="1B3o_S" />
-      <node concept="3clFbS" id="5Qx6_65_i3v" role="3clF47">
-        <node concept="3clFbJ" id="5Qx6_65_i3_" role="3cqZAp">
-          <node concept="3y3z36" id="5Qx6_65_i3A" role="3clFbw">
-            <node concept="37vLTw" id="5Qx6_65_i3B" role="3uHU7B">
-              <ref role="3cqZAo" node="4Z$O9mrQJ$h" resolve="cache" />
-            </node>
-            <node concept="10Nm6u" id="5Qx6_65_i3C" role="3uHU7w" />
-          </node>
-          <node concept="3clFbS" id="5Qx6_65_i3D" role="3clFbx">
-            <node concept="3clFbF" id="61G6TdDvszX" role="3cqZAp">
-              <node concept="2OqwBi" id="61G6TdDvszY" role="3clFbG">
-                <node concept="37vLTw" id="6b6o3l3hxRD" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6b6o3l3huA6" resolve="newCache" />
-                </node>
-                <node concept="liA8E" id="61G6TdDvs$0" role="2OqNvi">
-                  <ref role="37wK5l" node="61G6TdDuZzD" resolve="merge" />
-                  <node concept="2OqwBi" id="61G6TdDvs$2" role="37wK5m">
-                    <node concept="Xjq3P" id="61G6TdDvs$3" role="2Oq$k0" />
-                    <node concept="2OwXpG" id="61G6TdDvs$4" role="2OqNvi">
-                      <ref role="2Oxat5" node="4Z$O9mrQJ$h" resolve="cache" />
-                    </node>
-                  </node>
-                </node>
+      <node concept="3cqZAl" id="7Aoa2yVj0AP" role="3clF45" />
+      <node concept="3clFbS" id="7Aoa2yVj0AQ" role="3clF47">
+        <node concept="3cpWs8" id="7Aoa2yVjDFS" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVjDFT" role="3cpWs9">
+            <property role="TrG5h" value="fresh" />
+            <node concept="10P_77" id="7Aoa2yVjDxI" role="1tU5fm" />
+            <node concept="3clFbC" id="7Aoa2yVjDFU" role="33vP2m">
+              <node concept="10Nm6u" id="7Aoa2yVjDFV" role="3uHU7w" />
+              <node concept="37vLTw" id="7Aoa2yVjDFW" role="3uHU7B">
+                <ref role="3cqZAo" node="51a$_pPNotH" resolve="cachedData" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="5Qx6_65_i3V" role="3cqZAp">
-          <node concept="37vLTI" id="5Qx6_65_i3W" role="3clFbG">
-            <node concept="37vLTw" id="6b6o3l3hy1N" role="37vLTx">
-              <ref role="3cqZAo" node="6b6o3l3huA6" resolve="newCache" />
-            </node>
-            <node concept="2OqwBi" id="5Qx6_65_i3Y" role="37vLTJ">
-              <node concept="Xjq3P" id="5Qx6_65_i3Z" role="2Oq$k0" />
-              <node concept="2OwXpG" id="5Qx6_65_i40" role="2OqNvi">
-                <ref role="2Oxat5" node="4Z$O9mrQJ$h" resolve="cache" />
-              </node>
-            </node>
+        <node concept="3clFbJ" id="7Aoa2yVj216" role="3cqZAp">
+          <node concept="37vLTw" id="7Aoa2yVjDFX" role="3clFbw">
+            <ref role="3cqZAo" node="7Aoa2yVjDFT" resolve="b" />
           </node>
-        </node>
-        <node concept="3cpWs6" id="5Qx6_65_i4t" role="3cqZAp">
-          <node concept="37vLTw" id="5Qx6_65_i4u" role="3cqZAk">
-            <ref role="3cqZAo" node="4Z$O9mrQJ$h" resolve="cache" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5Qx6_65_i3j" role="jymVt" />
-    <node concept="3clFb_" id="3u5wJtfjHf" role="jymVt">
-      <property role="TrG5h" value="clearAll" />
-      <node concept="3cqZAl" id="3u5wJtfjHh" role="3clF45" />
-      <node concept="3clFbS" id="3u5wJtfjHj" role="3clF47">
-        <node concept="3clFbF" id="3u5wJtf$1F" role="3cqZAp">
-          <node concept="1rXfSq" id="3u5wJtf$1E" role="3clFbG">
-            <ref role="37wK5l" node="3u5wJtfdzL" resolve="clearCache" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="3UgiLeDlxom" role="3cqZAp">
-          <node concept="1rXfSq" id="5MNibEMYmSq" role="3clFbG">
-            <ref role="37wK5l" node="5MNibEMYjj8" resolve="clearAllData" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5AFANm9MbpT" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="3Q0j2bxyoD3" role="jymVt" />
-    <node concept="3clFb_" id="51a$_pPOadR" role="jymVt">
-      <property role="TrG5h" value="getCachedData" />
-      <node concept="37vLTG" id="5MNibEMV_XT" role="3clF46">
-        <property role="TrG5h" value="uniqueKey" />
-        <node concept="3uibUv" id="565UPcqrL6X" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="51a$_pPOadU" role="3clF47">
-        <node concept="3clFbJ" id="7i3KM7g2uqH" role="3cqZAp">
-          <node concept="3clFbS" id="7i3KM7g2uqJ" role="3clFbx">
-            <node concept="3clFbF" id="7i3KM7g2vX5" role="3cqZAp">
-              <node concept="37vLTI" id="7i3KM7g2wlo" role="3clFbG">
-                <node concept="2ShNRf" id="7i3KM7g2wy8" role="37vLTx">
-                  <node concept="HV5vD" id="7i3KM7g2znE" role="2ShVmc">
+          <node concept="3clFbS" id="7Aoa2yVj218" role="3clFbx">
+            <node concept="3clFbF" id="7Aoa2yVj2Ua" role="3cqZAp">
+              <node concept="37vLTI" id="7Aoa2yVjmr1" role="3clFbG">
+                <node concept="2ShNRf" id="7Aoa2yVjmCh" role="37vLTx">
+                  <node concept="HV5vD" id="7Aoa2yVjquH" role="2ShVmc">
+                    <property role="373rjd" value="true" />
                     <ref role="HV5vE" node="7i3KM7g1Hnp" resolve="CachedData" />
                   </node>
                 </node>
-                <node concept="3EllGN" id="7i3KM7g2vX6" role="37vLTJ">
-                  <node concept="37vLTw" id="565UPcqrYAB" role="3ElVtu">
-                    <ref role="3cqZAo" node="5MNibEMV_XT" resolve="uniqueKey" />
-                  </node>
-                  <node concept="2OqwBi" id="7i3KM7g2vXa" role="3ElQJh">
-                    <node concept="Xjq3P" id="7i3KM7g2vXb" role="2Oq$k0" />
-                    <node concept="2OwXpG" id="7i3KM7g2vXc" role="2OqNvi">
-                      <ref role="2Oxat5" node="51a$_pPNotH" resolve="uniqueKey2data" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3fqX7Q" id="7i3KM7g2utr" role="3clFbw">
-            <node concept="2OqwBi" id="7i3KM7g2uYo" role="3fr31v">
-              <node concept="37vLTw" id="7i3KM7g2uws" role="2Oq$k0">
-                <ref role="3cqZAo" node="51a$_pPNotH" resolve="uniqueKey2data" />
-              </node>
-              <node concept="2Nt0df" id="7i3KM7g2vqa" role="2OqNvi">
-                <node concept="37vLTw" id="565UPcqrYtQ" role="38cxEo">
-                  <ref role="3cqZAo" node="5MNibEMV_XT" resolve="uniqueKey" />
+                <node concept="37vLTw" id="7Aoa2yVj2U9" role="37vLTJ">
+                  <ref role="3cqZAo" node="51a$_pPNotH" resolve="cachedData" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="51a$_pPOdBP" role="3cqZAp">
-          <node concept="3EllGN" id="5MNibEMVBtV" role="3clFbG">
-            <node concept="37vLTw" id="565UPcqrYIr" role="3ElVtu">
-              <ref role="3cqZAo" node="5MNibEMV_XT" resolve="uniqueKey" />
+        <node concept="3clFbF" id="7Aoa2yVjqQC" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVjrvc" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVjqQA" role="2Oq$k0">
+              <ref role="3cqZAo" node="7Aoa2yVj1Iv" resolve="updater" />
             </node>
-            <node concept="2OqwBi" id="51a$_pPOdQj" role="3ElQJh">
-              <node concept="Xjq3P" id="51a$_pPOdBO" role="2Oq$k0" />
-              <node concept="2OwXpG" id="51a$_pPOdVX" role="2OqNvi">
-                <ref role="2Oxat5" node="51a$_pPNotH" resolve="uniqueKey2data" />
+            <node concept="liA8E" id="7Aoa2yVjrXN" role="2OqNvi">
+              <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
+              <node concept="37vLTw" id="7Aoa2yVjscb" role="37wK5m">
+                <ref role="3cqZAo" node="51a$_pPNotH" resolve="cachedData" />
+              </node>
+              <node concept="37vLTw" id="7Aoa2yVjEn6" role="37wK5m">
+                <ref role="3cqZAo" node="7Aoa2yVjDFT" resolve="fresh" />
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="5AFANm9McNh" role="1B3o_S" />
-      <node concept="3uibUv" id="7i3KM7g2kN8" role="3clF45">
-        <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
-      </node>
+      <node concept="3Tmbuc" id="7Aoa2yVAyWe" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="565UPcqrAiu" role="jymVt" />
+    <node concept="2tJIrI" id="5Qx6_65_i3j" role="jymVt" />
     <node concept="3clFb_" id="5MNibEMYjj8" role="jymVt">
       <property role="TrG5h" value="clearAllData" />
       <node concept="3cqZAl" id="5MNibEMYjja" role="3clF45" />
       <node concept="3clFbS" id="5MNibEMYjjb" role="3clF47">
-        <node concept="3clFbF" id="7i3KM7g2gWj" role="3cqZAp">
-          <node concept="2OqwBi" id="7i3KM7g2i0J" role="3clFbG">
-            <node concept="2OqwBi" id="7i3KM7g2hkt" role="2Oq$k0">
-              <node concept="37vLTw" id="7i3KM7g2gWh" role="2Oq$k0">
-                <ref role="3cqZAo" node="51a$_pPNotH" resolve="uniqueKey2data" />
-              </node>
-              <node concept="T8wYR" id="7i3KM7g2hIP" role="2OqNvi" />
-            </node>
-            <node concept="2es0OD" id="7i3KM7g2iiI" role="2OqNvi">
-              <node concept="1bVj0M" id="7i3KM7g2iiK" role="23t8la">
-                <node concept="3clFbS" id="7i3KM7g2iiL" role="1bW5cS">
-                  <node concept="3clFbF" id="7i3KM7g2ilG" role="3cqZAp">
-                    <node concept="2OqwBi" id="7i3KM7g2iun" role="3clFbG">
-                      <node concept="37vLTw" id="7i3KM7g2ilF" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6E5fMGvfKSa" resolve="it" />
-                      </node>
-                      <node concept="liA8E" id="7i3KM7g2iDH" role="2OqNvi">
-                        <ref role="37wK5l" node="7i3KM7g2fvr" resolve="clearAll" />
-                      </node>
-                    </node>
-                  </node>
+        <node concept="3clFbJ" id="7Aoa2yVjsOs" role="3cqZAp">
+          <node concept="3clFbS" id="7Aoa2yVjsOu" role="3clFbx">
+            <node concept="3clFbF" id="5MNibEMYms7" role="3cqZAp">
+              <node concept="2OqwBi" id="5MNibEMYmAk" role="3clFbG">
+                <node concept="37vLTw" id="5MNibEMYms6" role="2Oq$k0">
+                  <ref role="3cqZAo" node="51a$_pPNotH" resolve="cachedData" />
                 </node>
-                <node concept="gl6BB" id="6E5fMGvfKSa" role="1bW2Oz">
-                  <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6E5fMGvfKSb" role="1tU5fm" />
+                <node concept="liA8E" id="7Aoa2yV4J8_" role="2OqNvi">
+                  <ref role="37wK5l" node="7i3KM7g2fvr" resolve="clearAll" />
                 </node>
               </node>
             </node>
           </node>
-        </node>
-        <node concept="3clFbF" id="5MNibEMYms7" role="3cqZAp">
-          <node concept="2OqwBi" id="5MNibEMYmAk" role="3clFbG">
-            <node concept="37vLTw" id="5MNibEMYms6" role="2Oq$k0">
-              <ref role="3cqZAo" node="51a$_pPNotH" resolve="uniqueKey2data" />
+          <node concept="3y3z36" id="7Aoa2yVjtjk" role="3clFbw">
+            <node concept="10Nm6u" id="7Aoa2yVjtl7" role="3uHU7w" />
+            <node concept="37vLTw" id="7Aoa2yVjt14" role="3uHU7B">
+              <ref role="3cqZAo" node="51a$_pPNotH" resolve="cachedData" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7Aoa2yVju7v" role="3cqZAp">
+          <node concept="37vLTI" id="7Aoa2yVjuE7" role="3clFbG">
+            <node concept="10Nm6u" id="7Aoa2yVjuLA" role="37vLTx" />
+            <node concept="37vLTw" id="7Aoa2yVju7t" role="37vLTJ">
+              <ref role="3cqZAo" node="51a$_pPNotH" resolve="cachedData" />
             </node>
-            <node concept="1yHZxX" id="5MNibEMYmNG" role="2OqNvi" />
           </node>
         </node>
       </node>
-      <node concept="3Tm6S6" id="6Rg_jP6hRhb" role="1B3o_S" />
+      <node concept="3Tmbuc" id="7Aoa2yVAxFd" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="3Q0j2bxwOHx" role="jymVt" />
-    <node concept="3clFb_" id="3u5wJtfdzL" role="jymVt">
-      <property role="TrG5h" value="clearCache" />
-      <node concept="3cqZAl" id="3u5wJtfdzN" role="3clF45" />
-      <node concept="3Tm6S6" id="7gMIJIxsV25" role="1B3o_S" />
-      <node concept="3clFbS" id="3u5wJtfdzP" role="3clF47">
-        <node concept="3clFbJ" id="3u5wJtf6Zo" role="3cqZAp">
-          <node concept="3clFbS" id="3u5wJtf6Zq" role="3clFbx">
-            <node concept="3clFbF" id="4Z$O9mrSGzX" role="3cqZAp">
-              <node concept="2OqwBi" id="4Z$O9mrSGET" role="3clFbG">
-                <node concept="37vLTw" id="4Z$O9mrSGzW" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4Z$O9mrQJ$h" resolve="cache" />
-                </node>
-                <node concept="liA8E" id="4Z$O9mrT9b$" role="2OqNvi">
-                  <ref role="37wK5l" node="6QH_LDtcxgE" resolve="clear" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4Z$O9mrT$1w" role="3cqZAp">
-              <node concept="37vLTI" id="4Z$O9mrT$s8" role="3clFbG">
-                <node concept="10Nm6u" id="4Z$O9mrT$uW" role="37vLTx" />
-                <node concept="2OqwBi" id="4Z$O9mrT$a3" role="37vLTJ">
-                  <node concept="Xjq3P" id="4Z$O9mrT$1u" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="4Z$O9mrT$gv" role="2OqNvi">
-                    <ref role="2Oxat5" node="4Z$O9mrQJ$h" resolve="cache" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3y3z36" id="3u5wJtf7GF" role="3clFbw">
-            <node concept="10Nm6u" id="3u5wJtf7HU" role="3uHU7w" />
-            <node concept="37vLTw" id="3u5wJtf7u1" role="3uHU7B">
-              <ref role="3cqZAo" node="4Z$O9mrQJ$h" resolve="cache" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="hXo0G7uKWq" role="jymVt" />
-    <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="1FOQehxeuA4" role="1tU5fm">
-        <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-      </node>
-    </node>
     <node concept="312cEg" id="51a$_pPNotH" role="jymVt">
-      <property role="TrG5h" value="uniqueKey2data" />
+      <property role="TrG5h" value="cachedData" />
       <node concept="3Tm6S6" id="51a$_pPNne6" role="1B3o_S" />
-      <node concept="3rvAFt" id="5MNibEMVz9r" role="1tU5fm">
-        <node concept="3uibUv" id="5MNibEMVzne" role="3rvQeY">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-        <node concept="3uibUv" id="7i3KM7g2dhC" role="3rvSg0">
-          <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="5MNibEMV$Hc" role="33vP2m">
-        <node concept="3rGOSV" id="5MNibEMV$Db" role="2ShVmc">
-          <node concept="3uibUv" id="5MNibEMV$Dc" role="3rHrn6">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-          <node concept="3uibUv" id="7i3KM7g2dDC" role="3rHtpV">
-            <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
-          </node>
-        </node>
+      <node concept="3uibUv" id="7Aoa2yV4FKv" role="1tU5fm">
+        <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
       </node>
     </node>
+    <node concept="3Tm1VV" id="7Aoa2yVAzm2" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="7i3KM7g1Hnp">
     <property role="TrG5h" value="CachedData" />
+    <property role="3GE5qa" value="cache" />
     <node concept="2tJIrI" id="7i3KM7g1KUz" role="jymVt" />
     <node concept="3clFb_" id="At0yqMRQt2" role="jymVt">
       <property role="TrG5h" value="anyNeedsUpdate" />
@@ -9980,70 +6820,15 @@
       <node concept="16euLQ" id="7i3KM7g1Lla" role="16eVyc">
         <property role="TrG5h" value="V" />
       </node>
-    </node>
-    <node concept="2tJIrI" id="6nFpYlveRRd" role="jymVt" />
-    <node concept="3clFb_" id="6nFpYlveRCO" role="jymVt">
-      <property role="TrG5h" value="getOrDefault" />
-      <node concept="37vLTG" id="6nFpYlveRCP" role="3clF46">
-        <property role="TrG5h" value="flavour" />
-        <node concept="3uibUv" id="6nFpYlveRCQ" role="1tU5fm">
-          <ref role="3uigEE" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
-          <node concept="16syzq" id="6nFpYlveRCR" role="11_B2D">
-            <ref role="16sUi3" node="6nFpYlveRD0" resolve="V" />
+      <node concept="P$JXv" id="qsErMwy_o$" role="lGtFl">
+        <node concept="TZ5HA" id="qsErMwyG6j" role="TZ5H$">
+          <node concept="1dT_AC" id="qsErMwyG6k" role="1dT_Ay">
+            <property role="1dT_AB" value="Used from tests." />
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="6nFpYlveSsD" role="3clF46">
-        <property role="TrG5h" value="fallback" />
-        <node concept="1ajhzC" id="6nFpYlveSBQ" role="1tU5fm">
-          <node concept="16syzq" id="6nFpYlveSFI" role="1ajl9A">
-            <ref role="16sUi3" node="6nFpYlveRD0" resolve="V" />
-          </node>
-        </node>
-      </node>
-      <node concept="16syzq" id="6nFpYlveRCS" role="3clF45">
-        <ref role="16sUi3" node="6nFpYlveRD0" resolve="V" />
-      </node>
-      <node concept="3Tm1VV" id="6nFpYlveRCT" role="1B3o_S" />
-      <node concept="3clFbS" id="6nFpYlveRCU" role="3clF47">
-        <node concept="3cpWs8" id="6nFpYlveSKC" role="3cqZAp">
-          <node concept="3cpWsn" id="6nFpYlveSKD" role="3cpWs9">
-            <property role="TrG5h" value="data" />
-            <node concept="16syzq" id="6nFpYlveSy1" role="1tU5fm">
-              <ref role="16sUi3" node="6nFpYlveRD0" resolve="V" />
-            </node>
-            <node concept="2OqwBi" id="6nFpYlveSKE" role="33vP2m">
-              <node concept="37vLTw" id="6nFpYlveSKF" role="2Oq$k0">
-                <ref role="3cqZAo" node="6nFpYlveRCP" resolve="flavour" />
-              </node>
-              <node concept="liA8E" id="6nFpYlveSKG" role="2OqNvi">
-                <ref role="37wK5l" node="7i3KM7g1MO_" resolve="get" />
-                <node concept="Xjq3P" id="6nFpYlveSKH" role="37wK5m" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6nFpYlveRCV" role="3cqZAp">
-          <node concept="3K4zz7" id="6nFpYlveT3G" role="3clFbG">
-            <node concept="37vLTw" id="6nFpYlveT4L" role="3K4E3e">
-              <ref role="3cqZAo" node="6nFpYlveSKD" resolve="data" />
-            </node>
-            <node concept="2Sg_IR" id="6nFpYlveTbP" role="3K4GZi">
-              <node concept="37vLTw" id="6nFpYlveTbQ" role="2SgG2M">
-                <ref role="3cqZAo" node="6nFpYlveSsD" resolve="fallback" />
-              </node>
-            </node>
-            <node concept="3y3z36" id="6nFpYlveSWm" role="3K4Cdx">
-              <node concept="10Nm6u" id="6nFpYlveT2R" role="3uHU7w" />
-              <node concept="37vLTw" id="6nFpYlveSKI" role="3uHU7B">
-                <ref role="3cqZAo" node="6nFpYlveSKD" resolve="data" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="16euLQ" id="6nFpYlveRD0" role="16eVyc">
-        <property role="TrG5h" value="V" />
+      <node concept="2AHcQZ" id="qsErMwy_oB" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="7i3KM7g1LNN" role="jymVt" />
@@ -10272,6 +7057,47 @@
     <node concept="312cEu" id="7i3KM7g1Lm1" role="jymVt">
       <property role="TrG5h" value="DataFlavour" />
       <node concept="2tJIrI" id="7i3KM7g1MNM" role="jymVt" />
+      <node concept="2YIFZL" id="7Aoa2yVep9e" role="jymVt">
+        <property role="TrG5h" value="of" />
+        <node concept="37vLTG" id="7Aoa2yVerPT" role="3clF46">
+          <property role="TrG5h" value="cls" />
+          <node concept="3uibUv" id="7Aoa2yVes3t" role="1tU5fm">
+            <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+            <node concept="16syzq" id="7Aoa2yVes__" role="11_B2D">
+              <ref role="16sUi3" node="7Aoa2yVesoo" resolve="U" />
+            </node>
+          </node>
+        </node>
+        <node concept="3uibUv" id="7Aoa2yVeA3A" role="3clF45">
+          <ref role="3uigEE" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
+          <node concept="16syzq" id="7Aoa2yVeAKx" role="11_B2D">
+            <ref role="16sUi3" node="7Aoa2yVesoo" resolve="U" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="7Aoa2yVep9h" role="1B3o_S" />
+        <node concept="3clFbS" id="7Aoa2yVep9i" role="3clF47">
+          <node concept="3clFbF" id="7Aoa2yVesZh" role="3cqZAp">
+            <node concept="2ShNRf" id="7Aoa2yVesZf" role="3clFbG">
+              <node concept="1pGfFk" id="7Aoa2yVewgs" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="37wK5l" node="7i3KM7g1T3X" resolve="CachedData.DataFlavour" />
+                <node concept="2OqwBi" id="7Aoa2yVexO6" role="37wK5m">
+                  <node concept="37vLTw" id="7Aoa2yVewyP" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7Aoa2yVerPT" resolve="cls" />
+                  </node>
+                  <node concept="liA8E" id="7Aoa2yVe_As" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~Class.getName()" resolve="getName" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="16euLQ" id="7Aoa2yVesoo" role="16eVyc">
+          <property role="TrG5h" value="U" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7Aoa2yVemUV" role="jymVt" />
       <node concept="312cEg" id="7i3KM7g1O83" role="jymVt">
         <property role="TrG5h" value="keyName" />
         <node concept="3Tm6S6" id="7i3KM7g1O84" role="1B3o_S" />
@@ -10705,6 +7531,7 @@
         </node>
       </node>
     </node>
+    <node concept="3Tm1VV" id="7Aoa2yVBz3r" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="7i3KM7gxDuw">
     <property role="3GE5qa" value="launch.step" />
@@ -10788,10 +7615,8 @@
           <node concept="3clFbT" id="61G6TdE2xuv" role="37wK5m">
             <property role="3clFbU" value="true" />
           </node>
-          <node concept="3fqX7Q" id="17DrR$SZRla" role="37wK5m">
-            <node concept="37vLTw" id="17DrR$SZRER" role="3fr31v">
-              <ref role="3cqZAo" node="17DrR$SZPQ1" resolve="initial" />
-            </node>
+          <node concept="37vLTw" id="17DrR$SZRER" role="37wK5m">
+            <ref role="3cqZAo" node="17DrR$SZPQ1" resolve="invalidated" />
           </node>
           <node concept="37vLTw" id="6nFpYlurvhr" role="37wK5m">
             <ref role="3cqZAo" node="7WKNeR9fh8_" resolve="repository" />
@@ -10842,7 +7667,7 @@
         </node>
       </node>
       <node concept="37vLTG" id="17DrR$SZPQ1" role="3clF46">
-        <property role="TrG5h" value="initial" />
+        <property role="TrG5h" value="invalidated" />
         <node concept="10P_77" id="17DrR$SZQTG" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="55xYlrlMebT" role="3clF46">
@@ -13361,39 +10186,6 @@
       </node>
     </node>
   </node>
-  <node concept="3HP615" id="4Dkptq1Qcxp">
-    <property role="TrG5h" value="CacheUpdatable" />
-    <property role="3GE5qa" value="cache" />
-    <node concept="2tJIrI" id="44XN1Jd0DhC" role="jymVt" />
-    <node concept="3clFb_" id="61G6TdD6$Xx" role="jymVt">
-      <property role="TrG5h" value="cacheHolder" />
-      <node concept="3uibUv" id="61G6TdD6Eph" role="3clF45">
-        <ref role="3uigEE" node="4Z$O9mrQJw7" resolve="CacheHolder" />
-      </node>
-      <node concept="3Tm1VV" id="61G6TdD6$X$" role="1B3o_S" />
-      <node concept="3clFbS" id="61G6TdD6$X_" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="61G6TdD6rrq" role="jymVt" />
-    <node concept="3clFb_" id="5Qx6_65$vyG" role="jymVt">
-      <property role="TrG5h" value="update" />
-      <node concept="37vLTG" id="5Qx6_65$vyK" role="3clF46">
-        <property role="TrG5h" value="action" />
-        <node concept="3uibUv" id="5Qx6_65$vyL" role="1tU5fm">
-          <ref role="3uigEE" to="82uw:~Consumer" resolve="Consumer" />
-          <node concept="3uibUv" id="1z4$59jqx57" role="11_B2D">
-            <ref role="3uigEE" node="1z4$59jqeoH" resolve="TypecheckingResultsCache.Update" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="5Qx6_65$vyN" role="3clF45">
-        <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-      </node>
-      <node concept="3Tm1VV" id="5Qx6_65$vyO" role="1B3o_S" />
-      <node concept="3clFbS" id="5Qx6_65$vyP" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="44XN1Jd0M3f" role="jymVt" />
-    <node concept="3Tm1VV" id="4Dkptq1Qcxq" role="1B3o_S" />
-  </node>
   <node concept="312cEu" id="1T5MAgPu0VS">
     <property role="3GE5qa" value="launch.step" />
     <property role="TrG5h" value="ConfigureTypecheckingStep" />
@@ -14352,7 +11144,7 @@
       <node concept="3uibUv" id="1z4$59iy9tj" role="3clF45">
         <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
         <node concept="3uibUv" id="6v6oK28dTc8" role="11_B2D">
-          <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+          <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
         </node>
       </node>
       <node concept="3Tmbuc" id="6v6oK28eBRn" role="1B3o_S" />
@@ -14375,175 +11167,262 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="1RYTbd8sGI2" role="3cqZAp">
-          <node concept="3cpWsn" id="1RYTbd8sGI3" role="3cpWs9">
-            <property role="TrG5h" value="cache" />
-            <node concept="3uibUv" id="1RYTbd8sF6g" role="1tU5fm">
-              <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-            </node>
-            <node concept="2OqwBi" id="1RYTbd8sGI4" role="33vP2m">
-              <node concept="37vLTw" id="1C_jAsqhToC" role="2Oq$k0">
-                <ref role="3cqZAo" node="1C_jAsqhPex" resolve="state" />
+        <node concept="3cpWs8" id="7Aoa2yVlU02" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVlU03" role="3cpWs9">
+            <property role="TrG5h" value="allReportItems" />
+            <node concept="3vKaQO" id="7Aoa2yVlT$Z" role="1tU5fm">
+              <node concept="3uibUv" id="7Aoa2yVlT_2" role="3O5elw">
+                <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
               </node>
-              <node concept="liA8E" id="1RYTbd8sGI6" role="2OqNvi">
-                <ref role="37wK5l" node="4Dkptq1OPR7" resolve="updateUnitTypecheckingResults" />
-                <node concept="37vLTw" id="1RYTbd8sGI7" role="37wK5m">
-                  <ref role="3cqZAo" node="1RYTbd80CiD" resolve="containingRoot" />
+            </node>
+            <node concept="10Nm6u" id="7Aoa2yVuivQ" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="7Aoa2yVugJp" role="3cqZAp" />
+        <node concept="3clFbF" id="7Aoa2yVho5K" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVho5M" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVho5N" role="2Oq$k0">
+              <ref role="3cqZAo" node="1C_jAsqhPex" resolve="state" />
+            </node>
+            <node concept="liA8E" id="7Aoa2yVho5O" role="2OqNvi">
+              <ref role="37wK5l" node="7Aoa2yVgCDl" resolve="updateUnitCachedData" />
+              <node concept="37vLTw" id="7Aoa2yVho5P" role="37wK5m">
+                <ref role="3cqZAo" node="1RYTbd80CiD" resolve="containingRoot" />
+              </node>
+              <node concept="1bVj0M" id="7Aoa2yVho5Q" role="37wK5m">
+                <node concept="37vLTG" id="7Aoa2yVho5R" role="1bW2Oz">
+                  <property role="TrG5h" value="cachedData" />
+                  <node concept="3uibUv" id="7Aoa2yVho5S" role="1tU5fm">
+                    <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
+                  </node>
                 </node>
-                <node concept="1bVj0M" id="1RYTbd8sGI8" role="37wK5m">
-                  <node concept="37vLTG" id="1RYTbd8sGI9" role="1bW2Oz">
-                    <property role="TrG5h" value="updatable" />
-                    <node concept="3uibUv" id="1RYTbd8sGIa" role="1tU5fm">
-                      <ref role="3uigEE" node="4Dkptq1Qcxp" resolve="CacheUpdatable" />
-                    </node>
-                  </node>
-                  <node concept="3clFbS" id="1RYTbd8sGIb" role="1bW5cS">
-                    <node concept="3clFbH" id="1RYTbd8sGIc" role="3cqZAp" />
-                    <node concept="3cpWs8" id="1RYTbd8sGId" role="3cqZAp">
-                      <node concept="3cpWsn" id="1RYTbd8sGIe" role="3cpWs9">
-                        <property role="TrG5h" value="response" />
-                        <node concept="3uibUv" id="1RYTbd8sGIf" role="1tU5fm">
-                          <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
-                          <node concept="3qTvmN" id="6v6oK23exhV" role="11_B2D" />
+                <node concept="37vLTG" id="7Aoa2yVjIb3" role="1bW2Oz">
+                  <property role="TrG5h" value="fresh" />
+                  <node concept="10P_77" id="7Aoa2yVjIb0" role="1tU5fm" />
+                </node>
+                <node concept="3clFbS" id="7Aoa2yVho5T" role="1bW5cS">
+                  <node concept="3clFbH" id="7Aoa2yVho5U" role="3cqZAp" />
+                  <node concept="3cpWs8" id="7Aoa2yVho5V" role="3cqZAp">
+                    <node concept="3cpWsn" id="7Aoa2yVho5W" role="3cpWs9">
+                      <property role="TrG5h" value="response" />
+                      <node concept="3uibUv" id="7Aoa2yVho5X" role="1tU5fm">
+                        <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
+                        <node concept="3qTvmN" id="7Aoa2yVho5Y" role="11_B2D" />
+                      </node>
+                      <node concept="1rXfSq" id="7Aoa2yVho5Z" role="33vP2m">
+                        <ref role="37wK5l" node="6v6oK27vjgI" resolve="calcCheckRoot" />
+                        <node concept="2OqwBi" id="7Aoa2yVho60" role="37wK5m">
+                          <node concept="37vLTw" id="7Aoa2yVho61" role="2Oq$k0">
+                            <ref role="3cqZAo" node="1C_jAsqhPex" resolve="state" />
+                          </node>
+                          <node concept="liA8E" id="7Aoa2yVho62" role="2OqNvi">
+                            <ref role="37wK5l" node="1C_jAsql6Ib" resolve="getRepository" />
+                          </node>
                         </node>
-                        <node concept="1rXfSq" id="6v6oK26wOT5" role="33vP2m">
-                          <ref role="37wK5l" node="6v6oK27vjgI" resolve="calcCheckRoot" />
-                          <node concept="2OqwBi" id="1C_jAsqnrXk" role="37wK5m">
-                            <node concept="37vLTw" id="1C_jAsqnqPS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1C_jAsqhPex" resolve="state" />
-                            </node>
-                            <node concept="liA8E" id="1C_jAsqntfY" role="2OqNvi">
-                              <ref role="37wK5l" node="1C_jAsql6Ib" resolve="getRepository" />
-                            </node>
+                        <node concept="37vLTw" id="7Aoa2yVho63" role="37wK5m">
+                          <ref role="3cqZAo" node="1C_jAsqp06V" resolve="messageHandler" />
+                        </node>
+                        <node concept="37vLTw" id="7Aoa2yVho64" role="37wK5m">
+                          <ref role="3cqZAo" node="1RYTbd80CiD" resolve="containingRoot" />
+                        </node>
+                        <node concept="37vLTw" id="7Aoa2yVkFnb" role="37wK5m">
+                          <ref role="3cqZAo" node="7Aoa2yVho5R" resolve="cachedData" />
+                        </node>
+                        <node concept="37vLTw" id="7Aoa2yVho65" role="37wK5m">
+                          <ref role="3cqZAo" node="7Aoa2yVjIb3" resolve="fresh" />
+                        </node>
+                        <node concept="2OqwBi" id="7Aoa2yVho66" role="37wK5m">
+                          <node concept="37vLTw" id="7Aoa2yVho67" role="2Oq$k0">
+                            <ref role="3cqZAo" node="1C_jAsqhPex" resolve="state" />
                           </node>
-                          <node concept="37vLTw" id="1C_jAsqril_" role="37wK5m">
-                            <ref role="3cqZAo" node="1C_jAsqp06V" resolve="messageHandler" />
-                          </node>
-                          <node concept="37vLTw" id="6v6oK26wbR2" role="37wK5m">
-                            <ref role="3cqZAo" node="1RYTbd80CiD" resolve="containingRoot" />
-                          </node>
-                          <node concept="37vLTw" id="6v6oK26wbR6" role="37wK5m">
-                            <ref role="3cqZAo" node="1RYTbd8sGI9" resolve="updatable" />
-                          </node>
-                          <node concept="2OqwBi" id="6v6oK26wbR7" role="37wK5m">
-                            <node concept="37vLTw" id="1C_jAsqhVZ4" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1C_jAsqhPex" resolve="state" />
-                            </node>
-                            <node concept="liA8E" id="6v6oK26wbRb" role="2OqNvi">
-                              <ref role="37wK5l" node="1T5MAgPidDk" resolve="typeCollector" />
-                            </node>
+                          <node concept="liA8E" id="7Aoa2yVho68" role="2OqNvi">
+                            <ref role="37wK5l" node="1T5MAgPidDk" resolve="typeCollector" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbF" id="1RYTbd8sGIo" role="3cqZAp">
-                      <node concept="2OqwBi" id="1RYTbd8sGIp" role="3clFbG">
-                        <node concept="37vLTw" id="1RYTbd8sGIq" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1RYTbd8sGI9" resolve="updatable" />
+                  </node>
+                  <node concept="3clFbH" id="7Aoa2yVho69" role="3cqZAp" />
+                  <node concept="3SKdUt" id="7Aoa2yVho6a" role="3cqZAp">
+                    <node concept="1PaTwC" id="7Aoa2yVho6b" role="1aUNEU">
+                      <node concept="3oM_SD" id="7Aoa2yVho6c" role="1PaTwD">
+                        <property role="3oM_SC" value="TODO" />
+                      </node>
+                      <node concept="3oM_SD" id="7Aoa2yVho6d" role="1PaTwD">
+                        <property role="3oM_SC" value="failed" />
+                      </node>
+                      <node concept="3oM_SD" id="7Aoa2yVho6e" role="1PaTwD">
+                        <property role="3oM_SC" value="response?" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="7Aoa2yVho6f" role="3cqZAp" />
+                  <node concept="3cpWs8" id="7Aoa2yVho6g" role="3cqZAp">
+                    <node concept="3cpWsn" id="7Aoa2yVho6h" role="3cpWs9">
+                      <property role="TrG5h" value="reportedTypes" />
+                      <node concept="3uibUv" id="7Aoa2yVho6i" role="1tU5fm">
+                        <ref role="3uigEE" node="7Aoa2yVdSP8" resolve="ReportedTypes" />
+                      </node>
+                      <node concept="2OqwBi" id="7Aoa2yVho6j" role="33vP2m">
+                        <node concept="37vLTw" id="7Aoa2yVkKBS" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yVho5R" resolve="cachedData" />
                         </node>
-                        <node concept="liA8E" id="1RYTbd8sGIr" role="2OqNvi">
-                          <ref role="37wK5l" node="5Qx6_65$vyG" resolve="update" />
-                          <node concept="1bVj0M" id="1RYTbd8sGIs" role="37wK5m">
-                            <node concept="37vLTG" id="1RYTbd8sGIt" role="1bW2Oz">
-                              <property role="TrG5h" value="update" />
-                              <node concept="3uibUv" id="1RYTbd8sGIu" role="1tU5fm">
-                                <ref role="3uigEE" node="1z4$59jqeoH" resolve="TypecheckingResultsCache.Update" />
-                              </node>
-                            </node>
-                            <node concept="3clFbS" id="1RYTbd8sGIv" role="1bW5cS">
-                              <node concept="3clFbF" id="3Pxu0s8rqFa" role="3cqZAp">
-                                <node concept="2OqwBi" id="3Pxu0s8rGMT" role="3clFbG">
-                                  <node concept="37vLTw" id="3Pxu0s8rBRl" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1RYTbd8sGIt" resolve="update" />
-                                  </node>
-                                  <node concept="liA8E" id="3Pxu0s8rNHY" role="2OqNvi">
-                                    <ref role="37wK5l" node="3Pxu0s8qa6J" resolve="dropInvalidated" />
-                                    <node concept="2OqwBi" id="3Pxu0s8rYva" role="37wK5m">
-                                      <node concept="37vLTw" id="3Pxu0s8rYvb" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1RYTbd8sGIe" resolve="response" />
-                                      </node>
-                                      <node concept="2OwXpG" id="3Pxu0s8rYvc" role="2OqNvi">
-                                        <ref role="2Oxat5" node="1RYTbd8dm$e" resolve="invalidatedOrigins" />
-                                      </node>
-                                    </node>
+                        <node concept="liA8E" id="7Aoa2yVho6p" role="2OqNvi">
+                          <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
+                          <node concept="37vLTw" id="7Aoa2yVho7B" role="37wK5m">
+                            <ref role="3cqZAo" node="7Aoa2yVefYI" resolve="REPORTED_TYPES" />
+                          </node>
+                          <node concept="1bVj0M" id="7Aoa2yVho6q" role="37wK5m">
+                            <node concept="3clFbS" id="7Aoa2yVho6r" role="1bW5cS">
+                              <node concept="3clFbF" id="7Aoa2yVho6s" role="3cqZAp">
+                                <node concept="2ShNRf" id="7Aoa2yVho6t" role="3clFbG">
+                                  <node concept="HV5vD" id="7Aoa2yVho6u" role="2ShVmc">
+                                    <property role="373rjd" value="true" />
+                                    <ref role="HV5vE" node="7Aoa2yVdSP8" resolve="ReportedTypes" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbF" id="55xYlrmwilf" role="3cqZAp">
-                                <node concept="2OqwBi" id="55xYlrmwlJU" role="3clFbG">
-                                  <node concept="37vLTw" id="55xYlrmwild" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1RYTbd8sGIt" resolve="update" />
-                                  </node>
-                                  <node concept="liA8E" id="55xYlrmws1H" role="2OqNvi">
-                                    <ref role="37wK5l" node="55xYlrm1rIW" resolve="changedBasis" />
-                                    <node concept="2OqwBi" id="55xYlrmw$JR" role="37wK5m">
-                                      <node concept="37vLTw" id="55xYlrmwxeD" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1RYTbd8sGIe" resolve="response" />
-                                      </node>
-                                      <node concept="2OwXpG" id="55xYlrmwFNp" role="2OqNvi">
-                                        <ref role="2Oxat5" node="55xYlrlX9c4" resolve="invalidatedFeedbackBasis" />
-                                      </node>
-                                    </node>
-                                    <node concept="2OqwBi" id="6DQTzHy7fQO" role="37wK5m">
-                                      <node concept="37vLTw" id="6DQTzHy7fQP" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1RYTbd8sGIe" resolve="response" />
-                                      </node>
-                                      <node concept="2OwXpG" id="6DQTzHy7uRk" role="2OqNvi">
-                                        <ref role="2Oxat5" node="6DQTzHy5p_p" resolve="validatedFeedbackBasis" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbF" id="1RYTbd8sGIw" role="3cqZAp">
-                                <node concept="2OqwBi" id="1RYTbd8sGIx" role="3clFbG">
-                                  <node concept="37vLTw" id="1RYTbd8sGIy" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1RYTbd8sGIt" resolve="update" />
-                                  </node>
-                                  <node concept="liA8E" id="1RYTbd8sGIz" role="2OqNvi">
-                                    <ref role="37wK5l" node="1z4$59jqkDZ" resolve="putAllTypes" />
-                                    <node concept="2OqwBi" id="1RYTbd8sGI$" role="37wK5m">
-                                      <node concept="37vLTw" id="1RYTbd8sGI_" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1RYTbd8sGIe" resolve="response" />
-                                      </node>
-                                      <node concept="2OwXpG" id="1RYTbd8sGIA" role="2OqNvi">
-                                        <ref role="2Oxat5" node="1RYTbd8d5$u" resolve="types" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbF" id="1RYTbd8sGIB" role="3cqZAp">
-                                <node concept="2OqwBi" id="1RYTbd8sGIC" role="3clFbG">
-                                  <node concept="37vLTw" id="1RYTbd8sGID" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1RYTbd8sGIt" resolve="update" />
-                                  </node>
-                                  <node concept="liA8E" id="1RYTbd8sGIE" role="2OqNvi">
-                                    <ref role="37wK5l" node="1z4$59jqkEf" resolve="addReportItems" />
-                                    <node concept="2OqwBi" id="1RYTbd8sGIF" role="37wK5m">
-                                      <node concept="37vLTw" id="1RYTbd8sGIG" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1RYTbd8sGIe" resolve="response" />
-                                      </node>
-                                      <node concept="2OwXpG" id="1RYTbd8sGIH" role="2OqNvi">
-                                        <ref role="2Oxat5" node="1RYTbd8cqGt" resolve="reportItems" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbH" id="1RYTbd8sGII" role="3cqZAp" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="3clFbF" id="7Aoa2yVho6v" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Aoa2yVho6w" role="3clFbG">
+                      <node concept="37vLTw" id="7Aoa2yVho6x" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7Aoa2yVho6h" resolve="reportedTypes" />
+                      </node>
+                      <node concept="liA8E" id="7Aoa2yVho6y" role="2OqNvi">
+                        <ref role="37wK5l" node="7Aoa2yVe00r" resolve="dropInvalidated" />
+                        <node concept="2OqwBi" id="7Aoa2yVho6z" role="37wK5m">
+                          <node concept="37vLTw" id="7Aoa2yVho6$" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Aoa2yVho5W" resolve="response" />
+                          </node>
+                          <node concept="2OwXpG" id="7Aoa2yVho6_" role="2OqNvi">
+                            <ref role="2Oxat5" node="1RYTbd8dm$e" resolve="invalidatedOrigins" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7Aoa2yVho6A" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Aoa2yVho6B" role="3clFbG">
+                      <node concept="37vLTw" id="7Aoa2yVho6C" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7Aoa2yVho6h" resolve="reportedTypes" />
+                      </node>
+                      <node concept="liA8E" id="7Aoa2yVho6D" role="2OqNvi">
+                        <ref role="37wK5l" node="7Aoa2yVe2QP" resolve="putAllTypes" />
+                        <node concept="2OqwBi" id="7Aoa2yVho6E" role="37wK5m">
+                          <node concept="37vLTw" id="7Aoa2yVho6F" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Aoa2yVho5W" resolve="response" />
+                          </node>
+                          <node concept="2OwXpG" id="7Aoa2yVho6G" role="2OqNvi">
+                            <ref role="2Oxat5" node="1RYTbd8d5$u" resolve="types" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="7Aoa2yVho6H" role="3cqZAp" />
+                  <node concept="3clFbH" id="7Aoa2yVho6I" role="3cqZAp" />
+                  <node concept="3cpWs8" id="7Aoa2yVho6J" role="3cqZAp">
+                    <node concept="3cpWsn" id="7Aoa2yVho6K" role="3cpWs9">
+                      <property role="TrG5h" value="reportedItems" />
+                      <node concept="3uibUv" id="7Aoa2yVho6L" role="1tU5fm">
+                        <ref role="3uigEE" node="7Aoa2yVfU_u" resolve="ReportedItems" />
+                      </node>
+                      <node concept="2OqwBi" id="7Aoa2yVho6M" role="33vP2m">
+                        <node concept="37vLTw" id="7Aoa2yVkMOt" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yVho5R" resolve="cachedData" />
+                        </node>
+                        <node concept="liA8E" id="7Aoa2yVho6S" role="2OqNvi">
+                          <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
+                          <node concept="37vLTw" id="7Aoa2yVho80" role="37wK5m">
+                            <ref role="3cqZAo" node="7Aoa2yVg9X5" resolve="REPORTED_ITEMS" />
+                          </node>
+                          <node concept="1bVj0M" id="7Aoa2yVho6T" role="37wK5m">
+                            <node concept="3clFbS" id="7Aoa2yVho6U" role="1bW5cS">
+                              <node concept="3clFbF" id="7Aoa2yVho6V" role="3cqZAp">
+                                <node concept="2ShNRf" id="7Aoa2yVho6W" role="3clFbG">
+                                  <node concept="HV5vD" id="7Aoa2yVho6X" role="2ShVmc">
+                                    <property role="373rjd" value="true" />
+                                    <ref role="HV5vE" node="7Aoa2yVfU_u" resolve="ReportedItems" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7Aoa2yVho6Y" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Aoa2yVho6Z" role="3clFbG">
+                      <node concept="37vLTw" id="7Aoa2yVho70" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7Aoa2yVho6K" resolve="reportedItems" />
+                      </node>
+                      <node concept="liA8E" id="7Aoa2yVho71" role="2OqNvi">
+                        <ref role="37wK5l" node="7Aoa2yVg38k" resolve="changedBasis" />
+                        <node concept="2OqwBi" id="7Aoa2yVho72" role="37wK5m">
+                          <node concept="37vLTw" id="7Aoa2yVho73" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Aoa2yVho5W" resolve="response" />
+                          </node>
+                          <node concept="2OwXpG" id="7Aoa2yVho74" role="2OqNvi">
+                            <ref role="2Oxat5" node="55xYlrlX9c4" resolve="invalidatedFeedbackBasis" />
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="7Aoa2yVho75" role="37wK5m">
+                          <node concept="37vLTw" id="7Aoa2yVho76" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Aoa2yVho5W" resolve="response" />
+                          </node>
+                          <node concept="2OwXpG" id="7Aoa2yVho77" role="2OqNvi">
+                            <ref role="2Oxat5" node="6DQTzHy5p_p" resolve="validatedFeedbackBasis" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7Aoa2yVho78" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Aoa2yVho79" role="3clFbG">
+                      <node concept="37vLTw" id="7Aoa2yVho7a" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7Aoa2yVho6K" resolve="reportedItems" />
+                      </node>
+                      <node concept="liA8E" id="7Aoa2yVho7b" role="2OqNvi">
+                        <ref role="37wK5l" node="7Aoa2yVg8Dv" resolve="addReportItems" />
+                        <node concept="2OqwBi" id="7Aoa2yVho7c" role="37wK5m">
+                          <node concept="37vLTw" id="7Aoa2yVho7d" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Aoa2yVho5W" resolve="response" />
+                          </node>
+                          <node concept="2OwXpG" id="7Aoa2yVho7e" role="2OqNvi">
+                            <ref role="2Oxat5" node="1RYTbd8cqGt" resolve="reportItems" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7Aoa2yVlUZy" role="3cqZAp">
+                    <node concept="37vLTI" id="7Aoa2yVlUZ$" role="3clFbG">
+                      <node concept="2OqwBi" id="7Aoa2yVlU04" role="37vLTx">
+                        <node concept="37vLTw" id="7Aoa2yVlU05" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yVho6K" resolve="reportedItems" />
+                        </node>
+                        <node concept="liA8E" id="7Aoa2yVlU06" role="2OqNvi">
+                          <ref role="37wK5l" node="7Aoa2yVl_uk" resolve="allReportItems" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="7Aoa2yVlUZC" role="37vLTJ">
+                        <ref role="3cqZAo" node="7Aoa2yVlU03" resolve="allReportItems" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="7Aoa2yVlHNQ" role="3cqZAp" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="1RYTbd8sOZ7" role="3cqZAp" />
+        <node concept="3clFbH" id="7Aoa2yVhmM4" role="3cqZAp" />
         <node concept="3SKdUt" id="1RYTbd8sOfK" role="3cqZAp">
           <node concept="1PaTwC" id="1RYTbd8sOfL" role="1aUNEU">
             <node concept="3oM_SD" id="1RYTbd8sOfM" role="1PaTwD">
@@ -14560,13 +11439,8 @@
         <node concept="3clFbF" id="1RYTbd8sLtT" role="3cqZAp">
           <node concept="1rXfSq" id="1RYTbd8sLtU" role="3clFbG">
             <ref role="37wK5l" node="1z4$59i_qJE" resolve="forwardReportItems" />
-            <node concept="2OqwBi" id="1RYTbd8sLtV" role="37wK5m">
-              <node concept="37vLTw" id="1RYTbd8sLtW" role="2Oq$k0">
-                <ref role="3cqZAo" node="1RYTbd8sGI3" resolve="cache" />
-              </node>
-              <node concept="liA8E" id="1RYTbd8sLtX" role="2OqNvi">
-                <ref role="37wK5l" node="3yEb0I3SXN3" resolve="allReportItems" />
-              </node>
+            <node concept="37vLTw" id="7Aoa2yVm9jn" role="37wK5m">
+              <ref role="3cqZAo" node="7Aoa2yVlU03" resolve="allReportItems" />
             </node>
           </node>
         </node>
@@ -14575,8 +11449,8 @@
           <node concept="2YIFZM" id="6v6oK28e2hD" role="3clFbG">
             <ref role="37wK5l" node="1RYTbd8cMMZ" resolve="of" />
             <ref role="1Pybhc" node="1RYTbd8bNK8" resolve="Response" />
-            <node concept="37vLTw" id="6v6oK28e4Sb" role="37wK5m">
-              <ref role="3cqZAo" node="1RYTbd8sGI3" resolve="cache" />
+            <node concept="3clFbT" id="7Aoa2yVp5fl" role="37wK5m">
+              <property role="3clFbU" value="true" />
             </node>
           </node>
         </node>
@@ -14749,7 +11623,7 @@
         <ref role="3uigEE" node="5EDW3XDYNPr" resolve="CheckQuery" />
       </node>
       <node concept="3uibUv" id="1z4$59irLRy" role="11_B2D">
-        <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+        <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
       </node>
     </node>
     <node concept="3Tm1VV" id="6v6oK27_0O_" role="1B3o_S" />
@@ -14797,170 +11671,302 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="1RYTbd81$Xz" role="3cqZAp">
-          <node concept="3cpWsn" id="1RYTbd81$X$" role="3cpWs9">
-            <property role="TrG5h" value="cache" />
-            <node concept="3uibUv" id="1RYTbd81$X_" role="1tU5fm">
-              <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+        <node concept="3cpWs8" id="7Aoa2yVpx9s" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVpx9t" role="3cpWs9">
+            <property role="TrG5h" value="subjectRef" />
+            <node concept="3uibUv" id="7Aoa2yVpwjX" role="1tU5fm">
+              <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
             </node>
-            <node concept="2OqwBi" id="1RYTbd81$XA" role="33vP2m">
-              <node concept="37vLTw" id="1C_jAsqi0YD" role="2Oq$k0">
-                <ref role="3cqZAo" node="1C_jAsqhPeB" resolve="state" />
-              </node>
-              <node concept="liA8E" id="1RYTbd81$XC" role="2OqNvi">
-                <ref role="37wK5l" node="4Dkptq1OPR7" resolve="updateUnitTypecheckingResults" />
-                <node concept="37vLTw" id="1RYTbd81$XD" role="37wK5m">
-                  <ref role="3cqZAo" node="1RYTbd81$US" resolve="containingRoot" />
+            <node concept="2OqwBi" id="7Aoa2yVpx9u" role="33vP2m">
+              <node concept="2JrnkZ" id="7Aoa2yVpx9v" role="2Oq$k0">
+                <node concept="2OqwBi" id="7Aoa2yVpx9w" role="2JrQYb">
+                  <node concept="1rXfSq" id="7Aoa2yVpx9x" role="2Oq$k0">
+                    <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
+                  </node>
+                  <node concept="liA8E" id="7Aoa2yVpx9y" role="2OqNvi">
+                    <ref role="37wK5l" node="6v6oK25lKkp" resolve="getSubject" />
+                  </node>
                 </node>
-                <node concept="1bVj0M" id="1RYTbd81$XE" role="37wK5m">
-                  <node concept="37vLTG" id="1RYTbd81$XF" role="1bW2Oz">
-                    <property role="TrG5h" value="updatable" />
-                    <node concept="3uibUv" id="1RYTbd81$XG" role="1tU5fm">
-                      <ref role="3uigEE" node="4Dkptq1Qcxp" resolve="CacheUpdatable" />
-                    </node>
+              </node>
+              <node concept="liA8E" id="7Aoa2yVpx9z" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7Aoa2yVpUud" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVpUue" role="3cpWs9">
+            <property role="TrG5h" value="node" />
+            <node concept="3Tqbb2" id="7Aoa2yVpUuf" role="1tU5fm" />
+            <node concept="10Nm6u" id="7Aoa2yVpVDc" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="7Aoa2yVpT97" role="3cqZAp" />
+        <node concept="3cpWs8" id="7Aoa2yVphWq" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVphWr" role="3cpWs9">
+            <property role="TrG5h" value="allReportItems" />
+            <node concept="3vKaQO" id="7Aoa2yVphWs" role="1tU5fm">
+              <node concept="3uibUv" id="7Aoa2yVphWt" role="3O5elw">
+                <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7Aoa2yVphWu" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVphWv" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVphWw" role="2Oq$k0">
+              <ref role="3cqZAo" node="1C_jAsqhPeB" resolve="state" />
+            </node>
+            <node concept="liA8E" id="7Aoa2yVphWx" role="2OqNvi">
+              <ref role="37wK5l" node="7Aoa2yVgCDl" resolve="updateUnitCachedData" />
+              <node concept="37vLTw" id="7Aoa2yVphWy" role="37wK5m">
+                <ref role="3cqZAo" node="1RYTbd81$US" resolve="containingRoot" />
+              </node>
+              <node concept="1bVj0M" id="7Aoa2yVphWz" role="37wK5m">
+                <node concept="37vLTG" id="7Aoa2yVphW$" role="1bW2Oz">
+                  <property role="TrG5h" value="cachedData" />
+                  <node concept="3uibUv" id="7Aoa2yVphW_" role="1tU5fm">
+                    <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
                   </node>
-                  <node concept="3clFbS" id="1RYTbd81$XH" role="1bW5cS">
-                    <node concept="3clFbH" id="1RYTbd81$XI" role="3cqZAp" />
-                    <node concept="3cpWs8" id="1RYTbd8qEOa" role="3cqZAp">
-                      <node concept="3cpWsn" id="1RYTbd8qEOb" role="3cpWs9">
-                        <property role="TrG5h" value="response" />
-                        <node concept="3uibUv" id="1RYTbd8qv0m" role="1tU5fm">
-                          <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
-                          <node concept="3qTvmN" id="6v6oK23eLxf" role="11_B2D" />
+                </node>
+                <node concept="37vLTG" id="7Aoa2yVphWA" role="1bW2Oz">
+                  <property role="TrG5h" value="fresh" />
+                  <node concept="10P_77" id="7Aoa2yVphWB" role="1tU5fm" />
+                </node>
+                <node concept="3clFbS" id="7Aoa2yVphWC" role="1bW5cS">
+                  <node concept="3clFbH" id="7Aoa2yVphWD" role="3cqZAp" />
+                  <node concept="3cpWs8" id="7Aoa2yVphWE" role="3cqZAp">
+                    <node concept="3cpWsn" id="7Aoa2yVphWF" role="3cpWs9">
+                      <property role="TrG5h" value="response" />
+                      <node concept="3uibUv" id="7Aoa2yVphWG" role="1tU5fm">
+                        <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
+                        <node concept="3qTvmN" id="7Aoa2yVphWH" role="11_B2D" />
+                      </node>
+                      <node concept="1rXfSq" id="7Aoa2yVphWI" role="33vP2m">
+                        <ref role="37wK5l" node="6v6oK27vjgI" resolve="calcCheckRoot" />
+                        <node concept="2OqwBi" id="7Aoa2yVphWJ" role="37wK5m">
+                          <node concept="37vLTw" id="7Aoa2yVphWK" role="2Oq$k0">
+                            <ref role="3cqZAo" node="1C_jAsqhPeB" resolve="state" />
+                          </node>
+                          <node concept="liA8E" id="7Aoa2yVphWL" role="2OqNvi">
+                            <ref role="37wK5l" node="1C_jAsql6Ib" resolve="getRepository" />
+                          </node>
                         </node>
-                        <node concept="1rXfSq" id="6v6oK26EORu" role="33vP2m">
-                          <ref role="37wK5l" node="6v6oK27vjgI" resolve="calcCheckRoot" />
-                          <node concept="2OqwBi" id="1C_jAsqnx5g" role="37wK5m">
-                            <node concept="37vLTw" id="1C_jAsqnwhG" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1C_jAsqhPeB" resolve="state" />
-                            </node>
-                            <node concept="liA8E" id="1C_jAsqnyjR" role="2OqNvi">
-                              <ref role="37wK5l" node="1C_jAsql6Ib" resolve="getRepository" />
-                            </node>
+                        <node concept="37vLTw" id="7Aoa2yVphWM" role="37wK5m">
+                          <ref role="3cqZAo" node="1C_jAsqp070" resolve="messageHandler" />
+                        </node>
+                        <node concept="37vLTw" id="7Aoa2yVphWN" role="37wK5m">
+                          <ref role="3cqZAo" node="1RYTbd81$US" resolve="containingRoot" />
+                        </node>
+                        <node concept="37vLTw" id="7Aoa2yVphWO" role="37wK5m">
+                          <ref role="3cqZAo" node="7Aoa2yVphW$" resolve="cachedData" />
+                        </node>
+                        <node concept="37vLTw" id="7Aoa2yVphWP" role="37wK5m">
+                          <ref role="3cqZAo" node="7Aoa2yVphWA" resolve="fresh" />
+                        </node>
+                        <node concept="2OqwBi" id="7Aoa2yVphWQ" role="37wK5m">
+                          <node concept="37vLTw" id="7Aoa2yVphWR" role="2Oq$k0">
+                            <ref role="3cqZAo" node="1C_jAsqhPeB" resolve="state" />
                           </node>
-                          <node concept="37vLTw" id="1C_jAsqrkH5" role="37wK5m">
-                            <ref role="3cqZAo" node="1C_jAsqp070" resolve="messageHandler" />
-                          </node>
-                          <node concept="37vLTw" id="6v6oK26EdMm" role="37wK5m">
-                            <ref role="3cqZAo" node="1RYTbd81$US" resolve="containingRoot" />
-                          </node>
-                          <node concept="37vLTw" id="6v6oK26EdMq" role="37wK5m">
-                            <ref role="3cqZAo" node="1RYTbd81$XF" resolve="updatable" />
-                          </node>
-                          <node concept="2OqwBi" id="6v6oK26EdMr" role="37wK5m">
-                            <node concept="37vLTw" id="1C_jAsqi45u" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1C_jAsqhPeB" resolve="state" />
-                            </node>
-                            <node concept="liA8E" id="6v6oK26EdMv" role="2OqNvi">
-                              <ref role="37wK5l" node="1T5MAgPidDk" resolve="typeCollector" />
-                            </node>
+                          <node concept="liA8E" id="7Aoa2yVphWS" role="2OqNvi">
+                            <ref role="37wK5l" node="1T5MAgPidDk" resolve="typeCollector" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbF" id="1RYTbd8qIFR" role="3cqZAp">
-                      <node concept="2OqwBi" id="1RYTbd8qIU1" role="3clFbG">
-                        <node concept="37vLTw" id="1RYTbd8qIFP" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1RYTbd81$XF" resolve="updatable" />
+                  </node>
+                  <node concept="3clFbH" id="7Aoa2yVphWT" role="3cqZAp" />
+                  <node concept="3SKdUt" id="7Aoa2yVphWU" role="3cqZAp">
+                    <node concept="1PaTwC" id="7Aoa2yVphWV" role="1aUNEU">
+                      <node concept="3oM_SD" id="7Aoa2yVphWW" role="1PaTwD">
+                        <property role="3oM_SC" value="TODO" />
+                      </node>
+                      <node concept="3oM_SD" id="7Aoa2yVphWX" role="1PaTwD">
+                        <property role="3oM_SC" value="failed" />
+                      </node>
+                      <node concept="3oM_SD" id="7Aoa2yVphWY" role="1PaTwD">
+                        <property role="3oM_SC" value="response?" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="7Aoa2yVphWZ" role="3cqZAp" />
+                  <node concept="3cpWs8" id="7Aoa2yVphX0" role="3cqZAp">
+                    <node concept="3cpWsn" id="7Aoa2yVphX1" role="3cpWs9">
+                      <property role="TrG5h" value="reportedTypes" />
+                      <node concept="3uibUv" id="7Aoa2yVphX2" role="1tU5fm">
+                        <ref role="3uigEE" node="7Aoa2yVdSP8" resolve="ReportedTypes" />
+                      </node>
+                      <node concept="2OqwBi" id="7Aoa2yVphX3" role="33vP2m">
+                        <node concept="37vLTw" id="7Aoa2yVphX4" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yVphW$" resolve="cachedData" />
                         </node>
-                        <node concept="liA8E" id="1RYTbd8qJ9m" role="2OqNvi">
-                          <ref role="37wK5l" node="5Qx6_65$vyG" resolve="update" />
-                          <node concept="1bVj0M" id="1RYTbd8qJSj" role="37wK5m">
-                            <node concept="3clFbS" id="1RYTbd8qJSl" role="1bW5cS">
-                              <node concept="3clFbF" id="55xYlrmwLMF" role="3cqZAp">
-                                <node concept="2OqwBi" id="55xYlrmwLMG" role="3clFbG">
-                                  <node concept="37vLTw" id="55xYlrmwLMH" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1RYTbd8qK57" resolve="update" />
-                                  </node>
-                                  <node concept="liA8E" id="55xYlrmwLMI" role="2OqNvi">
-                                    <ref role="37wK5l" node="3Pxu0s8qa6J" resolve="dropInvalidated" />
-                                    <node concept="2OqwBi" id="55xYlrmwLMJ" role="37wK5m">
-                                      <node concept="37vLTw" id="55xYlrmwLMK" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1RYTbd8qEOb" resolve="response" />
-                                      </node>
-                                      <node concept="2OwXpG" id="55xYlrmwLML" role="2OqNvi">
-                                        <ref role="2Oxat5" node="1RYTbd8dm$e" resolve="invalidatedOrigins" />
-                                      </node>
-                                    </node>
+                        <node concept="liA8E" id="7Aoa2yVphX5" role="2OqNvi">
+                          <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
+                          <node concept="37vLTw" id="7Aoa2yVphYl" role="37wK5m">
+                            <ref role="3cqZAo" node="7Aoa2yVefYI" resolve="REPORTED_TYPES" />
+                          </node>
+                          <node concept="1bVj0M" id="7Aoa2yVphX6" role="37wK5m">
+                            <node concept="3clFbS" id="7Aoa2yVphX7" role="1bW5cS">
+                              <node concept="3clFbF" id="7Aoa2yVphX8" role="3cqZAp">
+                                <node concept="2ShNRf" id="7Aoa2yVphX9" role="3clFbG">
+                                  <node concept="HV5vD" id="7Aoa2yVphXa" role="2ShVmc">
+                                    <property role="373rjd" value="true" />
+                                    <ref role="HV5vE" node="7Aoa2yVdSP8" resolve="ReportedTypes" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbF" id="55xYlrmwLMP" role="3cqZAp">
-                                <node concept="2OqwBi" id="55xYlrmwLMQ" role="3clFbG">
-                                  <node concept="37vLTw" id="55xYlrmwLMR" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1RYTbd8qK57" resolve="update" />
-                                  </node>
-                                  <node concept="liA8E" id="55xYlrmwLMS" role="2OqNvi">
-                                    <ref role="37wK5l" node="55xYlrm1rIW" resolve="changedBasis" />
-                                    <node concept="2OqwBi" id="55xYlrmwLMT" role="37wK5m">
-                                      <node concept="37vLTw" id="55xYlrmwLMU" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1RYTbd8qEOb" resolve="response" />
-                                      </node>
-                                      <node concept="2OwXpG" id="55xYlrmwLMV" role="2OqNvi">
-                                        <ref role="2Oxat5" node="55xYlrlX9c4" resolve="invalidatedFeedbackBasis" />
-                                      </node>
-                                    </node>
-                                    <node concept="2OqwBi" id="6DQTzHya6aD" role="37wK5m">
-                                      <node concept="37vLTw" id="6DQTzHya6aE" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1RYTbd8qEOb" resolve="response" />
-                                      </node>
-                                      <node concept="2OwXpG" id="6DQTzHyads_" role="2OqNvi">
-                                        <ref role="2Oxat5" node="6DQTzHy5p_p" resolve="validatedFeedbackBasis" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbF" id="1RYTbd8qLiJ" role="3cqZAp">
-                                <node concept="2OqwBi" id="1RYTbd8qLxN" role="3clFbG">
-                                  <node concept="37vLTw" id="1RYTbd8qLiH" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1RYTbd8qK57" resolve="update" />
-                                  </node>
-                                  <node concept="liA8E" id="1RYTbd8qLQp" role="2OqNvi">
-                                    <ref role="37wK5l" node="1z4$59jqkDZ" resolve="putAllTypes" />
-                                    <node concept="2OqwBi" id="1RYTbd8qMER" role="37wK5m">
-                                      <node concept="37vLTw" id="1RYTbd8qMlH" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1RYTbd8qEOb" resolve="response" />
-                                      </node>
-                                      <node concept="2OwXpG" id="1RYTbd8qN4R" role="2OqNvi">
-                                        <ref role="2Oxat5" node="1RYTbd8d5$u" resolve="types" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbF" id="1RYTbd8qNP6" role="3cqZAp">
-                                <node concept="2OqwBi" id="1RYTbd8qO55" role="3clFbG">
-                                  <node concept="37vLTw" id="1RYTbd8qNP4" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1RYTbd8qK57" resolve="update" />
-                                  </node>
-                                  <node concept="liA8E" id="1RYTbd8qOr2" role="2OqNvi">
-                                    <ref role="37wK5l" node="1z4$59jqkEf" resolve="addReportItems" />
-                                    <node concept="2OqwBi" id="1RYTbd8qPkA" role="37wK5m">
-                                      <node concept="37vLTw" id="1RYTbd8qOXf" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1RYTbd8qEOb" resolve="response" />
-                                      </node>
-                                      <node concept="2OwXpG" id="1RYTbd8qPKr" role="2OqNvi">
-                                        <ref role="2Oxat5" node="1RYTbd8cqGt" resolve="reportItems" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbH" id="1RYTbd8qKS6" role="3cqZAp" />
-                            </node>
-                            <node concept="37vLTG" id="1RYTbd8qK57" role="1bW2Oz">
-                              <property role="TrG5h" value="update" />
-                              <node concept="3uibUv" id="1RYTbd8qKhI" role="1tU5fm">
-                                <ref role="3uigEE" node="1z4$59jqeoH" resolve="TypecheckingResultsCache.Update" />
-                              </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbH" id="1RYTbd81$XR" role="3cqZAp" />
                   </node>
+                  <node concept="3clFbF" id="7Aoa2yVphXb" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Aoa2yVphXc" role="3clFbG">
+                      <node concept="37vLTw" id="7Aoa2yVphXd" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7Aoa2yVphX1" resolve="reportedTypes" />
+                      </node>
+                      <node concept="liA8E" id="7Aoa2yVphXe" role="2OqNvi">
+                        <ref role="37wK5l" node="7Aoa2yVe00r" resolve="dropInvalidated" />
+                        <node concept="2OqwBi" id="7Aoa2yVphXf" role="37wK5m">
+                          <node concept="37vLTw" id="7Aoa2yVphXg" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Aoa2yVphWF" resolve="response" />
+                          </node>
+                          <node concept="2OwXpG" id="7Aoa2yVphXh" role="2OqNvi">
+                            <ref role="2Oxat5" node="1RYTbd8dm$e" resolve="invalidatedOrigins" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7Aoa2yVphXi" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Aoa2yVphXj" role="3clFbG">
+                      <node concept="37vLTw" id="7Aoa2yVphXk" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7Aoa2yVphX1" resolve="reportedTypes" />
+                      </node>
+                      <node concept="liA8E" id="7Aoa2yVphXl" role="2OqNvi">
+                        <ref role="37wK5l" node="7Aoa2yVe2QP" resolve="putAllTypes" />
+                        <node concept="2OqwBi" id="7Aoa2yVphXm" role="37wK5m">
+                          <node concept="37vLTw" id="7Aoa2yVphXn" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Aoa2yVphWF" resolve="response" />
+                          </node>
+                          <node concept="2OwXpG" id="7Aoa2yVphXo" role="2OqNvi">
+                            <ref role="2Oxat5" node="1RYTbd8d5$u" resolve="types" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7Aoa2yVpvIz" role="3cqZAp">
+                    <node concept="37vLTI" id="7Aoa2yVpXVE" role="3clFbG">
+                      <node concept="37vLTw" id="7Aoa2yVpZaO" role="37vLTJ">
+                        <ref role="3cqZAo" node="7Aoa2yVpUue" resolve="node" />
+                      </node>
+                      <node concept="2OqwBi" id="7Aoa2yVpByS" role="37vLTx">
+                        <node concept="37vLTw" id="7Aoa2yVpvIx" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yVphX1" resolve="reportedTypes" />
+                        </node>
+                        <node concept="liA8E" id="7Aoa2yVpMbF" role="2OqNvi">
+                          <ref role="37wK5l" node="7Aoa2yVpIT7" resolve="getType" />
+                          <node concept="37vLTw" id="7Aoa2yVpRU1" role="37wK5m">
+                            <ref role="3cqZAo" node="7Aoa2yVpx9t" resolve="subjectRef" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="7Aoa2yVphXq" role="3cqZAp" />
+                  <node concept="3cpWs8" id="7Aoa2yVphXr" role="3cqZAp">
+                    <node concept="3cpWsn" id="7Aoa2yVphXs" role="3cpWs9">
+                      <property role="TrG5h" value="reportedItems" />
+                      <node concept="3uibUv" id="7Aoa2yVphXt" role="1tU5fm">
+                        <ref role="3uigEE" node="7Aoa2yVfU_u" resolve="ReportedItems" />
+                      </node>
+                      <node concept="2OqwBi" id="7Aoa2yVphXu" role="33vP2m">
+                        <node concept="37vLTw" id="7Aoa2yVphXv" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yVphW$" resolve="cachedData" />
+                        </node>
+                        <node concept="liA8E" id="7Aoa2yVphXw" role="2OqNvi">
+                          <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
+                          <node concept="37vLTw" id="7Aoa2yVphYI" role="37wK5m">
+                            <ref role="3cqZAo" node="7Aoa2yVg9X5" resolve="REPORTED_ITEMS" />
+                          </node>
+                          <node concept="1bVj0M" id="7Aoa2yVphXx" role="37wK5m">
+                            <node concept="3clFbS" id="7Aoa2yVphXy" role="1bW5cS">
+                              <node concept="3clFbF" id="7Aoa2yVphXz" role="3cqZAp">
+                                <node concept="2ShNRf" id="7Aoa2yVphX$" role="3clFbG">
+                                  <node concept="HV5vD" id="7Aoa2yVphX_" role="2ShVmc">
+                                    <property role="373rjd" value="true" />
+                                    <ref role="HV5vE" node="7Aoa2yVfU_u" resolve="ReportedItems" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7Aoa2yVphXA" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Aoa2yVphXB" role="3clFbG">
+                      <node concept="37vLTw" id="7Aoa2yVphXC" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7Aoa2yVphXs" resolve="reportedItems" />
+                      </node>
+                      <node concept="liA8E" id="7Aoa2yVphXD" role="2OqNvi">
+                        <ref role="37wK5l" node="7Aoa2yVg38k" resolve="changedBasis" />
+                        <node concept="2OqwBi" id="7Aoa2yVphXE" role="37wK5m">
+                          <node concept="37vLTw" id="7Aoa2yVphXF" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Aoa2yVphWF" resolve="response" />
+                          </node>
+                          <node concept="2OwXpG" id="7Aoa2yVphXG" role="2OqNvi">
+                            <ref role="2Oxat5" node="55xYlrlX9c4" resolve="invalidatedFeedbackBasis" />
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="7Aoa2yVphXH" role="37wK5m">
+                          <node concept="37vLTw" id="7Aoa2yVphXI" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Aoa2yVphWF" resolve="response" />
+                          </node>
+                          <node concept="2OwXpG" id="7Aoa2yVphXJ" role="2OqNvi">
+                            <ref role="2Oxat5" node="6DQTzHy5p_p" resolve="validatedFeedbackBasis" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7Aoa2yVphXK" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Aoa2yVphXL" role="3clFbG">
+                      <node concept="37vLTw" id="7Aoa2yVphXM" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7Aoa2yVphXs" resolve="reportedItems" />
+                      </node>
+                      <node concept="liA8E" id="7Aoa2yVphXN" role="2OqNvi">
+                        <ref role="37wK5l" node="7Aoa2yVg8Dv" resolve="addReportItems" />
+                        <node concept="2OqwBi" id="7Aoa2yVphXO" role="37wK5m">
+                          <node concept="37vLTw" id="7Aoa2yVphXP" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Aoa2yVphWF" resolve="response" />
+                          </node>
+                          <node concept="2OwXpG" id="7Aoa2yVphXQ" role="2OqNvi">
+                            <ref role="2Oxat5" node="1RYTbd8cqGt" resolve="reportItems" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7Aoa2yVphXR" role="3cqZAp">
+                    <node concept="37vLTI" id="7Aoa2yVphXS" role="3clFbG">
+                      <node concept="2OqwBi" id="7Aoa2yVphXT" role="37vLTx">
+                        <node concept="37vLTw" id="7Aoa2yVphXU" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yVphXs" resolve="reportedItems" />
+                        </node>
+                        <node concept="liA8E" id="7Aoa2yVphXV" role="2OqNvi">
+                          <ref role="37wK5l" node="7Aoa2yVl_uk" resolve="allReportItems" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="7Aoa2yVphXW" role="37vLTJ">
+                        <ref role="3cqZAo" node="7Aoa2yVphWr" resolve="allReportItems" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="7Aoa2yVphXX" role="3cqZAp" />
                 </node>
               </node>
             </node>
@@ -14983,52 +11989,8 @@
         <node concept="3clFbF" id="1RYTbd8sE5L" role="3cqZAp">
           <node concept="1rXfSq" id="1RYTbd8sE5J" role="3clFbG">
             <ref role="37wK5l" node="1z4$59i_qJE" resolve="forwardReportItems" />
-            <node concept="2OqwBi" id="1RYTbd8sG17" role="37wK5m">
-              <node concept="37vLTw" id="1RYTbd8sFTD" role="2Oq$k0">
-                <ref role="3cqZAo" node="1RYTbd81$X$" resolve="cache" />
-              </node>
-              <node concept="liA8E" id="1RYTbd8sGkW" role="2OqNvi">
-                <ref role="37wK5l" node="3yEb0I3SXN3" resolve="allReportItems" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1RYTbd81$XS" role="3cqZAp" />
-        <node concept="3cpWs8" id="6v6oK28eiDt" role="3cqZAp">
-          <node concept="3cpWsn" id="6v6oK28eiDu" role="3cpWs9">
-            <property role="TrG5h" value="node" />
-            <node concept="3Tqbb2" id="6v6oK28ehkd" role="1tU5fm" />
-            <node concept="3K4zz7" id="6v6oK28eiDv" role="33vP2m">
-              <node concept="10Nm6u" id="6v6oK28eiDw" role="3K4GZi" />
-              <node concept="3y3z36" id="6v6oK28eiDx" role="3K4Cdx">
-                <node concept="10Nm6u" id="6v6oK28eiDy" role="3uHU7w" />
-                <node concept="37vLTw" id="6v6oK28eiDz" role="3uHU7B">
-                  <ref role="3cqZAo" node="1RYTbd81$X$" resolve="cache" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="6v6oK28eiD$" role="3K4E3e">
-                <node concept="37vLTw" id="6v6oK28eiD_" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1RYTbd81$X$" resolve="cache" />
-                </node>
-                <node concept="liA8E" id="6v6oK28eiDA" role="2OqNvi">
-                  <ref role="37wK5l" node="6QH_LDtcxgN" resolve="getType" />
-                  <node concept="2OqwBi" id="6v6oK28eiDB" role="37wK5m">
-                    <node concept="2JrnkZ" id="6v6oK28eiDC" role="2Oq$k0">
-                      <node concept="2OqwBi" id="6v6oK28eiDD" role="2JrQYb">
-                        <node concept="1rXfSq" id="6v6oK28eiDE" role="2Oq$k0">
-                          <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
-                        </node>
-                        <node concept="liA8E" id="6v6oK28eiDF" role="2OqNvi">
-                          <ref role="37wK5l" node="6v6oK25lKkp" resolve="getSubject" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="6v6oK28eiDG" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                    </node>
-                  </node>
-                </node>
-              </node>
+            <node concept="37vLTw" id="7Aoa2yVplrK" role="37wK5m">
+              <ref role="3cqZAo" node="7Aoa2yVphWr" resolve="allReportItems" />
             </node>
           </node>
         </node>
@@ -15037,7 +11999,7 @@
             <ref role="37wK5l" node="1RYTbd8cMMZ" resolve="of" />
             <ref role="1Pybhc" node="1RYTbd8bNK8" resolve="Response" />
             <node concept="37vLTw" id="6v6oK28eoYU" role="37wK5m">
-              <ref role="3cqZAo" node="6v6oK28eiDu" resolve="node" />
+              <ref role="3cqZAo" node="7Aoa2yVpUue" resolve="node" />
             </node>
           </node>
         </node>
@@ -15173,201 +12135,210 @@
       <node concept="3Tm1VV" id="1z4$59iPN5a" role="1B3o_S" />
       <node concept="3clFbS" id="1z4$59izJq3" role="3clF47">
         <node concept="3clFbH" id="1RYTbd82m2O" role="3cqZAp" />
-        <node concept="3cpWs8" id="1RYTbd82m2P" role="3cqZAp">
-          <node concept="3cpWsn" id="1RYTbd82m2Q" role="3cpWs9">
-            <property role="TrG5h" value="cache" />
-            <node concept="3uibUv" id="1RYTbd82m2R" role="1tU5fm">
-              <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-            </node>
-            <node concept="2OqwBi" id="1RYTbd82m2S" role="33vP2m">
-              <node concept="37vLTw" id="1C_jAsqiv7r" role="2Oq$k0">
-                <ref role="3cqZAo" node="1C_jAsqhPec" resolve="state" />
-              </node>
-              <node concept="liA8E" id="1RYTbd82m2U" role="2OqNvi">
-                <ref role="37wK5l" node="2hQbw6GScMc" resolve="updateSharedTypecheckingResults" />
-                <node concept="1bVj0M" id="1RYTbd82m2V" role="37wK5m">
-                  <node concept="3clFbS" id="1RYTbd82m2W" role="1bW5cS">
-                    <node concept="3clFbF" id="1RYTbd82m2X" role="3cqZAp">
-                      <node concept="3y3z36" id="1RYTbd82m2Y" role="3clFbG">
-                        <node concept="10Nm6u" id="1RYTbd82m2Z" role="3uHU7w" />
-                        <node concept="2OqwBi" id="1RYTbd82m30" role="3uHU7B">
-                          <node concept="37vLTw" id="1RYTbd82m31" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1RYTbd82m37" resolve="cache" />
-                          </node>
-                          <node concept="liA8E" id="1RYTbd82m32" role="2OqNvi">
-                            <ref role="37wK5l" node="6QH_LDtcxgN" resolve="getType" />
-                            <node concept="2OqwBi" id="6v6oK24ZuSh" role="37wK5m">
-                              <node concept="iZEcu" id="6v6oK24ZuSi" role="2OqNvi" />
-                              <node concept="2OqwBi" id="6v6oK24ZuSj" role="2Oq$k0">
-                                <node concept="1rXfSq" id="6v6oK24ZuSk" role="2Oq$k0">
-                                  <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
-                                </node>
-                                <node concept="liA8E" id="6v6oK24ZuSl" role="2OqNvi">
-                                  <ref role="37wK5l" node="1T5MAgP$9vt" resolve="getSubject" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="1RYTbd82m36" role="3cqZAp" />
-                  </node>
-                  <node concept="37vLTG" id="1RYTbd82m37" role="1bW2Oz">
-                    <property role="TrG5h" value="cache" />
-                    <node concept="3uibUv" id="1RYTbd82m38" role="1tU5fm">
-                      <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
-                    </node>
-                  </node>
+        <node concept="3cpWs8" id="7Aoa2yVrH58" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVrH59" role="3cpWs9">
+            <property role="TrG5h" value="subjectRef" />
+            <node concept="2sp9CU" id="7Aoa2yVrGoW" role="1tU5fm" />
+            <node concept="2OqwBi" id="7Aoa2yVrH5a" role="33vP2m">
+              <node concept="iZEcu" id="7Aoa2yVrH5b" role="2OqNvi" />
+              <node concept="2OqwBi" id="7Aoa2yVrH5c" role="2Oq$k0">
+                <node concept="1rXfSq" id="7Aoa2yVrH5d" role="2Oq$k0">
+                  <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
                 </node>
-                <node concept="1bVj0M" id="1RYTbd82m39" role="37wK5m">
-                  <node concept="37vLTG" id="1RYTbd82m3a" role="1bW2Oz">
-                    <property role="TrG5h" value="updatable" />
-                    <node concept="3uibUv" id="1RYTbd82m3b" role="1tU5fm">
-                      <ref role="3uigEE" node="4Dkptq1Qcxp" resolve="CacheUpdatable" />
-                    </node>
-                  </node>
-                  <node concept="3clFbS" id="1RYTbd82m3c" role="1bW5cS">
-                    <node concept="3clFbH" id="1C_jAsqsIqx" role="3cqZAp" />
-                    <node concept="3cpWs8" id="1C_jAsqsLmN" role="3cqZAp">
-                      <node concept="3cpWsn" id="1C_jAsqsLmO" role="3cpWs9">
-                        <property role="TrG5h" value="strategy" />
-                        <node concept="2ShNRf" id="1C_jAsqsLmP" role="33vP2m">
-                          <node concept="1pGfFk" id="1C_jAsqsLmQ" role="2ShVmc">
-                            <ref role="37wK5l" node="5Qx6_65F4Qp" resolve="TypecheckingStrategy.Caching" />
-                            <node concept="Xjq3P" id="1C_jAsqsLmR" role="37wK5m" />
-                            <node concept="2OqwBi" id="1C_jAsqsPik" role="37wK5m">
-                              <node concept="37vLTw" id="1C_jAsqsLmS" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1C_jAsqhPec" resolve="state" />
-                              </node>
-                              <node concept="liA8E" id="1C_jAsqsQq9" role="2OqNvi">
-                                <ref role="37wK5l" node="1C_jAsql6Ib" resolve="getRepository" />
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="1C_jAsqsLmT" role="37wK5m">
-                              <ref role="3cqZAo" node="1C_jAsqp06t" resolve="messageHandler" />
-                            </node>
-                            <node concept="2OqwBi" id="1C_jAsqsSYT" role="37wK5m">
-                              <node concept="37vLTw" id="1C_jAsqsLmU" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1C_jAsqhPec" resolve="state" />
-                              </node>
-                              <node concept="liA8E" id="1C_jAsqsTUv" role="2OqNvi">
-                                <ref role="37wK5l" node="1T5MAgPidDk" resolve="typeCollector" />
-                              </node>
-                            </node>
-                            <node concept="2OqwBi" id="1C_jAsqsLmV" role="37wK5m">
-                              <node concept="37vLTw" id="1C_jAsqsLmW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1RYTbd82m3a" resolve="updatable" />
-                              </node>
-                              <node concept="liA8E" id="1C_jAsqsLmX" role="2OqNvi">
-                                <ref role="37wK5l" node="61G6TdD6$Xx" resolve="cacheHolder" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3uibUv" id="1C_jAsqsLmY" role="1tU5fm">
-                          <ref role="3uigEE" node="61G6TdCqpnb" resolve="TypecheckingStrategy" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3cpWs8" id="1RYTbd8l4LV" role="3cqZAp">
-                      <node concept="3cpWsn" id="1RYTbd8l4LW" role="3cpWs9">
-                        <property role="TrG5h" value="response" />
-                        <node concept="3uibUv" id="1RYTbd8kSxw" role="1tU5fm">
-                          <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
-                          <node concept="3qTvmN" id="6v6oK23icJP" role="11_B2D" />
-                        </node>
-                        <node concept="2OqwBi" id="1C_jAsqsLo6" role="33vP2m">
-                          <node concept="37vLTw" id="1C_jAsqsLo7" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1C_jAsqsLmO" resolve="strategy" />
-                          </node>
-                          <node concept="liA8E" id="7Aoa2yTOIU_" role="2OqNvi">
-                            <ref role="37wK5l" node="7Aoa2yU04_N" resolve="launch" />
-                            <node concept="3clFbT" id="7Aoa2yTORcN" role="37wK5m" />
-                            <node concept="37Ijox" id="7Aoa2yTOJwT" role="37wK5m">
-                              <ref role="37Ijqf" node="1RYTbd8cMMZ" resolve="of" />
-                              <node concept="2FaPjH" id="7Aoa2yTOJwV" role="wWaWy">
-                                <node concept="3uibUv" id="7Aoa2yTOJwW" role="2FaQuo">
-                                  <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="1C_jAsqsIr1" role="3cqZAp" />
-                    <node concept="3clFbF" id="1RYTbd8lkFq" role="3cqZAp">
-                      <node concept="2OqwBi" id="1RYTbd8lkZl" role="3clFbG">
-                        <node concept="37vLTw" id="1RYTbd8lkFo" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1RYTbd82m3a" resolve="updatable" />
-                        </node>
-                        <node concept="liA8E" id="1RYTbd8llhj" role="2OqNvi">
-                          <ref role="37wK5l" node="5Qx6_65$vyG" resolve="update" />
-                          <node concept="1bVj0M" id="1RYTbd8lm1i" role="37wK5m">
-                            <node concept="37vLTG" id="1RYTbd8lmfz" role="1bW2Oz">
-                              <property role="TrG5h" value="update" />
-                              <node concept="3uibUv" id="1RYTbd8lmu3" role="1tU5fm">
-                                <ref role="3uigEE" node="1z4$59jqeoH" resolve="TypecheckingResultsCache.Update" />
-                              </node>
-                            </node>
-                            <node concept="3clFbS" id="1RYTbd8lm1k" role="1bW5cS">
-                              <node concept="3clFbF" id="1RYTbd8lq1a" role="3cqZAp">
-                                <node concept="2OqwBi" id="1RYTbd8lqdA" role="3clFbG">
-                                  <node concept="37vLTw" id="1RYTbd8lq18" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1RYTbd8lmfz" resolve="update" />
-                                  </node>
-                                  <node concept="liA8E" id="1RYTbd8lq$m" role="2OqNvi">
-                                    <ref role="37wK5l" node="1z4$59jqkDZ" resolve="putAllTypes" />
-                                    <node concept="2OqwBi" id="1RYTbd8lroG" role="37wK5m">
-                                      <node concept="37vLTw" id="1RYTbd8lr3V" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1RYTbd8l4LW" resolve="response" />
-                                      </node>
-                                      <node concept="2OwXpG" id="1RYTbd8lrOv" role="2OqNvi">
-                                        <ref role="2Oxat5" node="1RYTbd8d5$u" resolve="types" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbH" id="1RYTbd8lnmK" role="3cqZAp" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
+                <node concept="liA8E" id="7Aoa2yVrH5e" role="2OqNvi">
+                  <ref role="37wK5l" node="1T5MAgP$9vt" resolve="getSubject" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="1RYTbd82m3k" role="3cqZAp" />
         <node concept="3cpWs8" id="6v6oK28itPS" role="3cqZAp">
           <node concept="3cpWsn" id="6v6oK28itPT" role="3cpWs9">
             <property role="TrG5h" value="type" />
             <node concept="3Tqbb2" id="6v6oK28itpp" role="1tU5fm" />
-            <node concept="2OqwBi" id="6v6oK28itPU" role="33vP2m">
-              <node concept="37vLTw" id="6v6oK28itPV" role="2Oq$k0">
-                <ref role="3cqZAo" node="1RYTbd82m2Q" resolve="cache" />
-              </node>
-              <node concept="liA8E" id="6v6oK28itPW" role="2OqNvi">
-                <ref role="37wK5l" node="6QH_LDtcxgN" resolve="getType" />
-                <node concept="2OqwBi" id="6v6oK28itPX" role="37wK5m">
-                  <node concept="iZEcu" id="6v6oK28itPY" role="2OqNvi" />
-                  <node concept="2OqwBi" id="6v6oK28itPZ" role="2Oq$k0">
-                    <node concept="1rXfSq" id="6v6oK28itQ0" role="2Oq$k0">
-                      <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
-                    </node>
-                    <node concept="liA8E" id="6v6oK28itQ1" role="2OqNvi">
-                      <ref role="37wK5l" node="1T5MAgP$9vt" resolve="getSubject" />
+            <node concept="10Nm6u" id="7Aoa2yVsdch" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="7Aoa2yVrJTD" role="3cqZAp" />
+        <node concept="3clFbF" id="7Aoa2yVqS8P" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVqT2O" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVqS8N" role="2Oq$k0">
+              <ref role="3cqZAo" node="1C_jAsqhPec" resolve="state" />
+            </node>
+            <node concept="liA8E" id="7Aoa2yVqTQO" role="2OqNvi">
+              <ref role="37wK5l" node="7Aoa2yVqV_s" resolve="updateSharedCachedData" />
+              <node concept="1bVj0M" id="7Aoa2yVriP$" role="37wK5m">
+                <node concept="gl6BB" id="7Aoa2yVriPO" role="1bW2Oz">
+                  <property role="TrG5h" value="cachedData" />
+                  <node concept="2jxLKc" id="7Aoa2yVriPP" role="1tU5fm" />
+                </node>
+                <node concept="gl6BB" id="7Aoa2yVriQ8" role="1bW2Oz">
+                  <property role="TrG5h" value="fresh" />
+                  <node concept="2jxLKc" id="7Aoa2yVriQ9" role="1tU5fm" />
+                </node>
+                <node concept="3clFbS" id="7Aoa2yVriQa" role="1bW5cS">
+                  <node concept="3clFbH" id="7Aoa2yVrp1u" role="3cqZAp" />
+                  <node concept="3cpWs8" id="7Aoa2yVrAio" role="3cqZAp">
+                    <node concept="3cpWsn" id="7Aoa2yVrAip" role="3cpWs9">
+                      <property role="TrG5h" value="reportedTypes" />
+                      <node concept="3uibUv" id="7Aoa2yVrAiq" role="1tU5fm">
+                        <ref role="3uigEE" node="7Aoa2yVdSP8" resolve="ReportedTypes" />
+                      </node>
+                      <node concept="2OqwBi" id="7Aoa2yVrAir" role="33vP2m">
+                        <node concept="37vLTw" id="7Aoa2yVrAis" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yVriPO" resolve="cachedData" />
+                        </node>
+                        <node concept="liA8E" id="7Aoa2yVrAit" role="2OqNvi">
+                          <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
+                          <node concept="10M0yZ" id="7Aoa2yVrA5Q" role="37wK5m">
+                            <ref role="1PxDUh" node="6v6oK27venk" />
+                            <ref role="3cqZAo" node="7Aoa2yVefYI" />
+                          </node>
+                          <node concept="1bVj0M" id="7Aoa2yVrAiu" role="37wK5m">
+                            <node concept="3clFbS" id="7Aoa2yVrAiv" role="1bW5cS">
+                              <node concept="3clFbF" id="7Aoa2yVrAiw" role="3cqZAp">
+                                <node concept="2ShNRf" id="7Aoa2yVrAix" role="3clFbG">
+                                  <node concept="HV5vD" id="7Aoa2yVrAiy" role="2ShVmc">
+                                    <property role="373rjd" value="true" />
+                                    <ref role="HV5vE" node="7Aoa2yVdSP8" resolve="ReportedTypes" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
+                  <node concept="3clFbJ" id="7Aoa2yVrMXS" role="3cqZAp">
+                    <node concept="3clFbS" id="7Aoa2yVrMYg" role="3clFbx">
+                      <node concept="3clFbH" id="7Aoa2yVshlL" role="3cqZAp" />
+                      <node concept="3cpWs8" id="1C_jAsqsLmN" role="3cqZAp">
+                        <node concept="3cpWsn" id="1C_jAsqsLmO" role="3cpWs9">
+                          <property role="TrG5h" value="strategy" />
+                          <node concept="2ShNRf" id="1C_jAsqsLmP" role="33vP2m">
+                            <node concept="1pGfFk" id="1C_jAsqsLmQ" role="2ShVmc">
+                              <ref role="37wK5l" node="5Qx6_65F4Qp" resolve="TypecheckingStrategy.Caching" />
+                              <node concept="Xjq3P" id="1C_jAsqsLmR" role="37wK5m" />
+                              <node concept="2OqwBi" id="1C_jAsqsPik" role="37wK5m">
+                                <node concept="37vLTw" id="1C_jAsqsLmS" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="1C_jAsqhPec" resolve="state" />
+                                </node>
+                                <node concept="liA8E" id="1C_jAsqsQq9" role="2OqNvi">
+                                  <ref role="37wK5l" node="1C_jAsql6Ib" resolve="getRepository" />
+                                </node>
+                              </node>
+                              <node concept="37vLTw" id="1C_jAsqsLmT" role="37wK5m">
+                                <ref role="3cqZAo" node="1C_jAsqp06t" resolve="messageHandler" />
+                              </node>
+                              <node concept="2OqwBi" id="1C_jAsqsSYT" role="37wK5m">
+                                <node concept="37vLTw" id="1C_jAsqsLmU" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="1C_jAsqhPec" resolve="state" />
+                                </node>
+                                <node concept="liA8E" id="1C_jAsqsTUv" role="2OqNvi">
+                                  <ref role="37wK5l" node="1T5MAgPidDk" resolve="typeCollector" />
+                                </node>
+                              </node>
+                              <node concept="37vLTw" id="7Aoa2yVs06b" role="37wK5m">
+                                <ref role="3cqZAo" node="7Aoa2yVriPO" resolve="cachedData" />
+                              </node>
+                              <node concept="37vLTw" id="7Aoa2yVs1yE" role="37wK5m">
+                                <ref role="3cqZAo" node="7Aoa2yVriQ8" resolve="fresh" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3uibUv" id="1C_jAsqsLmY" role="1tU5fm">
+                            <ref role="3uigEE" node="61G6TdCqpnb" resolve="TypecheckingStrategy" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="7Aoa2yVs2dr" role="3cqZAp" />
+                      <node concept="3cpWs8" id="1RYTbd8l4LV" role="3cqZAp">
+                        <node concept="3cpWsn" id="1RYTbd8l4LW" role="3cpWs9">
+                          <property role="TrG5h" value="response" />
+                          <node concept="3uibUv" id="1RYTbd8kSxw" role="1tU5fm">
+                            <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
+                            <node concept="3qTvmN" id="6v6oK23icJP" role="11_B2D" />
+                          </node>
+                          <node concept="2OqwBi" id="1C_jAsqsLo6" role="33vP2m">
+                            <node concept="37vLTw" id="1C_jAsqsLo7" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1C_jAsqsLmO" resolve="strategy" />
+                            </node>
+                            <node concept="liA8E" id="7Aoa2yTOIU_" role="2OqNvi">
+                              <ref role="37wK5l" node="7Aoa2yU04_N" resolve="launch" />
+                              <node concept="3clFbT" id="7Aoa2yTORcN" role="37wK5m" />
+                              <node concept="37Ijox" id="7Aoa2yTOJwT" role="37wK5m">
+                                <ref role="37Ijqf" node="1RYTbd8cMMZ" resolve="of" />
+                                <node concept="2FaPjH" id="7Aoa2yTOJwV" role="wWaWy">
+                                  <node concept="3uibUv" id="7Aoa2yTOJwW" role="2FaQuo">
+                                    <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="1RYTbd8lq1a" role="3cqZAp">
+                        <node concept="2OqwBi" id="1RYTbd8lqdA" role="3clFbG">
+                          <node concept="37vLTw" id="1RYTbd8lq18" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Aoa2yVrAip" resolve="reportedTypes" />
+                          </node>
+                          <node concept="liA8E" id="1RYTbd8lq$m" role="2OqNvi">
+                            <ref role="37wK5l" node="7Aoa2yVe2QP" resolve="putAllTypes" />
+                            <node concept="2OqwBi" id="1RYTbd8lroG" role="37wK5m">
+                              <node concept="37vLTw" id="1RYTbd8lr3V" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1RYTbd8l4LW" resolve="response" />
+                              </node>
+                              <node concept="2OwXpG" id="1RYTbd8lrOv" role="2OqNvi">
+                                <ref role="2Oxat5" node="1RYTbd8d5$u" resolve="types" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="7Aoa2yVrNFS" role="3cqZAp" />
+                    </node>
+                    <node concept="3clFbC" id="7Aoa2yVrFWo" role="3clFbw">
+                      <node concept="2OqwBi" id="7Aoa2yVrCIs" role="3uHU7B">
+                        <node concept="37vLTw" id="7Aoa2yVrC8O" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yVrAip" resolve="reportedTypes" />
+                        </node>
+                        <node concept="liA8E" id="7Aoa2yVrEa4" role="2OqNvi">
+                          <ref role="37wK5l" node="7Aoa2yVpIT7" resolve="getType" />
+                          <node concept="37vLTw" id="7Aoa2yVrH5f" role="37wK5m">
+                            <ref role="3cqZAo" node="7Aoa2yVrH59" resolve="subjectRef" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="10Nm6u" id="7Aoa2yVrF3D" role="3uHU7w" />
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7Aoa2yVs8AF" role="3cqZAp">
+                    <node concept="37vLTI" id="7Aoa2yVs8AH" role="3clFbG">
+                      <node concept="2OqwBi" id="6v6oK28itPU" role="37vLTx">
+                        <node concept="37vLTw" id="6v6oK28itPV" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yVrAip" resolve="reportedTypes" />
+                        </node>
+                        <node concept="liA8E" id="6v6oK28itPW" role="2OqNvi">
+                          <ref role="37wK5l" node="7Aoa2yVpIT7" resolve="getType" />
+                          <node concept="37vLTw" id="7Aoa2yVs7ac" role="37wK5m">
+                            <ref role="3cqZAo" node="7Aoa2yVrH59" resolve="subjectRef" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="7Aoa2yVs8AL" role="37vLTJ">
+                        <ref role="3cqZAo" node="6v6oK28itPT" resolve="type" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="7Aoa2yVrp1v" role="3cqZAp" />
                 </node>
               </node>
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="7Aoa2yVqR2O" role="3cqZAp" />
         <node concept="3clFbF" id="6v6oK28ix0w" role="3cqZAp">
           <node concept="2YIFZM" id="6v6oK28izhZ" role="3clFbG">
             <ref role="37wK5l" node="1RYTbd8cMMZ" resolve="of" />
@@ -15441,7 +12412,7 @@
     <node concept="3clFbW" id="6v6oK27i3ML" role="jymVt">
       <node concept="3clFbS" id="6v6oK27i3MM" role="3clF47">
         <node concept="XkiVB" id="6v6oK27i3MR" role="3cqZAp">
-          <ref role="37wK5l" node="1z4$59irJq1" resolve="Request" />
+          <ref role="37wK5l" node="7Aoa2yVx6AT" />
           <node concept="37vLTw" id="6v6oK27i3MP" role="37wK5m">
             <ref role="3cqZAo" node="6v6oK27i3MB" resolve="coerceQuery" />
           </node>
@@ -15461,249 +12432,236 @@
       <property role="TrG5h" value="evaluate" />
       <node concept="3Tmbuc" id="6v6oK28fmC1" role="1B3o_S" />
       <node concept="3clFbS" id="1z4$59i$uVn" role="3clF47">
-        <node concept="3cpWs8" id="1RYTbd83yk5" role="3cqZAp">
-          <node concept="3cpWsn" id="1RYTbd83yk6" role="3cpWs9">
-            <property role="TrG5h" value="pair" />
-            <node concept="3uibUv" id="1RYTbd83yk7" role="1tU5fm">
+        <node concept="3cpWs8" id="7Aoa2yVwt30" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVwt31" role="3cpWs9">
+            <property role="TrG5h" value="coerceToConcept" />
+            <node concept="3uibUv" id="7Aoa2yVwt32" role="1tU5fm">
               <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-              <node concept="3uibUv" id="1RYTbd83yk8" role="11_B2D">
+              <node concept="3uibUv" id="7Aoa2yVwt33" role="11_B2D">
                 <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
               </node>
-              <node concept="3Tqbb2" id="1RYTbd83yk9" role="11_B2D" />
+              <node concept="3Tqbb2" id="7Aoa2yVwt34" role="11_B2D" />
             </node>
-            <node concept="2OqwBi" id="1RYTbd83yka" role="33vP2m">
-              <node concept="37vLTw" id="1C_jAsqi7de" role="2Oq$k0">
-                <ref role="3cqZAo" node="1C_jAsqhPef" resolve="state" />
-              </node>
-              <node concept="liA8E" id="1RYTbd83ykc" role="2OqNvi">
-                <ref role="37wK5l" node="1z4$59jvV_B" resolve="getOrUpdateValue" />
-                <node concept="1bVj0M" id="1RYTbd83ykd" role="37wK5m">
-                  <node concept="3clFbS" id="1RYTbd83yke" role="1bW5cS">
-                    <node concept="3clFbF" id="1RYTbd83ykf" role="3cqZAp">
-                      <node concept="2OqwBi" id="1RYTbd83ykg" role="3clFbG">
-                        <node concept="37vLTw" id="1RYTbd83ykh" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1RYTbd83ykm" resolve="cache" />
+            <node concept="10Nm6u" id="7Aoa2yVwt35" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="7Aoa2yVwt36" role="3cqZAp" />
+        <node concept="3clFbF" id="7Aoa2yVwt37" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVwt38" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVwt39" role="2Oq$k0">
+              <ref role="3cqZAo" node="1C_jAsqhPef" resolve="state" />
+            </node>
+            <node concept="liA8E" id="7Aoa2yVwt3a" role="2OqNvi">
+              <ref role="37wK5l" node="7Aoa2yVqV_s" resolve="updateSharedCachedData" />
+              <node concept="1bVj0M" id="7Aoa2yVwt3b" role="37wK5m">
+                <node concept="gl6BB" id="7Aoa2yVwt3c" role="1bW2Oz">
+                  <property role="TrG5h" value="cachedData" />
+                  <node concept="2jxLKc" id="7Aoa2yVwt3d" role="1tU5fm" />
+                </node>
+                <node concept="gl6BB" id="7Aoa2yVwt3e" role="1bW2Oz">
+                  <property role="TrG5h" value="fresh" />
+                  <node concept="2jxLKc" id="7Aoa2yVwt3f" role="1tU5fm" />
+                </node>
+                <node concept="3clFbS" id="7Aoa2yVwt3g" role="1bW5cS">
+                  <node concept="3clFbH" id="7Aoa2yVwt3h" role="3cqZAp" />
+                  <node concept="3cpWs8" id="7Aoa2yVwt3i" role="3cqZAp">
+                    <node concept="3cpWsn" id="7Aoa2yVwt3j" role="3cpWs9">
+                      <property role="TrG5h" value="conversionInfo" />
+                      <node concept="3uibUv" id="7Aoa2yVwt3k" role="1tU5fm">
+                        <ref role="3uigEE" node="7Aoa2yVt0Sb" resolve="ConversionInfo" />
+                      </node>
+                      <node concept="2OqwBi" id="7Aoa2yVwt3l" role="33vP2m">
+                        <node concept="37vLTw" id="7Aoa2yVwt3m" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yVwt3c" resolve="cachedData" />
                         </node>
-                        <node concept="liA8E" id="1RYTbd83yki" role="2OqNvi">
-                          <ref role="37wK5l" node="1z4$59j$eEZ" resolve="coerceToConcept" />
-                          <node concept="2OqwBi" id="6v6oK253Isc" role="37wK5m">
-                            <node concept="1rXfSq" id="6v6oK253Cg9" role="2Oq$k0">
+                        <node concept="liA8E" id="7Aoa2yVwt3n" role="2OqNvi">
+                          <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
+                          <node concept="10M0yZ" id="7Aoa2yVxbyd" role="37wK5m">
+                            <ref role="3cqZAo" node="7Aoa2yVuwe5" resolve="CONVERSION_INFO" />
+                            <ref role="1PxDUh" node="7Aoa2yVx5U6" resolve="AbstractConvertsRequest" />
+                          </node>
+                          <node concept="1bVj0M" id="7Aoa2yVwt3p" role="37wK5m">
+                            <node concept="3clFbS" id="7Aoa2yVwt3q" role="1bW5cS">
+                              <node concept="3clFbF" id="7Aoa2yVwt3r" role="3cqZAp">
+                                <node concept="2ShNRf" id="7Aoa2yVwt3s" role="3clFbG">
+                                  <node concept="HV5vD" id="7Aoa2yVwt3t" role="2ShVmc">
+                                    <property role="373rjd" value="true" />
+                                    <ref role="HV5vE" node="7Aoa2yVt0Sb" resolve="ConversionInfo" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7Aoa2yVwt3u" role="3cqZAp">
+                    <node concept="37vLTI" id="7Aoa2yVwt3v" role="3clFbG">
+                      <node concept="2OqwBi" id="7Aoa2yVwt3w" role="37vLTx">
+                        <node concept="37vLTw" id="7Aoa2yVwt3x" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yVwt3j" resolve="conversionInfo" />
+                        </node>
+                        <node concept="liA8E" id="7Aoa2yVwvjP" role="2OqNvi">
+                          <ref role="37wK5l" node="7Aoa2yVtzex" resolve="coerceToConcept" />
+                          <node concept="2OqwBi" id="7Aoa2yVwvjQ" role="37wK5m">
+                            <node concept="1rXfSq" id="7Aoa2yVwvjR" role="2Oq$k0">
                               <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
                             </node>
-                            <node concept="liA8E" id="6v6oK253Otk" role="2OqNvi">
+                            <node concept="liA8E" id="7Aoa2yVwvjS" role="2OqNvi">
                               <ref role="37wK5l" node="5EDW3XDYNZD" resolve="getSource" />
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="6v6oK2545Hm" role="37wK5m">
-                            <node concept="1rXfSq" id="6v6oK253Zyw" role="2Oq$k0">
+                          <node concept="2OqwBi" id="7Aoa2yVwvjT" role="37wK5m">
+                            <node concept="1rXfSq" id="7Aoa2yVwvjU" role="2Oq$k0">
                               <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
                             </node>
-                            <node concept="liA8E" id="6v6oK254gJi" role="2OqNvi">
+                            <node concept="liA8E" id="7Aoa2yVwvjV" role="2OqNvi">
                               <ref role="37wK5l" node="5EDW3XEtgZU" resolve="getTargetConcept" />
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="3FEFhOSQ3fi" role="37wK5m">
-                            <node concept="1rXfSq" id="3FEFhOSQ1Te" role="2Oq$k0">
+                          <node concept="2OqwBi" id="7Aoa2yVwvjW" role="37wK5m">
+                            <node concept="1rXfSq" id="7Aoa2yVwvjX" role="2Oq$k0">
                               <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
                             </node>
-                            <node concept="liA8E" id="3FEFhOSQ4rW" role="2OqNvi">
+                            <node concept="liA8E" id="7Aoa2yVwvjY" role="2OqNvi">
                               <ref role="37wK5l" node="51h1DIGcbZg" resolve="isStrong" />
                             </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="3clFbH" id="1RYTbd83ykl" role="3cqZAp" />
-                  </node>
-                  <node concept="37vLTG" id="1RYTbd83ykm" role="1bW2Oz">
-                    <property role="TrG5h" value="cache" />
-                    <node concept="3uibUv" id="1RYTbd83ykn" role="1tU5fm">
-                      <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+                      <node concept="37vLTw" id="7Aoa2yVwt3G" role="37vLTJ">
+                        <ref role="3cqZAo" node="7Aoa2yVwt31" resolve="coerceTo" />
+                      </node>
                     </node>
                   </node>
-                </node>
-                <node concept="1bVj0M" id="1RYTbd83yko" role="37wK5m">
-                  <node concept="3clFbS" id="1RYTbd83ykp" role="1bW5cS">
-                    <node concept="3clFbH" id="1C_jAsqtbhz" role="3cqZAp" />
-                    <node concept="3cpWs8" id="1C_jAsqtbh$" role="3cqZAp">
-                      <node concept="3cpWsn" id="1C_jAsqtbh_" role="3cpWs9">
-                        <property role="TrG5h" value="strategy" />
-                        <node concept="3uibUv" id="1C_jAsqtbhA" role="1tU5fm">
-                          <ref role="3uigEE" node="61G6TdCqpnb" resolve="TypecheckingStrategy" />
-                        </node>
-                        <node concept="2ShNRf" id="1C_jAsqtbhB" role="33vP2m">
-                          <node concept="1pGfFk" id="1C_jAsqtbhC" role="2ShVmc">
-                            <ref role="37wK5l" node="5Qx6_65F4Qp" resolve="TypecheckingStrategy.Caching" />
-                            <node concept="Xjq3P" id="1C_jAsqtbhD" role="37wK5m" />
-                            <node concept="2OqwBi" id="1C_jAsqtpKY" role="37wK5m">
-                              <node concept="37vLTw" id="1C_jAsqtbhE" role="2Oq$k0">
+                  <node concept="3clFbH" id="7Aoa2yVwt3H" role="3cqZAp" />
+                  <node concept="3clFbJ" id="7Aoa2yVwt3I" role="3cqZAp">
+                    <node concept="3clFbS" id="7Aoa2yVwt3J" role="3clFbx">
+                      <node concept="3clFbH" id="7Aoa2yVwGPD" role="3cqZAp" />
+                      <node concept="3cpWs8" id="7Aoa2yVwt40" role="3cqZAp">
+                        <node concept="3cpWsn" id="7Aoa2yVwt41" role="3cpWs9">
+                          <property role="TrG5h" value="response" />
+                          <node concept="3uibUv" id="7Aoa2yVwt42" role="1tU5fm">
+                            <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
+                            <node concept="3Tqbb2" id="7Aoa2yVwt43" role="11_B2D" />
+                          </node>
+                          <node concept="1rXfSq" id="7Aoa2yVzhyd" role="33vP2m">
+                            <ref role="37wK5l" node="7Aoa2yVxi6Q" resolve="calcConverts" />
+                            <node concept="2OqwBi" id="7Aoa2yVwz7M" role="37wK5m">
+                              <node concept="37vLTw" id="7Aoa2yVwz7N" role="2Oq$k0">
                                 <ref role="3cqZAo" node="1C_jAsqhPef" resolve="state" />
                               </node>
-                              <node concept="liA8E" id="1C_jAsqtrd3" role="2OqNvi">
+                              <node concept="liA8E" id="7Aoa2yVwz7O" role="2OqNvi">
                                 <ref role="37wK5l" node="1C_jAsql6Ib" resolve="getRepository" />
                               </node>
                             </node>
-                            <node concept="37vLTw" id="1C_jAsqtbhF" role="37wK5m">
+                            <node concept="37vLTw" id="7Aoa2yVznv6" role="37wK5m">
                               <ref role="3cqZAo" node="1C_jAsqp06y" resolve="messageHandler" />
                             </node>
-                            <node concept="2OqwBi" id="1C_jAsqttkZ" role="37wK5m">
-                              <node concept="37vLTw" id="1C_jAsqtbhG" role="2Oq$k0">
+                            <node concept="37vLTw" id="7Aoa2yVzrWs" role="37wK5m">
+                              <ref role="3cqZAo" node="7Aoa2yVwt3c" resolve="cachedData" />
+                            </node>
+                            <node concept="37vLTw" id="7Aoa2yVzuey" role="37wK5m">
+                              <ref role="3cqZAo" node="7Aoa2yVwt3e" resolve="fresh" />
+                            </node>
+                            <node concept="2OqwBi" id="7Aoa2yVzyQV" role="37wK5m">
+                              <node concept="37vLTw" id="7Aoa2yVzxwt" role="2Oq$k0">
                                 <ref role="3cqZAo" node="1C_jAsqhPef" resolve="state" />
                               </node>
-                              <node concept="liA8E" id="1C_jAsqtxlx" role="2OqNvi">
+                              <node concept="liA8E" id="7Aoa2yVz$vk" role="2OqNvi">
                                 <ref role="37wK5l" node="1T5MAgPidDk" resolve="typeCollector" />
                               </node>
                             </node>
-                            <node concept="2OqwBi" id="1C_jAsqtbhH" role="37wK5m">
-                              <node concept="37vLTw" id="1C_jAsqtbhI" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1RYTbd83yky" resolve="updatable" />
-                              </node>
-                              <node concept="liA8E" id="1C_jAsqtbhJ" role="2OqNvi">
-                                <ref role="37wK5l" node="61G6TdD6$Xx" resolve="cacheHolder" />
-                              </node>
-                            </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="3clFbH" id="7Aoa2yTOicy" role="3cqZAp" />
-                    <node concept="3cpWs8" id="1RYTbd8854v" role="3cqZAp">
-                      <node concept="3cpWsn" id="1RYTbd8854w" role="3cpWs9">
-                        <property role="TrG5h" value="response" />
-                        <node concept="3uibUv" id="1RYTbd8iKMG" role="1tU5fm">
-                          <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
-                          <node concept="3Tqbb2" id="6v6oK28fRXP" role="11_B2D" />
-                        </node>
-                        <node concept="2OqwBi" id="1C_jAsqtbiw" role="33vP2m">
-                          <node concept="37vLTw" id="1C_jAsqtbix" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1C_jAsqtbh_" resolve="strategy" />
+                      <node concept="3clFbF" id="7Aoa2yVwt4a" role="3cqZAp">
+                        <node concept="37vLTI" id="7Aoa2yVwt4b" role="3clFbG">
+                          <node concept="37vLTw" id="7Aoa2yVwt4c" role="37vLTJ">
+                            <ref role="3cqZAo" node="7Aoa2yVwt31" resolve="coerceTo" />
                           </node>
-                          <node concept="liA8E" id="7Aoa2yTOagL" role="2OqNvi">
-                            <ref role="37wK5l" node="7Aoa2yU04_N" resolve="launch" />
-                            <node concept="3clFbT" id="7Aoa2yTObuY" role="37wK5m">
-                              <property role="3clFbU" value="true" />
-                            </node>
-                            <node concept="37Ijox" id="7Aoa2yTOf4p" role="37wK5m">
-                              <ref role="37Ijqf" node="6v6oK23lUjh" resolve="response" />
-                              <node concept="Xjq3P" id="7Aoa2yTOdKH" role="wWaWy" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="1C_jAsqtatm" role="3cqZAp" />
-                    <node concept="3clFbF" id="1RYTbd83ykq" role="3cqZAp">
-                      <node concept="2OqwBi" id="1RYTbd888P$" role="3clFbG">
-                        <node concept="37vLTw" id="1RYTbd888P_" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1RYTbd83yky" resolve="updatable" />
-                        </node>
-                        <node concept="liA8E" id="1RYTbd888PA" role="2OqNvi">
-                          <ref role="37wK5l" node="5Qx6_65$vyG" resolve="update" />
-                          <node concept="1bVj0M" id="1RYTbd888PB" role="37wK5m">
-                            <node concept="37vLTG" id="1RYTbd888PC" role="1bW2Oz">
-                              <property role="TrG5h" value="update" />
-                              <node concept="3uibUv" id="1RYTbd888PD" role="1tU5fm">
-                                <ref role="3uigEE" node="1z4$59jqeoH" resolve="TypecheckingResultsCache.Update" />
-                              </node>
-                            </node>
-                            <node concept="3clFbS" id="1RYTbd888PE" role="1bW5cS">
-                              <node concept="3clFbH" id="6v6oK28fwqH" role="3cqZAp" />
-                              <node concept="3cpWs8" id="6v6oK23APH9" role="3cqZAp">
-                                <node concept="3cpWsn" id="6v6oK23APHa" role="3cpWs9">
-                                  <property role="TrG5h" value="coerceResult" />
-                                  <node concept="3uibUv" id="6v6oK23AF1k" role="1tU5fm">
-                                    <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                                    <node concept="3uibUv" id="6v6oK23AF1p" role="11_B2D">
-                                      <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                                    </node>
-                                    <node concept="3Tqbb2" id="6v6oK23AF1q" role="11_B2D" />
-                                  </node>
-                                  <node concept="3K4zz7" id="6v6oK28ggZW" role="33vP2m">
-                                    <node concept="2ShNRf" id="6v6oK28gi8c" role="3K4E3e">
-                                      <node concept="1pGfFk" id="6v6oK28glPQ" role="2ShVmc">
-                                        <property role="373rjd" value="true" />
-                                        <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-                                        <node concept="3clFbT" id="6v6oK28gmVf" role="37wK5m">
-                                          <property role="3clFbU" value="true" />
-                                        </node>
-                                        <node concept="2OqwBi" id="6v6oK28gsp5" role="37wK5m">
-                                          <node concept="37vLTw" id="6v6oK28greE" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="1RYTbd8854w" resolve="response" />
-                                          </node>
-                                          <node concept="liA8E" id="6v6oK28gtAR" role="2OqNvi">
-                                            <ref role="37wK5l" node="1RYTbd8j4FJ" resolve="getValue" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="2OqwBi" id="6v6oK28g3UV" role="3K4Cdx">
-                                      <node concept="37vLTw" id="6v6oK28g2UR" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1RYTbd8854w" resolve="response" />
-                                      </node>
-                                      <node concept="liA8E" id="6v6oK28g5_v" role="2OqNvi">
-                                        <ref role="37wK5l" node="6v6oK28a3mY" resolve="isSuccessful" />
-                                      </node>
-                                    </node>
-                                    <node concept="2ShNRf" id="6v6oK28guPE" role="3K4GZi">
-                                      <node concept="1pGfFk" id="6v6oK28guPF" role="2ShVmc">
-                                        <property role="373rjd" value="true" />
-                                        <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-                                        <node concept="3clFbT" id="6v6oK28guPG" role="37wK5m" />
-                                        <node concept="10Nm6u" id="6v6oK28gxKE" role="37wK5m" />
-                                      </node>
-                                    </node>
-                                  </node>
+                          <node concept="3K4zz7" id="7Aoa2yVwt4d" role="37vLTx">
+                            <node concept="2ShNRf" id="7Aoa2yVwt4e" role="3K4E3e">
+                              <node concept="1pGfFk" id="7Aoa2yVwt4f" role="2ShVmc">
+                                <property role="373rjd" value="true" />
+                                <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
+                                <node concept="3clFbT" id="7Aoa2yVwt4g" role="37wK5m">
+                                  <property role="3clFbU" value="true" />
                                 </node>
-                              </node>
-                              <node concept="3clFbH" id="6v6oK28fvpE" role="3cqZAp" />
-                              <node concept="3clFbF" id="1RYTbd88ict" role="3cqZAp">
-                                <node concept="2OqwBi" id="1RYTbd88icu" role="3clFbG">
-                                  <node concept="37vLTw" id="1RYTbd88icv" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1RYTbd888PC" resolve="update" />
+                                <node concept="2OqwBi" id="7Aoa2yVwt4h" role="37wK5m">
+                                  <node concept="37vLTw" id="7Aoa2yVwt4i" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="7Aoa2yVwt41" resolve="response" />
                                   </node>
-                                  <node concept="liA8E" id="1RYTbd88icw" role="2OqNvi">
-                                    <ref role="37wK5l" node="1z4$59jFuM0" resolve="putCoerceToConcept" />
-                                    <node concept="2OqwBi" id="6v6oK254x4t" role="37wK5m">
-                                      <node concept="1rXfSq" id="6v6oK254r2x" role="2Oq$k0">
-                                        <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
-                                      </node>
-                                      <node concept="liA8E" id="6v6oK254FQo" role="2OqNvi">
-                                        <ref role="37wK5l" node="5EDW3XDYNZD" resolve="getSource" />
-                                      </node>
-                                    </node>
-                                    <node concept="2OqwBi" id="6v6oK254W4N" role="37wK5m">
-                                      <node concept="1rXfSq" id="6v6oK254QTC" role="2Oq$k0">
-                                        <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
-                                      </node>
-                                      <node concept="liA8E" id="6v6oK2555t9" role="2OqNvi">
-                                        <ref role="37wK5l" node="5EDW3XEtgZU" resolve="getTargetConcept" />
-                                      </node>
-                                    </node>
-                                    <node concept="2OqwBi" id="3FEFhOSQas5" role="37wK5m">
-                                      <node concept="1rXfSq" id="3FEFhOSQ9y1" role="2Oq$k0">
-                                        <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
-                                      </node>
-                                      <node concept="liA8E" id="3FEFhOSQbNA" role="2OqNvi">
-                                        <ref role="37wK5l" node="51h1DIGcbZg" resolve="isStrong" />
-                                      </node>
-                                    </node>
-                                    <node concept="37vLTw" id="6v6oK23APHe" role="37wK5m">
-                                      <ref role="3cqZAo" node="6v6oK23APHa" resolve="coerceResult" />
-                                    </node>
+                                  <node concept="liA8E" id="7Aoa2yVwt4j" role="2OqNvi">
+                                    <ref role="37wK5l" node="1RYTbd8j4FJ" resolve="getValue" />
                                   </node>
                                 </node>
                               </node>
                             </node>
+                            <node concept="2OqwBi" id="7Aoa2yVwt4k" role="3K4Cdx">
+                              <node concept="37vLTw" id="7Aoa2yVwt4l" role="2Oq$k0">
+                                <ref role="3cqZAo" node="7Aoa2yVwt41" resolve="response" />
+                              </node>
+                              <node concept="liA8E" id="7Aoa2yVwt4m" role="2OqNvi">
+                                <ref role="37wK5l" node="6v6oK28a3mY" resolve="isSuccessful" />
+                              </node>
+                            </node>
+                            <node concept="2ShNRf" id="7Aoa2yVwt4n" role="3K4GZi">
+                              <node concept="1pGfFk" id="7Aoa2yVwt4o" role="2ShVmc">
+                                <property role="373rjd" value="true" />
+                                <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
+                                <node concept="3clFbT" id="7Aoa2yVwt4p" role="37wK5m" />
+                                <node concept="10Nm6u" id="7Aoa2yVwt4q" role="37wK5m" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="7Aoa2yVwt4r" role="3cqZAp" />
+                      <node concept="3clFbF" id="7Aoa2yVwt4s" role="3cqZAp">
+                        <node concept="2OqwBi" id="7Aoa2yVwt4t" role="3clFbG">
+                          <node concept="37vLTw" id="7Aoa2yVwt4u" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Aoa2yVwt3j" resolve="conversionInfo" />
+                          </node>
+                          <node concept="liA8E" id="7Aoa2yVwI$i" role="2OqNvi">
+                            <ref role="37wK5l" node="7Aoa2yVthjU" resolve="putCoerceToConcept" />
+                            <node concept="2OqwBi" id="7Aoa2yVwI$j" role="37wK5m">
+                              <node concept="1rXfSq" id="7Aoa2yVwI$k" role="2Oq$k0">
+                                <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
+                              </node>
+                              <node concept="liA8E" id="7Aoa2yVwI$l" role="2OqNvi">
+                                <ref role="37wK5l" node="5EDW3XDYNZD" resolve="getSource" />
+                              </node>
+                            </node>
+                            <node concept="2OqwBi" id="7Aoa2yVwI$m" role="37wK5m">
+                              <node concept="1rXfSq" id="7Aoa2yVwI$n" role="2Oq$k0">
+                                <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
+                              </node>
+                              <node concept="liA8E" id="7Aoa2yVwI$o" role="2OqNvi">
+                                <ref role="37wK5l" node="5EDW3XEtgZU" resolve="getTargetConcept" />
+                              </node>
+                            </node>
+                            <node concept="2OqwBi" id="7Aoa2yVwI$p" role="37wK5m">
+                              <node concept="1rXfSq" id="7Aoa2yVwI$q" role="2Oq$k0">
+                                <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
+                              </node>
+                              <node concept="liA8E" id="7Aoa2yVwI$r" role="2OqNvi">
+                                <ref role="37wK5l" node="51h1DIGcbZg" resolve="isStrong" />
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="7Aoa2yVwI$s" role="37wK5m">
+                              <ref role="3cqZAo" node="7Aoa2yVwt31" resolve="coerceToConcept" />
+                            </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbH" id="1RYTbd83ykx" role="3cqZAp" />
-                  </node>
-                  <node concept="37vLTG" id="1RYTbd83yky" role="1bW2Oz">
-                    <property role="TrG5h" value="updatable" />
-                    <node concept="3uibUv" id="1RYTbd83ykz" role="1tU5fm">
-                      <ref role="3uigEE" node="4Dkptq1Qcxp" resolve="CacheUpdatable" />
+                    <node concept="3clFbC" id="7Aoa2yVwt4E" role="3clFbw">
+                      <node concept="10Nm6u" id="7Aoa2yVwt4F" role="3uHU7w" />
+                      <node concept="37vLTw" id="7Aoa2yVwt4G" role="3uHU7B">
+                        <ref role="3cqZAo" node="7Aoa2yVwt31" resolve="coerceTo" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -15711,29 +12669,30 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="6v6oK28gZrA" role="3cqZAp">
-          <node concept="3K4zz7" id="6v6oK28h3jU" role="3clFbG">
-            <node concept="2YIFZM" id="6v6oK28h6hC" role="3K4E3e">
+        <node concept="3clFbH" id="7Aoa2yVwt4Z" role="3cqZAp" />
+        <node concept="3clFbF" id="7Aoa2yVwt50" role="3cqZAp">
+          <node concept="3K4zz7" id="7Aoa2yVwt51" role="3clFbG">
+            <node concept="2YIFZM" id="7Aoa2yVwt52" role="3K4E3e">
               <ref role="37wK5l" node="1RYTbd8cMMZ" resolve="of" />
               <ref role="1Pybhc" node="1RYTbd8bNK8" resolve="Response" />
-              <node concept="2OqwBi" id="6v6oK28h9n1" role="37wK5m">
-                <node concept="37vLTw" id="6v6oK28h8$f" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1RYTbd83yk6" resolve="pair" />
+              <node concept="2OqwBi" id="7Aoa2yVwt53" role="37wK5m">
+                <node concept="37vLTw" id="7Aoa2yVwt54" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7Aoa2yVwt31" resolve="coerceTo" />
                 </node>
-                <node concept="2OwXpG" id="6v6oK28haLP" role="2OqNvi">
+                <node concept="2OwXpG" id="7Aoa2yVwt55" role="2OqNvi">
                   <ref role="2Oxat5" to="18ew:~Pair.o2" resolve="o2" />
                 </node>
               </node>
             </node>
-            <node concept="2YIFZM" id="6v6oK28hem8" role="3K4GZi">
-              <ref role="37wK5l" node="6v6oK28b9Hj" resolve="fail" />
+            <node concept="2YIFZM" id="7Aoa2yVwt56" role="3K4GZi">
               <ref role="1Pybhc" node="1RYTbd8bNK8" resolve="Response" />
+              <ref role="37wK5l" node="6v6oK28b9Hj" resolve="fail" />
             </node>
-            <node concept="2OqwBi" id="6v6oK28h0wP" role="3K4Cdx">
-              <node concept="37vLTw" id="6v6oK28gZr$" role="2Oq$k0">
-                <ref role="3cqZAo" node="1RYTbd83yk6" resolve="pair" />
+            <node concept="2OqwBi" id="7Aoa2yVwt57" role="3K4Cdx">
+              <node concept="37vLTw" id="7Aoa2yVwt58" role="2Oq$k0">
+                <ref role="3cqZAo" node="7Aoa2yVwt31" resolve="coerceTo" />
               </node>
-              <node concept="2OwXpG" id="6v6oK28h240" role="2OqNvi">
+              <node concept="2OwXpG" id="7Aoa2yVwt59" role="2OqNvi">
                 <ref role="2Oxat5" to="18ew:~Pair.o1" resolve="o1" />
               </node>
             </node>
@@ -15882,7 +12841,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="6v6oK27i3MK" role="1zkMxy">
-      <ref role="3uigEE" node="1z4$59iohfJ" resolve="Request" />
+      <ref role="3uigEE" node="7Aoa2yVx5U6" resolve="AbstractConvertsRequest" />
       <node concept="3uibUv" id="6v6oK24$Jpp" role="11_B2D">
         <ref role="3uigEE" node="5EDW3XDYNTS" resolve="CoerceQuery" />
       </node>
@@ -15897,7 +12856,7 @@
     <node concept="3clFbW" id="6v6oK27nfe8" role="jymVt">
       <node concept="3clFbS" id="6v6oK27nfe9" role="3clF47">
         <node concept="XkiVB" id="6v6oK27nfee" role="3cqZAp">
-          <ref role="37wK5l" node="1z4$59irJq1" resolve="Request" />
+          <ref role="37wK5l" node="7Aoa2yVx6AT" />
           <node concept="37vLTw" id="6v6oK27nfec" role="37wK5m">
             <ref role="3cqZAo" node="6v6oK27nfdY" resolve="coerceQuery" />
           </node>
@@ -15912,252 +12871,241 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="7Aoa2yVv0zP" role="jymVt" />
     <node concept="3clFb_" id="1RYTbd7MH$s" role="jymVt">
       <property role="TrG5h" value="evaluate" />
       <node concept="3Tm1VV" id="1RYTbd7MH$u" role="1B3o_S" />
       <node concept="3clFbS" id="1RYTbd7MH$v" role="3clF47">
-        <node concept="3cpWs8" id="1RYTbd83Iaf" role="3cqZAp">
-          <node concept="3cpWsn" id="1RYTbd83Iag" role="3cpWs9">
-            <property role="TrG5h" value="pair" />
-            <node concept="3uibUv" id="1RYTbd83Iah" role="1tU5fm">
+        <node concept="3cpWs8" id="7Aoa2yVv8$T" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVv8$U" role="3cpWs9">
+            <property role="TrG5h" value="coerceTo" />
+            <node concept="3uibUv" id="7Aoa2yVv88i" role="1tU5fm">
               <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-              <node concept="3uibUv" id="1RYTbd83Iai" role="11_B2D">
+              <node concept="3uibUv" id="7Aoa2yVv88o" role="11_B2D">
                 <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
               </node>
-              <node concept="3Tqbb2" id="1RYTbd83Iaj" role="11_B2D" />
+              <node concept="3Tqbb2" id="7Aoa2yVv88n" role="11_B2D" />
             </node>
-            <node concept="2OqwBi" id="1RYTbd83Iak" role="33vP2m">
-              <node concept="37vLTw" id="1C_jAsqidlR" role="2Oq$k0">
-                <ref role="3cqZAo" node="1C_jAsqhPei" resolve="state" />
-              </node>
-              <node concept="liA8E" id="1RYTbd83Iam" role="2OqNvi">
-                <ref role="37wK5l" node="1z4$59jvV_B" resolve="getOrUpdateValue" />
-                <node concept="1bVj0M" id="1RYTbd83Ian" role="37wK5m">
-                  <node concept="3clFbS" id="1RYTbd83Iao" role="1bW5cS">
-                    <node concept="3clFbF" id="1RYTbd83Iap" role="3cqZAp">
-                      <node concept="2OqwBi" id="1RYTbd83Iaq" role="3clFbG">
-                        <node concept="37vLTw" id="1RYTbd83Iar" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1RYTbd83Iaw" resolve="cache" />
+            <node concept="10Nm6u" id="7Aoa2yVw9xQ" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="7Aoa2yVwawx" role="3cqZAp" />
+        <node concept="3clFbF" id="7Aoa2yVtQbY" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVtRGP" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVtQbW" role="2Oq$k0">
+              <ref role="3cqZAo" node="1C_jAsqhPei" resolve="state" />
+            </node>
+            <node concept="liA8E" id="7Aoa2yVtSY2" role="2OqNvi">
+              <ref role="37wK5l" node="7Aoa2yVqV_s" resolve="updateSharedCachedData" />
+              <node concept="1bVj0M" id="7Aoa2yVtY5G" role="37wK5m">
+                <node concept="gl6BB" id="7Aoa2yVtY5W" role="1bW2Oz">
+                  <property role="TrG5h" value="cachedData" />
+                  <node concept="2jxLKc" id="7Aoa2yVtY5X" role="1tU5fm" />
+                </node>
+                <node concept="gl6BB" id="7Aoa2yVtY6g" role="1bW2Oz">
+                  <property role="TrG5h" value="fresh" />
+                  <node concept="2jxLKc" id="7Aoa2yVtY6h" role="1tU5fm" />
+                </node>
+                <node concept="3clFbS" id="7Aoa2yVtY6i" role="1bW5cS">
+                  <node concept="3clFbH" id="7Aoa2yVwhVJ" role="3cqZAp" />
+                  <node concept="3cpWs8" id="7Aoa2yVuTbr" role="3cqZAp">
+                    <node concept="3cpWsn" id="7Aoa2yVuTbs" role="3cpWs9">
+                      <property role="TrG5h" value="conversionInfo" />
+                      <node concept="3uibUv" id="7Aoa2yVuSG2" role="1tU5fm">
+                        <ref role="3uigEE" node="7Aoa2yVt0Sb" resolve="ConversionInfo" />
+                      </node>
+                      <node concept="2OqwBi" id="7Aoa2yVuTbt" role="33vP2m">
+                        <node concept="37vLTw" id="7Aoa2yVuTbu" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yVtY5W" resolve="cachedData" />
                         </node>
-                        <node concept="liA8E" id="1RYTbd83Ias" role="2OqNvi">
-                          <ref role="37wK5l" node="1RYTbd7VNe4" resolve="coerceTo" />
-                          <node concept="2OqwBi" id="6v6oK258jOF" role="37wK5m">
-                            <node concept="1rXfSq" id="6v6oK258e_g" role="2Oq$k0">
+                        <node concept="liA8E" id="7Aoa2yVuTbv" role="2OqNvi">
+                          <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
+                          <node concept="10M0yZ" id="7Aoa2yVxbye" role="37wK5m">
+                            <ref role="3cqZAo" node="7Aoa2yVuwe5" resolve="CONVERSION_INFO" />
+                            <ref role="1PxDUh" node="7Aoa2yVx5U6" resolve="AbstractConvertsRequest" />
+                          </node>
+                          <node concept="1bVj0M" id="7Aoa2yVuTbx" role="37wK5m">
+                            <node concept="3clFbS" id="7Aoa2yVuTby" role="1bW5cS">
+                              <node concept="3clFbF" id="7Aoa2yVuTbz" role="3cqZAp">
+                                <node concept="2ShNRf" id="7Aoa2yVuTb$" role="3clFbG">
+                                  <node concept="HV5vD" id="7Aoa2yVuTb_" role="2ShVmc">
+                                    <property role="373rjd" value="true" />
+                                    <ref role="HV5vE" node="7Aoa2yVt0Sb" resolve="ConversionInfo" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7Aoa2yVw3Pp" role="3cqZAp">
+                    <node concept="37vLTI" id="7Aoa2yVw3Pr" role="3clFbG">
+                      <node concept="2OqwBi" id="7Aoa2yVv8$V" role="37vLTx">
+                        <node concept="37vLTw" id="7Aoa2yVv8$W" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yVuTbs" resolve="conversionInfo" />
+                        </node>
+                        <node concept="liA8E" id="7Aoa2yVv8$X" role="2OqNvi">
+                          <ref role="37wK5l" node="7Aoa2yVtzf9" resolve="coerceTo" />
+                          <node concept="2OqwBi" id="7Aoa2yVv8$Y" role="37wK5m">
+                            <node concept="1rXfSq" id="7Aoa2yVv8$Z" role="2Oq$k0">
                               <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
                             </node>
-                            <node concept="liA8E" id="6v6oK258uhT" role="2OqNvi">
+                            <node concept="liA8E" id="7Aoa2yVv8_0" role="2OqNvi">
                               <ref role="37wK5l" node="5EDW3XDYNZD" resolve="getSource" />
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="6v6oK258IwA" role="37wK5m">
-                            <node concept="1rXfSq" id="6v6oK258Cnh" role="2Oq$k0">
+                          <node concept="2OqwBi" id="7Aoa2yVv8_1" role="37wK5m">
+                            <node concept="1rXfSq" id="7Aoa2yVv8_2" role="2Oq$k0">
                               <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
                             </node>
-                            <node concept="liA8E" id="6v6oK258Uec" role="2OqNvi">
+                            <node concept="liA8E" id="7Aoa2yVv8_3" role="2OqNvi">
                               <ref role="37wK5l" node="5EDW3XDYO27" resolve="getTargetNode" />
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="3FEFhOSQgyf" role="37wK5m">
-                            <node concept="1rXfSq" id="3FEFhOSQfCu" role="2Oq$k0">
+                          <node concept="2OqwBi" id="7Aoa2yVv8_4" role="37wK5m">
+                            <node concept="1rXfSq" id="7Aoa2yVv8_5" role="2Oq$k0">
                               <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
                             </node>
-                            <node concept="liA8E" id="3FEFhOSQicP" role="2OqNvi">
+                            <node concept="liA8E" id="7Aoa2yVv8_6" role="2OqNvi">
                               <ref role="37wK5l" node="51h1DIGcbZg" resolve="isStrong" />
                             </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="3clFbH" id="1RYTbd83Iav" role="3cqZAp" />
-                  </node>
-                  <node concept="37vLTG" id="1RYTbd83Iaw" role="1bW2Oz">
-                    <property role="TrG5h" value="cache" />
-                    <node concept="3uibUv" id="1RYTbd83Iax" role="1tU5fm">
-                      <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+                      <node concept="37vLTw" id="7Aoa2yVw3Pv" role="37vLTJ">
+                        <ref role="3cqZAo" node="7Aoa2yVv8$U" resolve="coerceTo" />
+                      </node>
                     </node>
                   </node>
-                </node>
-                <node concept="1bVj0M" id="1RYTbd83Iay" role="37wK5m">
-                  <node concept="3clFbS" id="1RYTbd83Iaz" role="1bW5cS">
-                    <node concept="3clFbH" id="1C_jAsqutCU" role="3cqZAp" />
-                    <node concept="3cpWs8" id="1C_jAsqutCV" role="3cqZAp">
-                      <node concept="3cpWsn" id="1C_jAsqutCW" role="3cpWs9">
-                        <property role="TrG5h" value="strategy" />
-                        <node concept="3uibUv" id="1C_jAsqutCX" role="1tU5fm">
-                          <ref role="3uigEE" node="61G6TdCqpnb" resolve="TypecheckingStrategy" />
-                        </node>
-                        <node concept="2ShNRf" id="1C_jAsqutCY" role="33vP2m">
-                          <node concept="1pGfFk" id="1C_jAsqutCZ" role="2ShVmc">
-                            <ref role="37wK5l" node="5Qx6_65F4Qp" resolve="TypecheckingStrategy.Caching" />
-                            <node concept="Xjq3P" id="1C_jAsqutD0" role="37wK5m" />
-                            <node concept="2OqwBi" id="1C_jAsquHK6" role="37wK5m">
-                              <node concept="37vLTw" id="1C_jAsqutD1" role="2Oq$k0">
+                  <node concept="3clFbH" id="7Aoa2yVw1fp" role="3cqZAp" />
+                  <node concept="3clFbJ" id="7Aoa2yVvgGr" role="3cqZAp">
+                    <node concept="3clFbS" id="7Aoa2yVvgGH" role="3clFbx">
+                      <node concept="3cpWs8" id="1RYTbd87GzE" role="3cqZAp">
+                        <node concept="3cpWsn" id="1RYTbd87GzF" role="3cpWs9">
+                          <property role="TrG5h" value="response" />
+                          <node concept="3uibUv" id="1RYTbd8jCIp" role="1tU5fm">
+                            <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
+                            <node concept="3Tqbb2" id="6v6oK28hA_h" role="11_B2D" />
+                          </node>
+                          <node concept="1rXfSq" id="7Aoa2yVxQBc" role="33vP2m">
+                            <ref role="37wK5l" node="7Aoa2yVxi6Q" resolve="calcConverts" />
+                            <node concept="2OqwBi" id="7Aoa2yVxTuI" role="37wK5m">
+                              <node concept="37vLTw" id="7Aoa2yVxSug" role="2Oq$k0">
                                 <ref role="3cqZAo" node="1C_jAsqhPei" resolve="state" />
                               </node>
-                              <node concept="liA8E" id="1C_jAsquLmg" role="2OqNvi">
+                              <node concept="liA8E" id="7Aoa2yVxX6g" role="2OqNvi">
                                 <ref role="37wK5l" node="1C_jAsql6Ib" resolve="getRepository" />
                               </node>
                             </node>
-                            <node concept="37vLTw" id="1C_jAsqutD2" role="37wK5m">
+                            <node concept="37vLTw" id="7Aoa2yVxY5$" role="37wK5m">
                               <ref role="3cqZAo" node="1C_jAsqp06B" resolve="messageHandler" />
                             </node>
-                            <node concept="2OqwBi" id="1C_jAsquNA5" role="37wK5m">
-                              <node concept="37vLTw" id="1C_jAsqutD3" role="2Oq$k0">
+                            <node concept="37vLTw" id="7Aoa2yVy55t" role="37wK5m">
+                              <ref role="3cqZAo" node="7Aoa2yVtY5W" resolve="cachedData" />
+                            </node>
+                            <node concept="37vLTw" id="7Aoa2yVy6VJ" role="37wK5m">
+                              <ref role="3cqZAo" node="7Aoa2yVtY6g" resolve="fresh" />
+                            </node>
+                            <node concept="2OqwBi" id="7Aoa2yVy09f" role="37wK5m">
+                              <node concept="37vLTw" id="7Aoa2yVxZ6I" role="2Oq$k0">
                                 <ref role="3cqZAo" node="1C_jAsqhPei" resolve="state" />
                               </node>
-                              <node concept="liA8E" id="1C_jAsquOK$" role="2OqNvi">
+                              <node concept="liA8E" id="7Aoa2yVy8V6" role="2OqNvi">
                                 <ref role="37wK5l" node="1T5MAgPidDk" resolve="typeCollector" />
                               </node>
                             </node>
-                            <node concept="2OqwBi" id="1C_jAsqutD4" role="37wK5m">
-                              <node concept="37vLTw" id="1C_jAsqutD5" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1RYTbd83IaG" resolve="updatable" />
-                              </node>
-                              <node concept="liA8E" id="1C_jAsqutD6" role="2OqNvi">
-                                <ref role="37wK5l" node="61G6TdD6$Xx" resolve="cacheHolder" />
-                              </node>
-                            </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="3clFbH" id="7Aoa2yTOsi0" role="3cqZAp" />
-                    <node concept="3cpWs8" id="1RYTbd87GzE" role="3cqZAp">
-                      <node concept="3cpWsn" id="1RYTbd87GzF" role="3cpWs9">
-                        <property role="TrG5h" value="response" />
-                        <node concept="3uibUv" id="1RYTbd8jCIp" role="1tU5fm">
-                          <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
-                          <node concept="3Tqbb2" id="6v6oK28hA_h" role="11_B2D" />
-                        </node>
-                        <node concept="2OqwBi" id="1C_jAsqutDR" role="33vP2m">
-                          <node concept="37vLTw" id="1C_jAsqutDS" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1C_jAsqutCW" resolve="strategy" />
+                      <node concept="3clFbH" id="7Aoa2yVxIHb" role="3cqZAp" />
+                      <node concept="3clFbF" id="7Aoa2yVvP_v" role="3cqZAp">
+                        <node concept="37vLTI" id="7Aoa2yVvT9h" role="3clFbG">
+                          <node concept="37vLTw" id="7Aoa2yVvP_t" role="37vLTJ">
+                            <ref role="3cqZAo" node="7Aoa2yVv8$U" resolve="coerceTo" />
                           </node>
-                          <node concept="liA8E" id="7Aoa2yTOm0_" role="2OqNvi">
-                            <ref role="37wK5l" node="7Aoa2yU04_N" resolve="launch" />
-                            <node concept="3clFbT" id="7Aoa2yTOneo" role="37wK5m">
-                              <property role="3clFbU" value="true" />
-                            </node>
-                            <node concept="37Ijox" id="7Aoa2yTOqrS" role="37wK5m">
-                              <ref role="37Ijqf" node="6v6oK28hn9Y" resolve="response" />
-                              <node concept="Xjq3P" id="7Aoa2yTOpfA" role="wWaWy" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="1C_jAsquDM7" role="3cqZAp" />
-                    <node concept="3clFbF" id="1RYTbd87MKb" role="3cqZAp">
-                      <node concept="2OqwBi" id="1RYTbd87N94" role="3clFbG">
-                        <node concept="37vLTw" id="1RYTbd87MK9" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1RYTbd83IaG" resolve="updatable" />
-                        </node>
-                        <node concept="liA8E" id="1RYTbd87Nzd" role="2OqNvi">
-                          <ref role="37wK5l" node="5Qx6_65$vyG" resolve="update" />
-                          <node concept="1bVj0M" id="1RYTbd87NV8" role="37wK5m">
-                            <node concept="37vLTG" id="1RYTbd87OJe" role="1bW2Oz">
-                              <property role="TrG5h" value="update" />
-                              <node concept="3uibUv" id="1RYTbd87P2T" role="1tU5fm">
-                                <ref role="3uigEE" node="1z4$59jqeoH" resolve="TypecheckingResultsCache.Update" />
-                              </node>
-                            </node>
-                            <node concept="3clFbS" id="1RYTbd87NV9" role="1bW5cS">
-                              <node concept="3cpWs8" id="6v6oK28hIUr" role="3cqZAp">
-                                <node concept="3cpWsn" id="6v6oK28hIUs" role="3cpWs9">
-                                  <property role="TrG5h" value="coerceResult" />
-                                  <node concept="3uibUv" id="6v6oK28hIUt" role="1tU5fm">
-                                    <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                                    <node concept="3uibUv" id="6v6oK28hIUu" role="11_B2D">
-                                      <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                                    </node>
-                                    <node concept="3Tqbb2" id="6v6oK28hIUv" role="11_B2D" />
+                          <node concept="3K4zz7" id="7Aoa2yVvUy0" role="37vLTx">
+                            <node concept="2ShNRf" id="7Aoa2yVvUy1" role="3K4E3e">
+                              <node concept="1pGfFk" id="7Aoa2yVvUy2" role="2ShVmc">
+                                <property role="373rjd" value="true" />
+                                <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
+                                <node concept="3clFbT" id="7Aoa2yVvUy3" role="37wK5m">
+                                  <property role="3clFbU" value="true" />
+                                </node>
+                                <node concept="2OqwBi" id="7Aoa2yVvUy4" role="37wK5m">
+                                  <node concept="37vLTw" id="7Aoa2yVvUy5" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="1RYTbd87GzF" resolve="response" />
                                   </node>
-                                  <node concept="3K4zz7" id="6v6oK28hIUw" role="33vP2m">
-                                    <node concept="2ShNRf" id="6v6oK28hIUx" role="3K4E3e">
-                                      <node concept="1pGfFk" id="6v6oK28hIUy" role="2ShVmc">
-                                        <property role="373rjd" value="true" />
-                                        <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-                                        <node concept="3clFbT" id="6v6oK28hIUz" role="37wK5m">
-                                          <property role="3clFbU" value="true" />
-                                        </node>
-                                        <node concept="2OqwBi" id="6v6oK28hIU$" role="37wK5m">
-                                          <node concept="37vLTw" id="6v6oK28hIU_" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="1RYTbd87GzF" resolve="response" />
-                                          </node>
-                                          <node concept="liA8E" id="6v6oK28hIUA" role="2OqNvi">
-                                            <ref role="37wK5l" node="1RYTbd8j4FJ" resolve="getValue" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="2OqwBi" id="6v6oK28hIUB" role="3K4Cdx">
-                                      <node concept="37vLTw" id="6v6oK28hIUC" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1RYTbd87GzF" resolve="response" />
-                                      </node>
-                                      <node concept="liA8E" id="6v6oK28hIUD" role="2OqNvi">
-                                        <ref role="37wK5l" node="6v6oK28a3mY" resolve="isSuccessful" />
-                                      </node>
-                                    </node>
-                                    <node concept="2ShNRf" id="6v6oK28hIUE" role="3K4GZi">
-                                      <node concept="1pGfFk" id="6v6oK28hIUF" role="2ShVmc">
-                                        <property role="373rjd" value="true" />
-                                        <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-                                        <node concept="3clFbT" id="6v6oK28hIUG" role="37wK5m" />
-                                        <node concept="10Nm6u" id="6v6oK28hIUH" role="37wK5m" />
-                                      </node>
-                                    </node>
+                                  <node concept="liA8E" id="7Aoa2yVvUy6" role="2OqNvi">
+                                    <ref role="37wK5l" node="1RYTbd8j4FJ" resolve="getValue" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbH" id="6v6oK28hIU1" role="3cqZAp" />
-                              <node concept="3clFbF" id="1RYTbd87Sf5" role="3cqZAp">
-                                <node concept="2OqwBi" id="1RYTbd87Sf6" role="3clFbG">
-                                  <node concept="37vLTw" id="1RYTbd87Sf7" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1RYTbd87OJe" resolve="update" />
-                                  </node>
-                                  <node concept="liA8E" id="1RYTbd87Sf8" role="2OqNvi">
-                                    <ref role="37wK5l" node="1RYTbd7YOM8" resolve="putCoerceTo" />
-                                    <node concept="2OqwBi" id="6v6oK25942T" role="37wK5m">
-                                      <node concept="1rXfSq" id="6v6oK25942U" role="2Oq$k0">
-                                        <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
-                                      </node>
-                                      <node concept="liA8E" id="6v6oK25942V" role="2OqNvi">
-                                        <ref role="37wK5l" node="5EDW3XDYNZD" resolve="getSource" />
-                                      </node>
-                                    </node>
-                                    <node concept="2OqwBi" id="6v6oK25942W" role="37wK5m">
-                                      <node concept="1rXfSq" id="6v6oK25942X" role="2Oq$k0">
-                                        <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
-                                      </node>
-                                      <node concept="liA8E" id="6v6oK25942Y" role="2OqNvi">
-                                        <ref role="37wK5l" node="5EDW3XDYO27" resolve="getTargetNode" />
-                                      </node>
-                                    </node>
-                                    <node concept="2OqwBi" id="3FEFhOSQkQN" role="37wK5m">
-                                      <node concept="1rXfSq" id="3FEFhOSQkag" role="2Oq$k0">
-                                        <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
-                                      </node>
-                                      <node concept="liA8E" id="3FEFhOSQlQE" role="2OqNvi">
-                                        <ref role="37wK5l" node="51h1DIGcbZg" resolve="isStrong" />
-                                      </node>
-                                    </node>
-                                    <node concept="37vLTw" id="6v6oK23B$Ur" role="37wK5m">
-                                      <ref role="3cqZAo" node="6v6oK28hIUs" resolve="coerceResult" />
-                                    </node>
-                                  </node>
-                                </node>
+                            </node>
+                            <node concept="2OqwBi" id="7Aoa2yVvUy7" role="3K4Cdx">
+                              <node concept="37vLTw" id="7Aoa2yVvUy8" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1RYTbd87GzF" resolve="response" />
                               </node>
-                              <node concept="3clFbH" id="1RYTbd87PGm" role="3cqZAp" />
+                              <node concept="liA8E" id="7Aoa2yVvUy9" role="2OqNvi">
+                                <ref role="37wK5l" node="6v6oK28a3mY" resolve="isSuccessful" />
+                              </node>
+                            </node>
+                            <node concept="2ShNRf" id="7Aoa2yVvUya" role="3K4GZi">
+                              <node concept="1pGfFk" id="7Aoa2yVvUyb" role="2ShVmc">
+                                <property role="373rjd" value="true" />
+                                <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
+                                <node concept="3clFbT" id="7Aoa2yVvUyc" role="37wK5m" />
+                                <node concept="10Nm6u" id="7Aoa2yVvUyd" role="37wK5m" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="6v6oK28hIU1" role="3cqZAp" />
+                      <node concept="3clFbF" id="1RYTbd87Sf5" role="3cqZAp">
+                        <node concept="2OqwBi" id="1RYTbd87Sf6" role="3clFbG">
+                          <node concept="37vLTw" id="1RYTbd87Sf7" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Aoa2yVuTbs" resolve="conversionInfo" />
+                          </node>
+                          <node concept="liA8E" id="1RYTbd87Sf8" role="2OqNvi">
+                            <ref role="37wK5l" node="7Aoa2yVtoMZ" resolve="putCoerceTo" />
+                            <node concept="2OqwBi" id="6v6oK25942T" role="37wK5m">
+                              <node concept="1rXfSq" id="6v6oK25942U" role="2Oq$k0">
+                                <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
+                              </node>
+                              <node concept="liA8E" id="6v6oK25942V" role="2OqNvi">
+                                <ref role="37wK5l" node="5EDW3XDYNZD" resolve="getSource" />
+                              </node>
+                            </node>
+                            <node concept="2OqwBi" id="6v6oK25942W" role="37wK5m">
+                              <node concept="1rXfSq" id="6v6oK25942X" role="2Oq$k0">
+                                <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
+                              </node>
+                              <node concept="liA8E" id="6v6oK25942Y" role="2OqNvi">
+                                <ref role="37wK5l" node="5EDW3XDYO27" resolve="getTargetNode" />
+                              </node>
+                            </node>
+                            <node concept="2OqwBi" id="3FEFhOSQkQN" role="37wK5m">
+                              <node concept="1rXfSq" id="3FEFhOSQkag" role="2Oq$k0">
+                                <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
+                              </node>
+                              <node concept="liA8E" id="3FEFhOSQlQE" role="2OqNvi">
+                                <ref role="37wK5l" node="51h1DIGcbZg" resolve="isStrong" />
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="6v6oK23B$Ur" role="37wK5m">
+                              <ref role="3cqZAo" node="7Aoa2yVv8$U" resolve="coerceTo" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                  </node>
-                  <node concept="37vLTG" id="1RYTbd83IaG" role="1bW2Oz">
-                    <property role="TrG5h" value="updatable" />
-                    <node concept="3uibUv" id="1RYTbd83IaH" role="1tU5fm">
-                      <ref role="3uigEE" node="4Dkptq1Qcxp" resolve="CacheUpdatable" />
+                    <node concept="3clFbC" id="7Aoa2yVvdmb" role="3clFbw">
+                      <node concept="10Nm6u" id="7Aoa2yVvf3c" role="3uHU7w" />
+                      <node concept="37vLTw" id="7Aoa2yVv8_7" role="3uHU7B">
+                        <ref role="3cqZAo" node="7Aoa2yVv8$U" resolve="coerceTo" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -16165,6 +13113,7 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="7Aoa2yVtP3L" role="3cqZAp" />
         <node concept="3clFbF" id="6v6oK28hOih" role="3cqZAp">
           <node concept="3K4zz7" id="6v6oK28hOii" role="3clFbG">
             <node concept="2YIFZM" id="6v6oK28hOij" role="3K4E3e">
@@ -16172,7 +13121,7 @@
               <ref role="1Pybhc" node="1RYTbd8bNK8" resolve="Response" />
               <node concept="2OqwBi" id="6v6oK28hOik" role="37wK5m">
                 <node concept="37vLTw" id="6v6oK28hOil" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1RYTbd83Iag" resolve="pair" />
+                  <ref role="3cqZAo" node="7Aoa2yVv8$U" resolve="coerceTo" />
                 </node>
                 <node concept="2OwXpG" id="6v6oK28hOim" role="2OqNvi">
                   <ref role="2Oxat5" to="18ew:~Pair.o2" resolve="o2" />
@@ -16185,7 +13134,7 @@
             </node>
             <node concept="2OqwBi" id="6v6oK28hOio" role="3K4Cdx">
               <node concept="37vLTw" id="6v6oK28hOip" role="2Oq$k0">
-                <ref role="3cqZAo" node="1RYTbd83Iag" resolve="pair" />
+                <ref role="3cqZAo" node="7Aoa2yVv8$U" resolve="coerceTo" />
               </node>
               <node concept="2OwXpG" id="6v6oK28hOiq" role="2OqNvi">
                 <ref role="2Oxat5" to="18ew:~Pair.o1" resolve="o1" />
@@ -16332,7 +13281,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="6v6oK27nfe7" role="1zkMxy">
-      <ref role="3uigEE" node="1z4$59iohfJ" resolve="Request" />
+      <ref role="3uigEE" node="7Aoa2yVx5U6" resolve="AbstractConvertsRequest" />
       <node concept="3uibUv" id="6v6oK24Hq1h" role="11_B2D">
         <ref role="3uigEE" node="5EDW3XDYNTS" resolve="CoerceQuery" />
       </node>
@@ -16344,10 +13293,11 @@
     <property role="TrG5h" value="ConvertToRequest" />
     <property role="3GE5qa" value="requests" />
     <node concept="2tJIrI" id="6v6oK26KSWV" role="jymVt" />
+    <node concept="2tJIrI" id="7Aoa2yVut7j" role="jymVt" />
     <node concept="3clFbW" id="6v6oK26Kol8" role="jymVt">
       <node concept="3clFbS" id="6v6oK26Kol9" role="3clF47">
         <node concept="XkiVB" id="6v6oK26Kole" role="3cqZAp">
-          <ref role="37wK5l" node="1z4$59irJq1" resolve="Request" />
+          <ref role="37wK5l" node="7Aoa2yVx6AT" />
           <node concept="37vLTw" id="6v6oK26Kolc" role="37wK5m">
             <ref role="3cqZAo" node="6v6oK26KokY" resolve="convertQuery" />
           </node>
@@ -16362,6 +13312,7 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="7Aoa2yVx97G" role="jymVt" />
     <node concept="3clFb_" id="1z4$59izX_Z" role="jymVt">
       <property role="TrG5h" value="evaluate" />
       <node concept="3uibUv" id="6v6oK28hT9Y" role="3clF45">
@@ -16374,216 +13325,212 @@
       <node concept="3clFbS" id="1z4$59izXA2" role="3clF47">
         <node concept="3cpWs8" id="6v6oK28i44F" role="3cqZAp">
           <node concept="3cpWsn" id="6v6oK28i44G" role="3cpWs9">
-            <property role="TrG5h" value="value" />
+            <property role="TrG5h" value="converts" />
             <node concept="3uibUv" id="6v6oK28i3Al" role="1tU5fm">
               <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
             </node>
-            <node concept="2OqwBi" id="6v6oK28i44H" role="33vP2m">
-              <node concept="37vLTw" id="1C_jAsqij3j" role="2Oq$k0">
-                <ref role="3cqZAo" node="1C_jAsqhPel" resolve="state" />
-              </node>
-              <node concept="liA8E" id="6v6oK28i44L" role="2OqNvi">
-                <ref role="37wK5l" node="1z4$59jvV_B" resolve="getOrUpdateValue" />
-                <node concept="1bVj0M" id="6v6oK28i44M" role="37wK5m">
-                  <node concept="3clFbS" id="6v6oK28i44N" role="1bW5cS">
-                    <node concept="3clFbF" id="6v6oK28i44O" role="3cqZAp">
-                      <node concept="2OqwBi" id="6v6oK28i44P" role="3clFbG">
-                        <node concept="37vLTw" id="6v6oK28i44Q" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6v6oK28i44Z" resolve="cache" />
+            <node concept="10Nm6u" id="7Aoa2yVwVwU" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="7Aoa2yVwSib" role="3cqZAp" />
+        <node concept="3clFbF" id="7Aoa2yVwYKX" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVwYKY" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVwYKZ" role="2Oq$k0">
+              <ref role="3cqZAo" node="1C_jAsqhPel" resolve="state" />
+            </node>
+            <node concept="liA8E" id="7Aoa2yVwYL0" role="2OqNvi">
+              <ref role="37wK5l" node="7Aoa2yVqV_s" resolve="updateSharedCachedData" />
+              <node concept="1bVj0M" id="7Aoa2yVwYL1" role="37wK5m">
+                <node concept="gl6BB" id="7Aoa2yVwYL2" role="1bW2Oz">
+                  <property role="TrG5h" value="cachedData" />
+                  <node concept="2jxLKc" id="7Aoa2yVwYL3" role="1tU5fm" />
+                </node>
+                <node concept="gl6BB" id="7Aoa2yVwYL4" role="1bW2Oz">
+                  <property role="TrG5h" value="fresh" />
+                  <node concept="2jxLKc" id="7Aoa2yVwYL5" role="1tU5fm" />
+                </node>
+                <node concept="3clFbS" id="7Aoa2yVwYL6" role="1bW5cS">
+                  <node concept="3clFbH" id="7Aoa2yVwYL7" role="3cqZAp" />
+                  <node concept="3cpWs8" id="7Aoa2yVwYL8" role="3cqZAp">
+                    <node concept="3cpWsn" id="7Aoa2yVwYL9" role="3cpWs9">
+                      <property role="TrG5h" value="conversionInfo" />
+                      <node concept="3uibUv" id="7Aoa2yVwYLa" role="1tU5fm">
+                        <ref role="3uigEE" node="7Aoa2yVt0Sb" resolve="ConversionInfo" />
+                      </node>
+                      <node concept="2OqwBi" id="7Aoa2yVwYLb" role="33vP2m">
+                        <node concept="37vLTw" id="7Aoa2yVwYLc" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yVwYL2" resolve="cachedData" />
                         </node>
-                        <node concept="liA8E" id="6v6oK28i44R" role="2OqNvi">
-                          <ref role="37wK5l" node="1z4$59jyR8N" resolve="convertsTo" />
-                          <node concept="2OqwBi" id="6v6oK28i44S" role="37wK5m">
-                            <node concept="1rXfSq" id="6v6oK28i44T" role="2Oq$k0">
+                        <node concept="liA8E" id="7Aoa2yVwYLd" role="2OqNvi">
+                          <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
+                          <node concept="10M0yZ" id="7Aoa2yVxbyf" role="37wK5m">
+                            <ref role="3cqZAo" node="7Aoa2yVuwe5" resolve="CONVERSION_INFO" />
+                            <ref role="1PxDUh" node="7Aoa2yVx5U6" resolve="AbstractConvertsRequest" />
+                          </node>
+                          <node concept="1bVj0M" id="7Aoa2yVwYLf" role="37wK5m">
+                            <node concept="3clFbS" id="7Aoa2yVwYLg" role="1bW5cS">
+                              <node concept="3clFbF" id="7Aoa2yVwYLh" role="3cqZAp">
+                                <node concept="2ShNRf" id="7Aoa2yVwYLi" role="3clFbG">
+                                  <node concept="HV5vD" id="7Aoa2yVwYLj" role="2ShVmc">
+                                    <property role="373rjd" value="true" />
+                                    <ref role="HV5vE" node="7Aoa2yVt0Sb" resolve="ConversionInfo" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7Aoa2yVwYLk" role="3cqZAp">
+                    <node concept="37vLTI" id="7Aoa2yVwYLl" role="3clFbG">
+                      <node concept="2OqwBi" id="7Aoa2yVwYLm" role="37vLTx">
+                        <node concept="37vLTw" id="7Aoa2yVwYLn" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yVwYL9" resolve="conversionInfo" />
+                        </node>
+                        <node concept="liA8E" id="7Aoa2yVx1ka" role="2OqNvi">
+                          <ref role="37wK5l" node="7Aoa2yVtzdU" resolve="convertsTo" />
+                          <node concept="2OqwBi" id="7Aoa2yVx1kb" role="37wK5m">
+                            <node concept="1rXfSq" id="7Aoa2yVx1kc" role="2Oq$k0">
                               <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
                             </node>
-                            <node concept="liA8E" id="6v6oK28i44U" role="2OqNvi">
+                            <node concept="liA8E" id="7Aoa2yVx1kd" role="2OqNvi">
                               <ref role="37wK5l" node="5EDW3XDYObD" resolve="getFrom" />
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="6v6oK28i44V" role="37wK5m">
-                            <node concept="1rXfSq" id="6v6oK28i44W" role="2Oq$k0">
+                          <node concept="2OqwBi" id="7Aoa2yVx1ke" role="37wK5m">
+                            <node concept="1rXfSq" id="7Aoa2yVx1kf" role="2Oq$k0">
                               <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
                             </node>
-                            <node concept="liA8E" id="6v6oK28i44X" role="2OqNvi">
+                            <node concept="liA8E" id="7Aoa2yVx1kg" role="2OqNvi">
                               <ref role="37wK5l" node="5EDW3XDYOe6" resolve="getTo" />
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="3FEFhOSQpgU" role="37wK5m">
-                            <node concept="1rXfSq" id="3FEFhOSQoEM" role="2Oq$k0">
+                          <node concept="2OqwBi" id="7Aoa2yVx1kh" role="37wK5m">
+                            <node concept="1rXfSq" id="7Aoa2yVx1ki" role="2Oq$k0">
                               <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
                             </node>
-                            <node concept="liA8E" id="3FEFhOSQq8n" role="2OqNvi">
+                            <node concept="liA8E" id="7Aoa2yVx1kj" role="2OqNvi">
                               <ref role="37wK5l" node="51h1DIGnofl" resolve="isStrong" />
                             </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="3clFbH" id="6v6oK28i44Y" role="3cqZAp" />
-                  </node>
-                  <node concept="37vLTG" id="6v6oK28i44Z" role="1bW2Oz">
-                    <property role="TrG5h" value="cache" />
-                    <node concept="3uibUv" id="6v6oK28i450" role="1tU5fm">
-                      <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+                      <node concept="37vLTw" id="7Aoa2yVwYLy" role="37vLTJ">
+                        <ref role="3cqZAo" node="6v6oK28i44G" resolve="converts" />
+                      </node>
                     </node>
                   </node>
-                </node>
-                <node concept="1bVj0M" id="6v6oK28i451" role="37wK5m">
-                  <node concept="3clFbS" id="6v6oK28i452" role="1bW5cS">
-                    <node concept="3cpWs8" id="1C_jAsqtIHg" role="3cqZAp">
-                      <node concept="3cpWsn" id="1C_jAsqtIHh" role="3cpWs9">
-                        <property role="TrG5h" value="strategy" />
-                        <node concept="3uibUv" id="1C_jAsqtIHi" role="1tU5fm">
-                          <ref role="3uigEE" node="61G6TdCqpnb" resolve="TypecheckingStrategy" />
-                        </node>
-                        <node concept="2ShNRf" id="1C_jAsqtIHj" role="33vP2m">
-                          <node concept="1pGfFk" id="1C_jAsqtIHk" role="2ShVmc">
-                            <ref role="37wK5l" node="5Qx6_65F4Qp" resolve="TypecheckingStrategy.Caching" />
-                            <node concept="Xjq3P" id="1C_jAsqtIHl" role="37wK5m" />
-                            <node concept="2OqwBi" id="1C_jAsqtSuT" role="37wK5m">
-                              <node concept="37vLTw" id="1C_jAsqtIHm" role="2Oq$k0">
+                  <node concept="3clFbH" id="7Aoa2yVwYLz" role="3cqZAp" />
+                  <node concept="3clFbJ" id="7Aoa2yVwYL$" role="3cqZAp">
+                    <node concept="3clFbS" id="7Aoa2yVwYL_" role="3clFbx">
+                      <node concept="3cpWs8" id="7Aoa2yVyksY" role="3cqZAp">
+                        <node concept="3cpWsn" id="7Aoa2yVyksZ" role="3cpWs9">
+                          <property role="TrG5h" value="response" />
+                          <node concept="3uibUv" id="7Aoa2yVykt0" role="1tU5fm">
+                            <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
+                            <node concept="3uibUv" id="7Aoa2yVyofH" role="11_B2D">
+                              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+                            </node>
+                          </node>
+                          <node concept="1rXfSq" id="7Aoa2yVykt2" role="33vP2m">
+                            <ref role="37wK5l" node="7Aoa2yVxi6Q" resolve="calcConverts" />
+                            <node concept="2OqwBi" id="7Aoa2yVykt3" role="37wK5m">
+                              <node concept="37vLTw" id="7Aoa2yVykt4" role="2Oq$k0">
                                 <ref role="3cqZAo" node="1C_jAsqhPel" resolve="state" />
                               </node>
-                              <node concept="liA8E" id="1C_jAsqtTsJ" role="2OqNvi">
+                              <node concept="liA8E" id="7Aoa2yVykt5" role="2OqNvi">
                                 <ref role="37wK5l" node="1C_jAsql6Ib" resolve="getRepository" />
                               </node>
                             </node>
-                            <node concept="37vLTw" id="1C_jAsqtIHn" role="37wK5m">
+                            <node concept="37vLTw" id="7Aoa2yVykt6" role="37wK5m">
                               <ref role="3cqZAo" node="1C_jAsqp06G" resolve="messageHandler" />
                             </node>
-                            <node concept="2OqwBi" id="1C_jAsqtVdv" role="37wK5m">
-                              <node concept="37vLTw" id="1C_jAsqtIHo" role="2Oq$k0">
+                            <node concept="37vLTw" id="7Aoa2yVykt7" role="37wK5m">
+                              <ref role="3cqZAo" node="7Aoa2yVwYL2" resolve="cachedData" />
+                            </node>
+                            <node concept="37vLTw" id="7Aoa2yVykt8" role="37wK5m">
+                              <ref role="3cqZAo" node="7Aoa2yVwYL4" resolve="fresh" />
+                            </node>
+                            <node concept="2OqwBi" id="7Aoa2yVykt9" role="37wK5m">
+                              <node concept="37vLTw" id="7Aoa2yVykta" role="2Oq$k0">
                                 <ref role="3cqZAo" node="1C_jAsqhPel" resolve="state" />
                               </node>
-                              <node concept="liA8E" id="1C_jAsqtW9B" role="2OqNvi">
+                              <node concept="liA8E" id="7Aoa2yVyktb" role="2OqNvi">
                                 <ref role="37wK5l" node="1T5MAgPidDk" resolve="typeCollector" />
                               </node>
                             </node>
-                            <node concept="2OqwBi" id="1C_jAsqtIHp" role="37wK5m">
-                              <node concept="37vLTw" id="1C_jAsqtIHq" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6v6oK28i45B" resolve="updatable" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="7Aoa2yVyh2H" role="3cqZAp" />
+                      <node concept="3clFbF" id="7Aoa2yVyUJa" role="3cqZAp">
+                        <node concept="37vLTI" id="7Aoa2yVyWqJ" role="3clFbG">
+                          <node concept="2OqwBi" id="7Aoa2yVyXRD" role="37vLTx">
+                            <node concept="37vLTw" id="7Aoa2yVyX9s" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7Aoa2yVyksZ" resolve="response" />
+                            </node>
+                            <node concept="liA8E" id="qsErMwn4YX" role="2OqNvi">
+                              <ref role="37wK5l" node="1RYTbd8j4FJ" resolve="getValue" />
+                            </node>
+                          </node>
+                          <node concept="37vLTw" id="7Aoa2yVyUJ8" role="37vLTJ">
+                            <ref role="3cqZAo" node="6v6oK28i44G" resolve="converts" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="7Aoa2yVwYMi" role="3cqZAp">
+                        <node concept="2OqwBi" id="7Aoa2yVwYMj" role="3clFbG">
+                          <node concept="37vLTw" id="7Aoa2yVwYMk" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Aoa2yVwYL9" resolve="conversionInfo" />
+                          </node>
+                          <node concept="liA8E" id="7Aoa2yVypET" role="2OqNvi">
+                            <ref role="37wK5l" node="7Aoa2yVtaSh" resolve="putConvertsTo" />
+                            <node concept="2OqwBi" id="7Aoa2yVypEU" role="37wK5m">
+                              <node concept="1rXfSq" id="7Aoa2yVypEV" role="2Oq$k0">
+                                <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
                               </node>
-                              <node concept="liA8E" id="1C_jAsqtIHr" role="2OqNvi">
-                                <ref role="37wK5l" node="61G6TdD6$Xx" resolve="cacheHolder" />
+                              <node concept="liA8E" id="7Aoa2yVypEW" role="2OqNvi">
+                                <ref role="37wK5l" node="5EDW3XDYObD" resolve="getFrom" />
                               </node>
                             </node>
+                            <node concept="2OqwBi" id="7Aoa2yVypEX" role="37wK5m">
+                              <node concept="1rXfSq" id="7Aoa2yVypEY" role="2Oq$k0">
+                                <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
+                              </node>
+                              <node concept="liA8E" id="7Aoa2yVypEZ" role="2OqNvi">
+                                <ref role="37wK5l" node="5EDW3XDYOe6" resolve="getTo" />
+                              </node>
+                            </node>
+                            <node concept="2OqwBi" id="7Aoa2yVypF0" role="37wK5m">
+                              <node concept="1rXfSq" id="7Aoa2yVypF1" role="2Oq$k0">
+                                <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
+                              </node>
+                              <node concept="liA8E" id="7Aoa2yVypF2" role="2OqNvi">
+                                <ref role="37wK5l" node="51h1DIGnofl" resolve="isStrong" />
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="7Aoa2yVz0a4" role="37wK5m">
+                              <ref role="3cqZAo" node="6v6oK28i44G" resolve="converts" />
+                            </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3cpWs8" id="6v6oK28i453" role="3cqZAp">
-                      <node concept="3cpWsn" id="6v6oK28i454" role="3cpWs9">
-                        <property role="TrG5h" value="response" />
-                        <node concept="3uibUv" id="6v6oK28i455" role="1tU5fm">
-                          <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
-                          <node concept="3uibUv" id="6v6oK28i456" role="11_B2D">
-                            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="1C_jAsqtIIo" role="33vP2m">
-                          <node concept="37vLTw" id="1C_jAsqtIIp" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1C_jAsqtIHh" resolve="strategy" />
-                          </node>
-                          <node concept="liA8E" id="7Aoa2yTOvMR" role="2OqNvi">
-                            <ref role="37wK5l" node="7Aoa2yU04_N" resolve="launch" />
-                            <node concept="3clFbT" id="7Aoa2yTOwoM" role="37wK5m">
-                              <property role="3clFbU" value="true" />
-                            </node>
-                            <node concept="37Ijox" id="7Aoa2yTOxqM" role="37wK5m">
-                              <ref role="37Ijqf" node="1RYTbd8cMMZ" resolve="of" />
-                              <node concept="2FaPjH" id="7Aoa2yTOxqO" role="wWaWy">
-                                <node concept="3uibUv" id="7Aoa2yTOxqP" role="2FaQuo">
-                                  <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
+                    <node concept="3clFbC" id="7Aoa2yVwYMw" role="3clFbw">
+                      <node concept="10Nm6u" id="7Aoa2yVwYMx" role="3uHU7w" />
+                      <node concept="37vLTw" id="7Aoa2yVwYMy" role="3uHU7B">
+                        <ref role="3cqZAo" node="6v6oK28i44G" resolve="converts" />
                       </node>
                     </node>
-                    <node concept="3clFbH" id="1C_jAsqtHXo" role="3cqZAp" />
-                    <node concept="3clFbF" id="6v6oK28i45f" role="3cqZAp">
-                      <node concept="2OqwBi" id="6v6oK28i45g" role="3clFbG">
-                        <node concept="37vLTw" id="6v6oK28i45h" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6v6oK28i45B" resolve="updatable" />
-                        </node>
-                        <node concept="liA8E" id="6v6oK28i45i" role="2OqNvi">
-                          <ref role="37wK5l" node="5Qx6_65$vyG" resolve="update" />
-                          <node concept="1bVj0M" id="6v6oK28i45j" role="37wK5m">
-                            <node concept="3clFbS" id="6v6oK28i45k" role="1bW5cS">
-                              <node concept="3clFbF" id="6v6oK28i45l" role="3cqZAp">
-                                <node concept="2OqwBi" id="6v6oK28i45m" role="3clFbG">
-                                  <node concept="37vLTw" id="6v6oK28i45n" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6v6oK28i45_" resolve="update" />
-                                  </node>
-                                  <node concept="liA8E" id="6v6oK28i45o" role="2OqNvi">
-                                    <ref role="37wK5l" node="1z4$59jFoE1" resolve="putConvertsTo" />
-                                    <node concept="2OqwBi" id="6v6oK28i45p" role="37wK5m">
-                                      <node concept="1rXfSq" id="6v6oK28i45q" role="2Oq$k0">
-                                        <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
-                                      </node>
-                                      <node concept="liA8E" id="6v6oK28i45r" role="2OqNvi">
-                                        <ref role="37wK5l" node="5EDW3XDYObD" resolve="getFrom" />
-                                      </node>
-                                    </node>
-                                    <node concept="2OqwBi" id="6v6oK28i45s" role="37wK5m">
-                                      <node concept="1rXfSq" id="6v6oK28i45t" role="2Oq$k0">
-                                        <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
-                                      </node>
-                                      <node concept="liA8E" id="6v6oK28i45u" role="2OqNvi">
-                                        <ref role="37wK5l" node="5EDW3XDYOe6" resolve="getTo" />
-                                      </node>
-                                    </node>
-                                    <node concept="2OqwBi" id="3FEFhOSQsGL" role="37wK5m">
-                                      <node concept="1rXfSq" id="3FEFhOSQrPN" role="2Oq$k0">
-                                        <ref role="37wK5l" node="6v6oK22E7yX" resolve="query" />
-                                      </node>
-                                      <node concept="liA8E" id="3FEFhOSQtDc" role="2OqNvi">
-                                        <ref role="37wK5l" node="51h1DIGnofl" resolve="isStrong" />
-                                      </node>
-                                    </node>
-                                    <node concept="10QFUN" id="6v6oK28i45v" role="37wK5m">
-                                      <node concept="2OqwBi" id="6v6oK28i45w" role="10QFUP">
-                                        <node concept="37vLTw" id="6v6oK28i45x" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6v6oK28i454" resolve="response" />
-                                        </node>
-                                        <node concept="liA8E" id="6v6oK28i45y" role="2OqNvi">
-                                          <ref role="37wK5l" node="1RYTbd8j4FJ" resolve="getValue" />
-                                        </node>
-                                      </node>
-                                      <node concept="3uibUv" id="6v6oK28i45z" role="10QFUM">
-                                        <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbH" id="6v6oK28i45$" role="3cqZAp" />
-                            </node>
-                            <node concept="37vLTG" id="6v6oK28i45_" role="1bW2Oz">
-                              <property role="TrG5h" value="update" />
-                              <node concept="3uibUv" id="6v6oK28i45A" role="1tU5fm">
-                                <ref role="3uigEE" node="1z4$59jqeoH" resolve="TypecheckingResultsCache.Update" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="37vLTG" id="6v6oK28i45B" role="1bW2Oz">
-                    <property role="TrG5h" value="updatable" />
-                    <node concept="3uibUv" id="6v6oK28i45C" role="1tU5fm">
-                      <ref role="3uigEE" node="4Dkptq1Qcxp" resolve="CacheUpdatable" />
-                    </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="6v6oK28iiJy" role="3cqZAp" />
+        <node concept="3clFbH" id="7Aoa2yVwYMR" role="3cqZAp" />
         <node concept="3clFbF" id="6v6oK28i9km" role="3cqZAp">
           <node concept="2YIFZM" id="6v6oK28idTY" role="3clFbG">
             <ref role="37wK5l" node="1RYTbd8cMMZ" resolve="of" />
@@ -16610,6 +13557,35 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="7Aoa2yVyLww" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVyM_7" role="jymVt">
+      <property role="TrG5h" value="response" />
+      <node concept="37vLTG" id="7Aoa2yVyM_8" role="3clF46">
+        <property role="TrG5h" value="executionOk" />
+        <node concept="10P_77" id="7Aoa2yVyM_9" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="7Aoa2yVyM_a" role="3clF45">
+        <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
+        <node concept="3uibUv" id="7Aoa2yVyM_e" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+        </node>
+      </node>
+      <node concept="3Tmbuc" id="7Aoa2yVyM_c" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVyM_f" role="3clF47">
+        <node concept="3clFbF" id="7Aoa2yVyPa2" role="3cqZAp">
+          <node concept="2YIFZM" id="7Aoa2yVyQ7L" role="3clFbG">
+            <ref role="37wK5l" node="1RYTbd8cMMZ" resolve="of" />
+            <ref role="1Pybhc" node="1RYTbd8bNK8" resolve="Response" />
+            <node concept="37vLTw" id="7Aoa2yVyQO3" role="37wK5m">
+              <ref role="3cqZAo" node="7Aoa2yVyM_8" resolve="executionOk" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="7Aoa2yVyM_g" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="6v6oK26Lufo" role="jymVt" />
     <node concept="3clFb_" id="6v6oK241gFE" role="jymVt">
       <property role="TrG5h" value="nodes" />
@@ -16645,7 +13621,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="6v6oK26Kol7" role="1zkMxy">
-      <ref role="3uigEE" node="1z4$59iohfJ" resolve="Request" />
+      <ref role="3uigEE" node="7Aoa2yVx5U6" resolve="AbstractConvertsRequest" />
       <node concept="3uibUv" id="6v6oK24Gc3i" role="11_B2D">
         <ref role="3uigEE" node="5EDW3XDYNS7" resolve="ConvertQuery" />
       </node>
@@ -16831,6 +13807,44 @@
     <property role="3GE5qa" value="requests" />
     <property role="TrG5h" value="AbstractCheckRequest" />
     <property role="1sVAO0" value="true" />
+    <node concept="2tJIrI" id="7Aoa2yVe7bS" role="jymVt" />
+    <node concept="Wx3nA" id="7Aoa2yVefYI" role="jymVt">
+      <property role="TrG5h" value="REPORTED_TYPES" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3uibUv" id="7Aoa2yVefYJ" role="1tU5fm">
+        <ref role="3uigEE" node="7i3KM7g1Lm1" resolve="DataFlavour" />
+        <node concept="3uibUv" id="7Aoa2yVejg$" role="11_B2D">
+          <ref role="3uigEE" node="7Aoa2yVdSP8" resolve="ReportedTypes" />
+        </node>
+      </node>
+      <node concept="2YIFZM" id="7Aoa2yVeBu0" role="33vP2m">
+        <ref role="37wK5l" node="7Aoa2yVep9e" resolve="of" />
+        <ref role="1Pybhc" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
+        <node concept="3VsKOn" id="7Aoa2yVefYR" role="37wK5m">
+          <ref role="3VsUkX" node="7Aoa2yVdSP8" resolve="ReportedTypes" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7Aoa2yV_Osq" role="1B3o_S" />
+    </node>
+    <node concept="Wx3nA" id="7Aoa2yVg9X5" role="jymVt">
+      <property role="TrG5h" value="REPORTED_ITEMS" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3uibUv" id="7Aoa2yVg9X6" role="1tU5fm">
+        <ref role="3uigEE" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
+        <node concept="3uibUv" id="7Aoa2yVg9X7" role="11_B2D">
+          <ref role="3uigEE" node="7Aoa2yVfU_u" resolve="ReportedItems" />
+        </node>
+      </node>
+      <node concept="2YIFZM" id="7Aoa2yVg9X8" role="33vP2m">
+        <ref role="37wK5l" node="7Aoa2yVep9e" resolve="of" />
+        <ref role="1Pybhc" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
+        <node concept="3VsKOn" id="7Aoa2yVg9X9" role="37wK5m">
+          <ref role="3VsUkX" node="7Aoa2yVfU_u" resolve="ReportedItems" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7Aoa2yV_OzD" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVe7bT" role="jymVt" />
     <node concept="3clFbW" id="6v6oK27vgVJ" role="jymVt">
       <node concept="37vLTG" id="6v6oK27vgX4" role="3clF46">
         <property role="TrG5h" value="query" />
@@ -16882,13 +13896,11 @@
                 <node concept="37vLTw" id="628U2saJsWO" role="37wK5m">
                   <ref role="3cqZAo" node="6v6oK27vjix" resolve="typeCollector" />
                 </node>
-                <node concept="2OqwBi" id="628U2saJsWP" role="37wK5m">
-                  <node concept="37vLTw" id="628U2saJsWQ" role="2Oq$k0">
-                    <ref role="3cqZAo" node="6v6oK27vjiv" resolve="updatable" />
-                  </node>
-                  <node concept="liA8E" id="628U2saJsWR" role="2OqNvi">
-                    <ref role="37wK5l" node="61G6TdD6$Xx" resolve="cacheHolder" />
-                  </node>
+                <node concept="37vLTw" id="7Aoa2yVk_uZ" role="37wK5m">
+                  <ref role="3cqZAo" node="7Aoa2yVky2I" resolve="cachedData" />
+                </node>
+                <node concept="37vLTw" id="628U2saJsWQ" role="37wK5m">
+                  <ref role="3cqZAo" node="6v6oK27vjiv" resolve="updatable" />
                 </node>
               </node>
             </node>
@@ -16938,12 +13950,16 @@
         <property role="TrG5h" value="unit" />
         <node concept="3Tqbb2" id="628U2saJvdL" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="6v6oK27vjiv" role="3clF46">
-        <property role="TrG5h" value="updatable" />
-        <node concept="3uibUv" id="628U2saJvdM" role="1tU5fm">
-          <ref role="3uigEE" node="4Dkptq1Qcxp" resolve="CacheUpdatable" />
+      <node concept="37vLTG" id="7Aoa2yVky2I" role="3clF46">
+        <property role="TrG5h" value="cachedData" />
+        <node concept="3uibUv" id="7Aoa2yVk$az" role="1tU5fm">
+          <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
         </node>
       </node>
+      <node concept="37vLTG" id="6v6oK27vjiv" role="3clF46">
+        <property role="TrG5h" value="fresh" />
+        <node concept="10P_77" id="7Aoa2yVjO5x" role="1tU5fm" />
+      </node>
       <node concept="37vLTG" id="6v6oK27vjix" role="3clF46">
         <property role="TrG5h" value="typeCollector" />
         <node concept="3uibUv" id="628U2saJvdN" role="1tU5fm">
@@ -17044,192 +14060,143 @@
             <node concept="3uibUv" id="6v6oK28TIDU" role="1tU5fm">
               <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
             </node>
-            <node concept="2OqwBi" id="6v6oK28TIDV" role="33vP2m">
-              <node concept="37vLTw" id="1C_jAsqinX8" role="2Oq$k0">
-                <ref role="3cqZAo" node="1C_jAsqhPer" resolve="state" />
-              </node>
-              <node concept="liA8E" id="6v6oK28TIDZ" role="2OqNvi">
-                <ref role="37wK5l" node="1z4$59jvV_B" resolve="getOrUpdateValue" />
-                <node concept="1bVj0M" id="6v6oK28TIE0" role="37wK5m">
-                  <node concept="3clFbS" id="6v6oK28TIE1" role="1bW5cS">
-                    <node concept="3SKdUt" id="6v6oK28TYn6" role="3cqZAp">
-                      <node concept="1PaTwC" id="6v6oK28TYn7" role="1aUNEU">
-                        <node concept="3oM_SD" id="6v6oK28TYnf" role="1PaTwD">
-                          <property role="3oM_SC" value="FIXME" />
-                        </node>
-                        <node concept="3oM_SD" id="6v6oK28Z8tZ" role="1PaTwD">
-                          <property role="3oM_SC" value="always" />
-                        </node>
-                        <node concept="3oM_SD" id="6v6oK28TZJl" role="1PaTwD">
-                          <property role="3oM_SC" value="compute" />
-                        </node>
+            <node concept="10Nm6u" id="7Aoa2yV$XwT" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="7Aoa2yV$UKx" role="3cqZAp" />
+        <node concept="3clFbF" id="7Aoa2yV$Yux" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yV$ZLE" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yV$Yuv" role="2Oq$k0">
+              <ref role="3cqZAo" node="1C_jAsqhPer" resolve="state" />
+            </node>
+            <node concept="liA8E" id="7Aoa2yV_0sz" role="2OqNvi">
+              <ref role="37wK5l" node="7Aoa2yVqV_s" resolve="updateSharedCachedData" />
+              <node concept="1bVj0M" id="7Aoa2yV_1yk" role="37wK5m">
+                <node concept="gl6BB" id="7Aoa2yV_1y$" role="1bW2Oz">
+                  <property role="TrG5h" value="cachedData" />
+                  <node concept="2jxLKc" id="7Aoa2yV_1y_" role="1tU5fm" />
+                </node>
+                <node concept="gl6BB" id="7Aoa2yV_1yV" role="1bW2Oz">
+                  <property role="TrG5h" value="fresh" />
+                  <node concept="2jxLKc" id="7Aoa2yV_1yW" role="1tU5fm" />
+                </node>
+                <node concept="3clFbS" id="7Aoa2yV_1yX" role="1bW5cS">
+                  <node concept="3clFbH" id="7Aoa2yV_4wb" role="3cqZAp" />
+                  <node concept="3SKdUt" id="7Aoa2yV_bNJ" role="3cqZAp">
+                    <node concept="1PaTwC" id="7Aoa2yV_bNK" role="1aUNEU">
+                      <node concept="3oM_SD" id="7Aoa2yV_bNL" role="1PaTwD">
+                        <property role="3oM_SC" value="FIXME" />
+                      </node>
+                      <node concept="3oM_SD" id="7Aoa2yV_bNM" role="1PaTwD">
+                        <property role="3oM_SC" value="always" />
+                      </node>
+                      <node concept="3oM_SD" id="7Aoa2yV_bNN" role="1PaTwD">
+                        <property role="3oM_SC" value="compute" />
                       </node>
                     </node>
-                    <node concept="3clFbF" id="6v6oK28TVsR" role="3cqZAp">
-                      <node concept="10QFUN" id="6v6oK28Vta1" role="3clFbG">
-                        <node concept="10Nm6u" id="6v6oK28Vta0" role="10QFUP" />
-                        <node concept="3uibUv" id="6v6oK28VtFv" role="10QFUM">
+                  </node>
+                  <node concept="3cpWs8" id="7Aoa2yV_4X0" role="3cqZAp">
+                    <node concept="3cpWsn" id="7Aoa2yV_4X1" role="3cpWs9">
+                      <property role="TrG5h" value="strategy" />
+                      <node concept="2ShNRf" id="7Aoa2yV_4X2" role="33vP2m">
+                        <node concept="1pGfFk" id="7Aoa2yV_4X3" role="2ShVmc">
+                          <ref role="37wK5l" node="5Qx6_65F4Qp" />
+                          <node concept="Xjq3P" id="7Aoa2yV_4X4" role="37wK5m" />
+                          <node concept="2OqwBi" id="7Aoa2yV_4X5" role="37wK5m">
+                            <node concept="37vLTw" id="7Aoa2yV_4X6" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1C_jAsqhPer" resolve="state" />
+                            </node>
+                            <node concept="liA8E" id="7Aoa2yV_4X7" role="2OqNvi">
+                              <ref role="37wK5l" node="1C_jAsql6Ib" resolve="getRepository" />
+                            </node>
+                          </node>
+                          <node concept="37vLTw" id="7Aoa2yV_4X8" role="37wK5m">
+                            <ref role="3cqZAo" node="1C_jAsqp06Q" resolve="messageHandler" />
+                          </node>
+                          <node concept="2OqwBi" id="7Aoa2yV_4X9" role="37wK5m">
+                            <node concept="37vLTw" id="7Aoa2yV_4Xa" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1C_jAsqhPer" resolve="state" />
+                            </node>
+                            <node concept="liA8E" id="7Aoa2yV_4Xb" role="2OqNvi">
+                              <ref role="37wK5l" node="1T5MAgPidDk" resolve="typeCollector" />
+                            </node>
+                          </node>
+                          <node concept="37vLTw" id="7Aoa2yV_6OH" role="37wK5m">
+                            <ref role="3cqZAo" node="7Aoa2yV_1y$" resolve="cachedData" />
+                          </node>
+                          <node concept="37vLTw" id="7Aoa2yV_81j" role="37wK5m">
+                            <ref role="3cqZAo" node="7Aoa2yV_1yV" resolve="fresh" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3uibUv" id="7Aoa2yV_4Xf" role="1tU5fm">
+                        <ref role="3uigEE" node="61G6TdCqpnb" resolve="TypecheckingStrategy" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWs8" id="7Aoa2yV_8Kn" role="3cqZAp">
+                    <node concept="3cpWsn" id="7Aoa2yV_8Ko" role="3cpWs9">
+                      <property role="TrG5h" value="response" />
+                      <node concept="3uibUv" id="7Aoa2yV_8Kp" role="1tU5fm">
+                        <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
+                        <node concept="3uibUv" id="7Aoa2yV_8Kq" role="11_B2D">
                           <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
                         </node>
                       </node>
-                    </node>
-                    <node concept="3clFbH" id="6v6oK28TWki" role="3cqZAp" />
-                  </node>
-                  <node concept="37vLTG" id="6v6oK28TIEd" role="1bW2Oz">
-                    <property role="TrG5h" value="cache" />
-                    <node concept="3uibUv" id="6v6oK28TIEe" role="1tU5fm">
-                      <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
+                      <node concept="2OqwBi" id="7Aoa2yV_8Kr" role="33vP2m">
+                        <node concept="37vLTw" id="7Aoa2yV_8Ks" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yV_4X1" resolve="strategy" />
+                        </node>
+                        <node concept="liA8E" id="7Aoa2yV_8Kt" role="2OqNvi">
+                          <ref role="37wK5l" node="7Aoa2yU04_N" resolve="launch" />
+                          <node concept="3clFbT" id="7Aoa2yV_8Ku" role="37wK5m" />
+                          <node concept="37Ijox" id="7Aoa2yV_8Kv" role="37wK5m">
+                            <ref role="37Ijqf" node="1RYTbd8cMMZ" resolve="of" />
+                            <node concept="2FaPjH" id="7Aoa2yV_8Kw" role="wWaWy">
+                              <node concept="3uibUv" id="7Aoa2yV_8Kx" role="2FaQuo">
+                                <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
-                </node>
-                <node concept="1bVj0M" id="6v6oK28TIEf" role="37wK5m">
-                  <node concept="3clFbS" id="6v6oK28TIEg" role="1bW5cS">
-                    <node concept="3clFbH" id="1C_jAsquY1d" role="3cqZAp" />
-                    <node concept="3cpWs8" id="1C_jAsquY1e" role="3cqZAp">
-                      <node concept="3cpWsn" id="1C_jAsquY1f" role="3cpWs9">
-                        <property role="TrG5h" value="strategy" />
-                        <node concept="2ShNRf" id="1C_jAsquY1g" role="33vP2m">
-                          <node concept="1pGfFk" id="1C_jAsquY1h" role="2ShVmc">
-                            <ref role="37wK5l" node="5Qx6_65F4Qp" resolve="TypecheckingStrategy.Caching" />
-                            <node concept="Xjq3P" id="1C_jAsquY1i" role="37wK5m" />
-                            <node concept="2OqwBi" id="1C_jAsqvbG$" role="37wK5m">
-                              <node concept="37vLTw" id="1C_jAsquY1j" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1C_jAsqhPer" resolve="state" />
-                              </node>
-                              <node concept="liA8E" id="1C_jAsqvcAz" role="2OqNvi">
-                                <ref role="37wK5l" node="1C_jAsql6Ib" resolve="getRepository" />
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="1C_jAsquY1k" role="37wK5m">
-                              <ref role="3cqZAo" node="1C_jAsqp06Q" resolve="messageHandler" />
-                            </node>
-                            <node concept="2OqwBi" id="1C_jAsqvetC" role="37wK5m">
-                              <node concept="37vLTw" id="1C_jAsquY1l" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1C_jAsqhPer" resolve="state" />
-                              </node>
-                              <node concept="liA8E" id="1C_jAsqvfGb" role="2OqNvi">
-                                <ref role="37wK5l" node="1T5MAgPidDk" resolve="typeCollector" />
-                              </node>
-                            </node>
-                            <node concept="2OqwBi" id="1C_jAsquY1m" role="37wK5m">
-                              <node concept="37vLTw" id="1C_jAsquY1n" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6v6oK28TIEP" resolve="updatable" />
-                              </node>
-                              <node concept="liA8E" id="1C_jAsquY1o" role="2OqNvi">
-                                <ref role="37wK5l" node="61G6TdD6$Xx" resolve="cacheHolder" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3uibUv" id="1C_jAsquY1p" role="1tU5fm">
-                          <ref role="3uigEE" node="61G6TdCqpnb" resolve="TypecheckingStrategy" />
-                        </node>
+                  <node concept="3SKdUt" id="7Aoa2yV_aKG" role="3cqZAp">
+                    <node concept="1PaTwC" id="7Aoa2yV_aKH" role="1aUNEU">
+                      <node concept="3oM_SD" id="7Aoa2yV_aKI" role="1PaTwD">
+                        <property role="3oM_SC" value="FIXME" />
                       </node>
-                    </node>
-                    <node concept="3clFbH" id="1C_jAsquY1q" role="3cqZAp" />
-                    <node concept="3cpWs8" id="6v6oK28U2rb" role="3cqZAp">
-                      <node concept="3cpWsn" id="6v6oK28U2rc" role="3cpWs9">
-                        <property role="TrG5h" value="response" />
-                        <node concept="3uibUv" id="6v6oK28U2rd" role="1tU5fm">
-                          <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
-                          <node concept="3uibUv" id="6v6oK28U9jm" role="11_B2D">
-                            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="1C_jAsquY2w" role="33vP2m">
-                          <node concept="37vLTw" id="1C_jAsquY2x" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1C_jAsquY1f" resolve="strategy" />
-                          </node>
-                          <node concept="liA8E" id="7Aoa2yTOC3R" role="2OqNvi">
-                            <ref role="37wK5l" node="7Aoa2yU04_N" resolve="launch" />
-                            <node concept="3clFbT" id="7Aoa2yTOCzy" role="37wK5m" />
-                            <node concept="37Ijox" id="7Aoa2yTODIZ" role="37wK5m">
-                              <ref role="37Ijqf" node="1RYTbd8cMMZ" resolve="of" />
-                              <node concept="2FaPjH" id="7Aoa2yTODJ1" role="wWaWy">
-                                <node concept="3uibUv" id="7Aoa2yTODJ2" role="2FaQuo">
-                                  <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
+                      <node concept="3oM_SD" id="7Aoa2yV_aKJ" role="1PaTwD">
+                        <property role="3oM_SC" value="update" />
                       </node>
-                    </node>
-                    <node concept="3clFbH" id="1C_jAsqvhvl" role="3cqZAp" />
-                    <node concept="3SKdUt" id="6v6oK28Z67U" role="3cqZAp">
-                      <node concept="1PaTwC" id="6v6oK28Z67V" role="1aUNEU">
-                        <node concept="3oM_SD" id="6v6oK28Z6Um" role="1PaTwD">
-                          <property role="3oM_SC" value="FIXME" />
-                        </node>
-                        <node concept="3oM_SD" id="6v6oK28Z7WK" role="1PaTwD">
-                          <property role="3oM_SC" value="update" />
-                        </node>
-                        <node concept="3oM_SD" id="6v6oK28Z9oV" role="1PaTwD">
-                          <property role="3oM_SC" value="cache" />
-                        </node>
+                      <node concept="3oM_SD" id="7Aoa2yV_aKK" role="1PaTwD">
+                        <property role="3oM_SC" value="cache" />
                       </node>
                     </node>
-                    <node concept="1X3_iC" id="6v6oK28UfDO" role="lGtFl">
-                      <property role="3V$3am" value="statement" />
-                      <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                      <node concept="3clFbF" id="6v6oK28U2rn" role="8Wnug">
-                        <node concept="2OqwBi" id="6v6oK28U2ro" role="3clFbG">
-                          <node concept="37vLTw" id="6v6oK28U2rp" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6v6oK28TIEP" resolve="updatable" />
-                          </node>
-                          <node concept="liA8E" id="6v6oK28U2rq" role="2OqNvi">
-                            <ref role="37wK5l" node="5Qx6_65$vyG" resolve="update" />
-                            <node concept="1bVj0M" id="6v6oK28U2rr" role="37wK5m">
-                              <node concept="37vLTG" id="6v6oK28U2rs" role="1bW2Oz">
-                                <property role="TrG5h" value="update" />
-                                <node concept="3uibUv" id="6v6oK28U2rt" role="1tU5fm">
-                                  <ref role="3uigEE" node="1z4$59jqeoH" resolve="TypecheckingResultsCache.Update" />
-                                </node>
-                              </node>
-                              <node concept="3clFbS" id="6v6oK28U2ru" role="1bW5cS">
-                                <node concept="3clFbH" id="6v6oK28U2rA" role="3cqZAp" />
-                                <node concept="3SKdUt" id="6v6oK28Ubw1" role="3cqZAp">
-                                  <node concept="1PaTwC" id="6v6oK28Ubw2" role="1aUNEU">
-                                    <node concept="3oM_SD" id="6v6oK28UcN_" role="1PaTwD">
-                                      <property role="3oM_SC" value="TODO" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="6v6oK28UmIm" role="3cqZAp">
-                      <node concept="2OqwBi" id="6v6oK28UpRU" role="3clFbG">
-                        <node concept="2OqwBi" id="6v6oK28UnSV" role="2Oq$k0">
-                          <node concept="37vLTw" id="6v6oK28UmIk" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6v6oK28TIEP" resolve="updatable" />
-                          </node>
-                          <node concept="liA8E" id="6v6oK28Up4Y" role="2OqNvi">
-                            <ref role="37wK5l" node="61G6TdD6$Xx" resolve="cacheHolder" />
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="6v6oK28Ur7k" role="2OqNvi">
-                          <ref role="37wK5l" node="5AFANm9Mi2l" resolve="getCache" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="6v6oK28Ulbk" role="3cqZAp" />
-                  </node>
-                  <node concept="37vLTG" id="6v6oK28TIEP" role="1bW2Oz">
-                    <property role="TrG5h" value="updatable" />
-                    <node concept="3uibUv" id="6v6oK28TIEQ" role="1tU5fm">
-                      <ref role="3uigEE" node="4Dkptq1Qcxp" resolve="CacheUpdatable" />
-                    </node>
                   </node>
+                  <node concept="3clFbF" id="7Aoa2yV_dSN" role="3cqZAp">
+                    <node concept="37vLTI" id="7Aoa2yV_hTV" role="3clFbG">
+                      <node concept="2OqwBi" id="7Aoa2yV_jOp" role="37vLTx">
+                        <node concept="37vLTw" id="7Aoa2yV_iCH" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7Aoa2yV_8Ko" resolve="response" />
+                        </node>
+                        <node concept="liA8E" id="7Aoa2yV_l64" role="2OqNvi">
+                          <ref role="37wK5l" node="6v6oK28a3mY" resolve="isSuccessful" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="7Aoa2yV_dSL" role="37vLTJ">
+                        <ref role="3cqZAo" node="6v6oK28TIDT" resolve="value" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="7Aoa2yV_mPJ" role="3cqZAp" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="6v6oK28TIER" role="3cqZAp" />
+        <node concept="3clFbH" id="7Aoa2yV$XUt" role="3cqZAp" />
         <node concept="3clFbF" id="6v6oK28TIES" role="3cqZAp">
           <node concept="2YIFZM" id="6v6oK28TIET" role="3clFbG">
             <ref role="37wK5l" node="1RYTbd8cMMZ" resolve="of" />
@@ -19122,13 +16089,6 @@
         <node concept="3uibUv" id="61G6TdBA092" role="3clF45">
           <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
         </node>
-        <node concept="37vLTG" id="6PWFJfG8SUx" role="3clF46">
-          <property role="TrG5h" value="aspectClique" />
-          <node concept="3uibUv" id="6PWFJfG8YmM" role="1tU5fm">
-            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
-            <node concept="3qTvmN" id="6PWFJfG908o" role="11_B2D" />
-          </node>
-        </node>
         <node concept="37vLTG" id="61G6TdB_yxS" role="3clF46">
           <property role="TrG5h" value="rulesProcessing" />
           <node concept="3uibUv" id="61G6TdB_yxT" role="1tU5fm">
@@ -19650,9 +16610,6 @@
               </node>
               <node concept="1rXfSq" id="4XsNDZYgEfw" role="33vP2m">
                 <ref role="37wK5l" node="61G6TdB_yxW" resolve="templateApplicationSession" />
-                <node concept="37vLTw" id="4XsNDZYgEfx" role="37wK5m">
-                  <ref role="3cqZAo" node="4XsNDZYbBO8" resolve="aspectClique" />
-                </node>
                 <node concept="37vLTw" id="4XsNDZYgEfy" role="37wK5m">
                   <ref role="3cqZAo" node="4XsNDZYgxYr" resolve="processingSession" />
                 </node>
@@ -20029,11 +16986,15 @@
           </node>
         </node>
         <node concept="37vLTG" id="5Qx6_65F8s$" role="3clF46">
-          <property role="TrG5h" value="cacheHolder" />
+          <property role="TrG5h" value="cachedData" />
           <node concept="3uibUv" id="1RYTbd8vkFR" role="1tU5fm">
-            <ref role="3uigEE" node="4Z$O9mrQJw7" resolve="CacheHolder" />
+            <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
           </node>
         </node>
+        <node concept="37vLTG" id="7Aoa2yVkp$5" role="3clF46">
+          <property role="TrG5h" value="fresh" />
+          <node concept="10P_77" id="7Aoa2yVkrfr" role="1tU5fm" />
+        </node>
         <node concept="3cqZAl" id="5Qx6_65F4Qr" role="3clF45" />
         <node concept="3Tmbuc" id="5Qx6_65F4Qs" role="1B3o_S" />
         <node concept="3clFbS" id="5Qx6_65F4Qt" role="3clF47">
@@ -20075,38 +17036,16 @@
               </node>
             </node>
           </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="6PWFJfG8Cr2" role="jymVt" />
-      <node concept="3clFb_" id="3OUB6BBwRT6" role="jymVt">
-        <property role="TrG5h" value="getAspectCachedData" />
-        <node concept="37vLTG" id="3OUB6BBwZY5" role="3clF46">
-          <property role="TrG5h" value="aspectClique" />
-          <node concept="3uibUv" id="3OUB6BBx5dW" role="1tU5fm">
-            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
-            <node concept="3qTvmN" id="3OUB6BBx6yb" role="11_B2D" />
-          </node>
-        </node>
-        <node concept="3uibUv" id="3OUB6BBwWKA" role="3clF45">
-          <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
-        </node>
-        <node concept="3Tmbuc" id="3OUB6BBwRT9" role="1B3o_S" />
-        <node concept="3clFbS" id="3OUB6BBwRTa" role="3clF47">
-          <node concept="3clFbF" id="3OUB6BBx7nJ" role="3cqZAp">
-            <node concept="2OqwBi" id="3OUB6BBx7nL" role="3clFbG">
-              <node concept="liA8E" id="3OUB6BBx7nP" role="2OqNvi">
-                <ref role="37wK5l" node="51a$_pPOadR" resolve="getCachedData" />
-                <node concept="2OqwBi" id="565UPcqrQBX" role="37wK5m">
-                  <node concept="37vLTw" id="3OUB6BBx7nQ" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3OUB6BBwZY5" resolve="aspectClique" />
-                  </node>
-                  <node concept="liA8E" id="565UPcqrQYt" role="2OqNvi">
-                    <ref role="37wK5l" to="pxw9:5MNibEMUCXK" resolve="uniqueKey" />
-                  </node>
+          <node concept="3clFbF" id="7Aoa2yVl44j" role="3cqZAp">
+            <node concept="37vLTI" id="7Aoa2yVl44l" role="3clFbG">
+              <node concept="2OqwBi" id="7Aoa2yVl9QN" role="37vLTJ">
+                <node concept="Xjq3P" id="7Aoa2yVlbBP" role="2Oq$k0" />
+                <node concept="2OwXpG" id="7Aoa2yVl9QQ" role="2OqNvi">
+                  <ref role="2Oxat5" node="7Aoa2yVl44f" resolve="myFresh" />
                 </node>
               </node>
-              <node concept="37vLTw" id="3OUB6BBx7nN" role="2Oq$k0">
-                <ref role="3cqZAo" node="5Qx6_65tZCJ" resolve="cacheHolder" />
+              <node concept="37vLTw" id="7Aoa2yVl44p" role="37vLTx">
+                <ref role="3cqZAo" node="7Aoa2yVkp$5" resolve="fresh" />
               </node>
             </node>
           </node>
@@ -20119,13 +17058,6 @@
         <node concept="3uibUv" id="6PWFJfG8yyx" role="3clF45">
           <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
         </node>
-        <node concept="37vLTG" id="6PWFJfG90Zx" role="3clF46">
-          <property role="TrG5h" value="aspectClique" />
-          <node concept="3uibUv" id="6PWFJfG90Zy" role="1tU5fm">
-            <ref role="3uigEE" to="pxw9:3KN3A4uUhmW" resolve="AspectClique" />
-            <node concept="3qTvmN" id="6PWFJfG90Zz" role="11_B2D" />
-          </node>
-        </node>
         <node concept="37vLTG" id="6PWFJfG8yyy" role="3clF46">
           <property role="TrG5h" value="rulesProcessing" />
           <node concept="3uibUv" id="6PWFJfG8yyz" role="1tU5fm">
@@ -20141,12 +17073,6 @@
                 <ref role="3uigEE" to="ugy2:6PWFJfG5LMK" resolve="Memo" />
               </node>
               <node concept="2OqwBi" id="7Aoa2yUlqu3" role="33vP2m">
-                <node concept="1rXfSq" id="7Aoa2yUlqu4" role="2Oq$k0">
-                  <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getAspectCachedData" />
-                  <node concept="37vLTw" id="7Aoa2yUlqu5" role="37wK5m">
-                    <ref role="3cqZAo" node="6PWFJfG90Zx" resolve="aspectClique" />
-                  </node>
-                </node>
                 <node concept="liA8E" id="7Aoa2yUlqu6" role="2OqNvi">
                   <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
                   <node concept="10M0yZ" id="7Aoa2yUlqu7" role="37wK5m">
@@ -20165,6 +17091,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="7Aoa2yV4YFO" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5Qx6_65tZCJ" resolve="cachedData" />
+                </node>
               </node>
             </node>
           </node>
@@ -20177,9 +17106,6 @@
               <node concept="2OqwBi" id="4qGA5WCY5qD" role="33vP2m">
                 <node concept="3nyPlj" id="4qGA5WCY5qE" role="2Oq$k0">
                   <ref role="37wK5l" node="61G6TdB_yxW" resolve="templateApplicationSession" />
-                  <node concept="37vLTw" id="4qGA5WCY5qF" role="37wK5m">
-                    <ref role="3cqZAo" node="6PWFJfG90Zx" resolve="aspectClique" />
-                  </node>
                   <node concept="37vLTw" id="4qGA5WCY5qG" role="37wK5m">
                     <ref role="3cqZAo" node="6PWFJfG8yyy" resolve="session" />
                   </node>
@@ -20296,12 +17222,6 @@
                 <node concept="3qTvmN" id="5vVBssDuPtQ" role="11_B2D" />
               </node>
               <node concept="2OqwBi" id="3OUB6BBbaef" role="33vP2m">
-                <node concept="1rXfSq" id="3OUB6BBxamD" role="2Oq$k0">
-                  <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getAspectCachedData" />
-                  <node concept="37vLTw" id="3OUB6BBxamE" role="37wK5m">
-                    <ref role="3cqZAo" node="3OUB6BBaXxO" resolve="aspectClique" />
-                  </node>
-                </node>
                 <node concept="liA8E" id="3OUB6BBbaeh" role="2OqNvi">
                   <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
                   <node concept="10M0yZ" id="3OUB6BBbaei" role="37wK5m">
@@ -20330,6 +17250,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="7Aoa2yV54qg" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5Qx6_65tZCJ" resolve="cachedData" />
+                </node>
               </node>
             </node>
           </node>
@@ -20341,10 +17264,7 @@
                 <ref role="3uigEE" to="ugy2:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
               </node>
               <node concept="1rXfSq" id="3OUB6BBxZvS" role="33vP2m">
-                <ref role="37wK5l" node="6PWFJfG8yyv" resolve="createMacroProcessing" />
-                <node concept="37vLTw" id="3OUB6BBxZvT" role="37wK5m">
-                  <ref role="3cqZAo" node="3OUB6BBaXxO" resolve="aspectClique" />
-                </node>
+                <ref role="37wK5l" node="6PWFJfG8yyv" resolve="templateApplicationSession" />
                 <node concept="37vLTw" id="3OUB6BBxZvU" role="37wK5m">
                   <ref role="3cqZAo" node="3OUB6BBbaed" resolve="ruleProcessingSession" />
                 </node>
@@ -20539,16 +17459,22 @@
         </node>
       </node>
       <node concept="312cEg" id="5Qx6_65tZCJ" role="jymVt">
-        <property role="TrG5h" value="cacheHolder" />
+        <property role="TrG5h" value="cachedData" />
         <node concept="3Tmbuc" id="5Qx6_65CTLR" role="1B3o_S" />
         <node concept="3uibUv" id="1RYTbd8vlgh" role="1tU5fm">
-          <ref role="3uigEE" node="4Z$O9mrQJw7" resolve="CacheHolder" />
+          <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
         </node>
       </node>
       <node concept="3Tmbuc" id="5Qx6_65E_cV" role="1B3o_S" />
       <node concept="3uibUv" id="5Qx6_65EMPn" role="1zkMxy">
         <ref role="3uigEE" node="7i3KM7gIg9K" resolve="TypecheckingStrategy.Default" />
       </node>
+      <node concept="312cEg" id="7Aoa2yVl44f" role="jymVt">
+        <property role="TrG5h" value="fresh" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3Tmbuc" id="7Aoa2yVljbZ" role="1B3o_S" />
+        <node concept="10P_77" id="7Aoa2yVl44i" role="1tU5fm" />
+      </node>
     </node>
     <node concept="2tJIrI" id="1VeWL_cPG9a" role="jymVt" />
     <node concept="312cEu" id="7i3KM7gOydS" role="jymVt">
@@ -20604,8 +17530,11 @@
             <node concept="37vLTw" id="5Qx6_65S2va" role="37wK5m">
               <ref role="3cqZAo" node="5Qx6_65ttJc" resolve="typeCollector" />
             </node>
-            <node concept="37vLTw" id="5Qx6_65S2vb" role="37wK5m">
-              <ref role="3cqZAo" node="5Qx6_65tWEQ" resolve="cacheHolder" />
+            <node concept="37vLTw" id="7Aoa2yVkwh3" role="37wK5m">
+              <ref role="3cqZAo" node="7Aoa2yVkuvB" resolve="cachedData" />
+            </node>
+            <node concept="37vLTw" id="7Aoa2yVi6DT" role="37wK5m">
+              <ref role="3cqZAo" node="5Qx6_65tWEQ" resolve="cachedData" />
             </node>
           </node>
           <node concept="3clFbF" id="6nFpYlvovYU" role="3cqZAp">
@@ -20641,12 +17570,16 @@
             <ref role="3uigEE" node="5MNibENhpkH" resolve="TypeCollector" />
           </node>
         </node>
-        <node concept="37vLTG" id="5Qx6_65tWEQ" role="3clF46">
-          <property role="TrG5h" value="cacheHolder" />
-          <node concept="3uibUv" id="1RYTbd8vj_H" role="1tU5fm">
-            <ref role="3uigEE" node="4Z$O9mrQJw7" resolve="CacheHolder" />
+        <node concept="37vLTG" id="7Aoa2yVkuvB" role="3clF46">
+          <property role="TrG5h" value="cachedData" />
+          <node concept="3uibUv" id="7Aoa2yVkvDz" role="1tU5fm">
+            <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
           </node>
         </node>
+        <node concept="37vLTG" id="5Qx6_65tWEQ" role="3clF46">
+          <property role="TrG5h" value="fresh" />
+          <node concept="10P_77" id="7Aoa2yVjXpY" role="1tU5fm" />
+        </node>
       </node>
       <node concept="2tJIrI" id="7i3KM7gP0QO" role="jymVt" />
       <node concept="3clFb_" id="6nFpYlusyqd" role="jymVt">
@@ -20683,21 +17616,6 @@
         <node concept="3Tmbuc" id="5Qx6_65qQxN" role="1B3o_S" />
         <node concept="3clFbS" id="6nFpYlusyqQ" role="3clF47">
           <node concept="3clFbH" id="7Aoa2yUkHaH" role="3cqZAp" />
-          <node concept="3cpWs8" id="6nFpYluDNzJ" role="3cqZAp">
-            <node concept="3cpWsn" id="6nFpYluDNzK" role="3cpWs9">
-              <property role="TrG5h" value="cachedSessionData" />
-              <node concept="3uibUv" id="6nFpYluDNzL" role="1tU5fm">
-                <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
-              </node>
-              <node concept="1rXfSq" id="3OUB6BBylhd" role="33vP2m">
-                <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getAspectCachedData" />
-                <node concept="37vLTw" id="3OUB6BBymvG" role="37wK5m">
-                  <ref role="3cqZAo" node="6nFpYlusyqe" resolve="aspectClique" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="3OUB6BBvIm3" role="3cqZAp" />
           <node concept="3cpWs8" id="6$F3Z5ziOoS" role="3cqZAp">
             <node concept="3cpWsn" id="6$F3Z5ziOoT" role="3cpWs9">
               <property role="TrG5h" value="rulesProcessing" />
@@ -20706,8 +17624,8 @@
                 <node concept="3qTvmN" id="5vVBssDuYXt" role="11_B2D" />
               </node>
               <node concept="2OqwBi" id="6$F3Z5ziOoU" role="33vP2m">
-                <node concept="37vLTw" id="6$F3Z5ziOoV" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6nFpYluDNzK" resolve="cachedSessionData" />
+                <node concept="37vLTw" id="7Aoa2yViDv6" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5Qx6_65tZCJ" resolve="cachedData" />
                 </node>
                 <node concept="liA8E" id="6$F3Z5ziOoW" role="2OqNvi">
                   <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
@@ -20747,12 +17665,6 @@
                 <ref role="3uigEE" to="hano:70Wv0dJhQb2" resolve="OriginIndex" />
               </node>
               <node concept="2OqwBi" id="6nFpYlvfyc_" role="33vP2m">
-                <node concept="1rXfSq" id="3OUB6BByxVo" role="2Oq$k0">
-                  <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getAspectCachedData" />
-                  <node concept="37vLTw" id="3OUB6BByxVp" role="37wK5m">
-                    <ref role="3cqZAo" node="6nFpYlusyqe" resolve="aspectClique" />
-                  </node>
-                </node>
                 <node concept="liA8E" id="6nFpYlvfycB" role="2OqNvi">
                   <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
                   <node concept="10M0yZ" id="61G6TdCq_qR" role="37wK5m">
@@ -20771,6 +17683,9 @@
                     </node>
                   </node>
                 </node>
+                <node concept="37vLTw" id="7Aoa2yV5c_Z" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5Qx6_65tZCJ" resolve="cachedData" />
+                </node>
               </node>
             </node>
           </node>
@@ -20782,8 +17697,8 @@
                 <ref role="3uigEE" to="hano:6nFpYlu02jD" resolve="UpdatesRecorder" />
               </node>
               <node concept="2OqwBi" id="6nFpYlvfHC6" role="33vP2m">
-                <node concept="37vLTw" id="6nFpYlvfHC7" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6nFpYluDNzK" resolve="cachedSessionData" />
+                <node concept="37vLTw" id="7Aoa2yViDv7" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5Qx6_65tZCJ" resolve="cachedData" />
                 </node>
                 <node concept="liA8E" id="6nFpYlvfHC8" role="2OqNvi">
                   <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
@@ -20825,10 +17740,7 @@
               </node>
               <node concept="2OqwBi" id="4VNF0fT7XT9" role="33vP2m">
                 <node concept="1rXfSq" id="3OUB6BByz2u" role="2Oq$k0">
-                  <ref role="37wK5l" node="6PWFJfG8yyv" resolve="createMacroProcessing" />
-                  <node concept="37vLTw" id="3OUB6BByz2v" role="37wK5m">
-                    <ref role="3cqZAo" node="6nFpYlusyqe" resolve="aspectClique" />
-                  </node>
+                  <ref role="37wK5l" node="6PWFJfG8yyv" resolve="templateApplicationSession" />
                   <node concept="37vLTw" id="3OUB6BByz2w" role="37wK5m">
                     <ref role="3cqZAo" node="6$F3Z5ziOoT" resolve="ruleProcessingSession" />
                   </node>
@@ -20868,15 +17780,9 @@
                 <node concept="37vLTw" id="5EDW3XEtULI" role="37wK5m">
                   <ref role="3cqZAo" node="5EDW3XEtHL1" resolve="query" />
                 </node>
-                <node concept="3clFbC" id="17DrR$T03YN" role="37wK5m">
-                  <node concept="10Nm6u" id="17DrR$T04Sd" role="3uHU7w" />
-                  <node concept="2OqwBi" id="17DrR$T02Pv" role="3uHU7B">
-                    <node concept="liA8E" id="17DrR$T03KB" role="2OqNvi">
-                      <ref role="37wK5l" node="5AFANm9Mi2l" resolve="getCache" />
-                    </node>
-                    <node concept="37vLTw" id="17DrR$T00Iy" role="2Oq$k0">
-                      <ref role="3cqZAo" node="5Qx6_65tZCJ" resolve="cacheHolder" />
-                    </node>
+                <node concept="3fqX7Q" id="qsErMwkK_u" role="37wK5m">
+                  <node concept="37vLTw" id="qsErMwkK_w" role="3fr31v">
+                    <ref role="3cqZAo" node="7Aoa2yVl44f" resolve="fresh" />
                   </node>
                 </node>
                 <node concept="3clFbT" id="55xYlrlMtWq" role="37wK5m">
@@ -24821,5 +21727,2227 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="1z4$59jbqsu">
+    <property role="TrG5h" value="MatchSNodeWrapper" />
+    <property role="3GE5qa" value="cache" />
+    <node concept="2tJIrI" id="1z4$59jbqsv" role="jymVt" />
+    <node concept="3clFbW" id="1z4$59jbqsw" role="jymVt">
+      <node concept="3cqZAl" id="1z4$59jbqsx" role="3clF45" />
+      <node concept="3Tm1VV" id="1z4$59jbqsy" role="1B3o_S" />
+      <node concept="3clFbS" id="1z4$59jbqsz" role="3clF47">
+        <node concept="3clFbJ" id="1z4$59jbqs$" role="3cqZAp">
+          <node concept="3clFbS" id="1z4$59jbqs_" role="3clFbx">
+            <node concept="YS8fn" id="1z4$59jbqsA" role="3cqZAp">
+              <node concept="2ShNRf" id="1z4$59jbqsB" role="YScLw">
+                <node concept="1pGfFk" id="1z4$59jbqsC" role="2ShVmc">
+                  <ref role="37wK5l" to="wyt6:~NullPointerException.&lt;init&gt;()" resolve="NullPointerException" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="1z4$59jbqsD" role="3clFbw">
+            <node concept="10Nm6u" id="1z4$59jbqsE" role="3uHU7w" />
+            <node concept="37vLTw" id="1z4$59jbqsF" role="3uHU7B">
+              <ref role="3cqZAo" node="1z4$59jbqsT" resolve="wrapped" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="1z4$59jbqsG" role="3cqZAp">
+          <node concept="37vLTI" id="1z4$59jbqsH" role="3clFbG">
+            <node concept="2OqwBi" id="1z4$59jbqsI" role="37vLTJ">
+              <node concept="Xjq3P" id="1z4$59jbqsJ" role="2Oq$k0" />
+              <node concept="2OwXpG" id="1z4$59jbqsK" role="2OqNvi">
+                <ref role="2Oxat5" node="1z4$59jbqtG" resolve="wrapped" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="1z4$59jbqsL" role="37vLTx">
+              <ref role="3cqZAo" node="1z4$59jbqsT" resolve="wrapped" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3FEFhOSKJFk" role="3cqZAp">
+          <node concept="37vLTI" id="3FEFhOSKJFm" role="3clFbG">
+            <node concept="2OqwBi" id="3FEFhOSKO0w" role="37vLTJ">
+              <node concept="Xjq3P" id="3FEFhOSKS4v" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3FEFhOSKO0z" role="2OqNvi">
+                <ref role="2Oxat5" node="3FEFhOSKJFg" resolve="strong" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="3FEFhOSKJFq" role="37vLTx">
+              <ref role="3cqZAo" node="3FEFhOSKovP" resolve="strong" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5Hi6MebqBVI" role="3cqZAp">
+          <node concept="37vLTI" id="5Hi6MebqBVJ" role="3clFbG">
+            <node concept="2OqwBi" id="5Hi6MebqBVK" role="37vLTJ">
+              <node concept="Xjq3P" id="5Hi6MebqBVL" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5Hi6MebqBVM" role="2OqNvi">
+                <ref role="2Oxat5" node="1z4$59jbqtC" resolve="hash" />
+              </node>
+            </node>
+            <node concept="17qRlL" id="5Hi6MebqBVN" role="37vLTx">
+              <node concept="1eOMI4" id="5Hi6MebqBVO" role="3uHU7w">
+                <node concept="3K4zz7" id="5Hi6MebqBVP" role="1eOMHV">
+                  <node concept="3cmrfG" id="5Hi6MebqBVQ" role="3K4E3e">
+                    <property role="3cmrfH" value="17" />
+                  </node>
+                  <node concept="3cmrfG" id="5Hi6MebqBVR" role="3K4GZi">
+                    <property role="3cmrfH" value="37" />
+                  </node>
+                  <node concept="37vLTw" id="5Hi6MebqBVS" role="3K4Cdx">
+                    <ref role="3cqZAo" node="3FEFhOSKovP" resolve="strong" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="5Hi6MebqTPm" role="3uHU7B">
+                <node concept="10M0yZ" id="5Hi6MebqNQ6" role="2Oq$k0">
+                  <ref role="3cqZAo" to="w1kc:~SNodeHashStrategy.WholeTreeAndIgnoreAttributes" resolve="WholeTreeAndIgnoreAttributes" />
+                  <ref role="1PxDUh" to="w1kc:~SNodeHashStrategy" resolve="SNodeHashStrategy" />
+                </node>
+                <node concept="liA8E" id="5Hi6Mebr13I" role="2OqNvi">
+                  <ref role="37wK5l" to="w1kc:~SNodeHashStrategy.hash(org.jetbrains.mps.openapi.model.SNode)" resolve="hash" />
+                  <node concept="37vLTw" id="5Hi6Mebr6V8" role="37wK5m">
+                    <ref role="3cqZAo" node="1z4$59jbqsT" resolve="wrapped" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="1z4$59jbqsT" role="3clF46">
+        <property role="TrG5h" value="wrapped" />
+        <node concept="3Tqbb2" id="1z4$59jbqsU" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3FEFhOSKovP" role="3clF46">
+        <property role="TrG5h" value="strong" />
+        <node concept="10P_77" id="3FEFhOSKuag" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1z4$59jbqsV" role="jymVt" />
+    <node concept="3clFb_" id="1z4$59jbqsW" role="jymVt">
+      <property role="TrG5h" value="equals" />
+      <node concept="3Tm1VV" id="1z4$59jbqsX" role="1B3o_S" />
+      <node concept="10P_77" id="1z4$59jbqsY" role="3clF45" />
+      <node concept="37vLTG" id="1z4$59jbqsZ" role="3clF46">
+        <property role="TrG5h" value="that" />
+        <node concept="3uibUv" id="1z4$59jbqt0" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="1z4$59jbqt1" role="3clF47">
+        <node concept="3clFbJ" id="1z4$59jbqt2" role="3cqZAp">
+          <node concept="3clFbS" id="1z4$59jbqt3" role="3clFbx">
+            <node concept="3cpWs6" id="1z4$59jbqt4" role="3cqZAp">
+              <node concept="3clFbT" id="1z4$59jbqt5" role="3cqZAk" />
+            </node>
+          </node>
+          <node concept="3clFbC" id="1z4$59jbqt6" role="3clFbw">
+            <node concept="10Nm6u" id="1z4$59jbqt7" role="3uHU7w" />
+            <node concept="37vLTw" id="1z4$59jbqt8" role="3uHU7B">
+              <ref role="3cqZAo" node="1z4$59jbqsZ" resolve="that" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="1z4$59jbqt9" role="3cqZAp">
+          <node concept="3clFbS" id="1z4$59jbqta" role="3clFbx">
+            <node concept="3cpWs6" id="1z4$59jbqtb" role="3cqZAp">
+              <node concept="3clFbT" id="1z4$59jbqtc" role="3cqZAk" />
+            </node>
+          </node>
+          <node concept="3fqX7Q" id="1z4$59jbqtd" role="3clFbw">
+            <node concept="2ZW3vV" id="1z4$59jbqte" role="3fr31v">
+              <node concept="3uibUv" id="1z4$59jbqtf" role="2ZW6by">
+                <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+              </node>
+              <node concept="37vLTw" id="1z4$59jbqtg" role="2ZW6bz">
+                <ref role="3cqZAo" node="1z4$59jbqsZ" resolve="that" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7Aoa2yUxAiB" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yUxAiC" role="3cpWs9">
+            <property role="TrG5h" value="thisWrapped" />
+            <node concept="3Tqbb2" id="7Aoa2yUxyYL" role="1tU5fm" />
+            <node concept="2OqwBi" id="7Aoa2yUxAiD" role="33vP2m">
+              <node concept="Xjq3P" id="7Aoa2yUxAiE" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7Aoa2yUxAiF" role="2OqNvi">
+                <ref role="2Oxat5" node="1z4$59jbqtG" resolve="wrapped" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7Aoa2yUxUiy" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yUxUiz" role="3cpWs9">
+            <property role="TrG5h" value="thatWrapped" />
+            <node concept="3Tqbb2" id="7Aoa2yUxQUp" role="1tU5fm" />
+            <node concept="2OqwBi" id="7Aoa2yUxUi$" role="33vP2m">
+              <node concept="1eOMI4" id="7Aoa2yUxUi_" role="2Oq$k0">
+                <node concept="10QFUN" id="7Aoa2yUxUiA" role="1eOMHV">
+                  <node concept="3uibUv" id="7Aoa2yUxUiB" role="10QFUM">
+                    <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                  </node>
+                  <node concept="37vLTw" id="7Aoa2yUxUiC" role="10QFUP">
+                    <ref role="3cqZAo" node="1z4$59jbqsZ" resolve="that" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OwXpG" id="7Aoa2yUxUiD" role="2OqNvi">
+                <ref role="2Oxat5" node="1z4$59jbqtG" resolve="wrapped" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7Aoa2yUuJjd" role="3cqZAp">
+          <node concept="1Wc70l" id="7Aoa2yUxi9U" role="3clFbG">
+            <node concept="1rXfSq" id="7Aoa2yUZWPm" role="3uHU7w">
+              <ref role="37wK5l" node="7Aoa2yUyucP" resolve="matchNodes" />
+              <node concept="37vLTw" id="7Aoa2yUyi0j" role="37wK5m">
+                <ref role="3cqZAo" node="7Aoa2yUxAiC" resolve="thisWrapped" />
+              </node>
+              <node concept="37vLTw" id="7Aoa2yUyi0k" role="37wK5m">
+                <ref role="3cqZAo" node="7Aoa2yUxUiz" resolve="thatWrapped" />
+              </node>
+            </node>
+            <node concept="3clFbC" id="7Aoa2yUxoht" role="3uHU7B">
+              <node concept="2OqwBi" id="7Aoa2yUxohu" role="3uHU7B">
+                <node concept="Xjq3P" id="7Aoa2yUxohv" role="2Oq$k0" />
+                <node concept="2OwXpG" id="7Aoa2yUxohw" role="2OqNvi">
+                  <ref role="2Oxat5" node="3FEFhOSKJFg" resolve="strong" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="7Aoa2yUxohx" role="3uHU7w">
+                <node concept="1eOMI4" id="7Aoa2yUxohy" role="2Oq$k0">
+                  <node concept="10QFUN" id="7Aoa2yUxohz" role="1eOMHV">
+                    <node concept="3uibUv" id="7Aoa2yUxoh$" role="10QFUM">
+                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="MatchSNodeWrapper" />
+                    </node>
+                    <node concept="37vLTw" id="7Aoa2yUxoh_" role="10QFUP">
+                      <ref role="3cqZAo" node="1z4$59jbqsZ" resolve="that" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2OwXpG" id="7Aoa2yUxohA" role="2OqNvi">
+                  <ref role="2Oxat5" node="3FEFhOSKJFg" resolve="strong" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="1z4$59jbqts" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yUyqmt" role="jymVt" />
+    <node concept="3clFb_" id="1z4$59jbqtu" role="jymVt">
+      <property role="TrG5h" value="hashCode" />
+      <node concept="3Tm1VV" id="1z4$59jbqtv" role="1B3o_S" />
+      <node concept="10Oyi0" id="1z4$59jbqtw" role="3clF45" />
+      <node concept="3clFbS" id="1z4$59jbqtx" role="3clF47">
+        <node concept="3clFbF" id="1z4$59jbqty" role="3cqZAp">
+          <node concept="2OqwBi" id="1z4$59jbqtz" role="3clFbG">
+            <node concept="Xjq3P" id="1z4$59jbqt$" role="2Oq$k0" />
+            <node concept="2OwXpG" id="1z4$59jbqt_" role="2OqNvi">
+              <ref role="2Oxat5" node="1z4$59jbqtC" resolve="hash" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="1z4$59jbqtA" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yUvfUY" role="jymVt" />
+    <node concept="2YIFZL" id="7Aoa2yUyucP" role="jymVt">
+      <property role="TrG5h" value="matchNodes" />
+      <node concept="3clFbS" id="7Aoa2yUyhZU" role="3clF47">
+        <node concept="3cpWs6" id="7Aoa2yUyhZV" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yUyhZW" role="3cqZAk">
+            <node concept="2ShNRf" id="7Aoa2yUyhZX" role="2Oq$k0">
+              <node concept="1pGfFk" id="7Aoa2yUyhZY" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="37wK5l" to="w1kc:~SNodeMatcher.&lt;init&gt;(jetbrains.mps.smodel.SNodeMatcher$PropertyMatchStrategy,jetbrains.mps.smodel.SNodeMatcher$AssociationMatchStrategy,jetbrains.mps.smodel.SNodeMatcher$AggregationMatchStrategy)" resolve="SNodeMatcher" />
+                <node concept="37Ijox" id="7Aoa2yUyhZZ" role="37wK5m">
+                  <ref role="37Ijqf" node="7Aoa2yUvnZ2" resolve="matchProperties" />
+                  <node concept="2FaPjH" id="7Aoa2yUyi00" role="wWaWy">
+                    <node concept="3uibUv" id="7Aoa2yUyi01" role="2FaQuo">
+                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="7Aoa2yUyi02" role="37wK5m">
+                  <node concept="1pGfFk" id="7Aoa2yUyi03" role="2ShVmc">
+                    <property role="373rjd" value="true" />
+                    <ref role="37wK5l" to="w1kc:~SNodeMatcher$IdenticalTargetNode.&lt;init&gt;()" resolve="SNodeMatcher.IdenticalTargetNode" />
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="7Aoa2yUyi04" role="37wK5m">
+                  <node concept="1pGfFk" id="7Aoa2yUyi05" role="2ShVmc">
+                    <property role="373rjd" value="true" />
+                    <ref role="37wK5l" to="w1kc:~SNodeMatcher$SameOrderChildMatch.&lt;init&gt;()" resolve="SNodeMatcher.SameOrderChildMatch" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="7Aoa2yUyi06" role="2OqNvi">
+              <ref role="37wK5l" to="w1kc:~SNodeMatcher.match(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode)" resolve="match" />
+              <node concept="37vLTw" id="7Aoa2yUyi0e" role="37wK5m">
+                <ref role="3cqZAo" node="7Aoa2yUyi09" resolve="thisWrapped" />
+              </node>
+              <node concept="37vLTw" id="7Aoa2yUyi0d" role="37wK5m">
+                <ref role="3cqZAo" node="7Aoa2yUyi0b" resolve="thatWrapped" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7Aoa2yUyi09" role="3clF46">
+        <property role="TrG5h" value="thisWrapped" />
+        <node concept="3Tqbb2" id="7Aoa2yUyi0a" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yUyi0b" role="3clF46">
+        <property role="TrG5h" value="thatWrapped" />
+        <node concept="3Tqbb2" id="7Aoa2yUyi0c" role="1tU5fm" />
+      </node>
+      <node concept="10P_77" id="7Aoa2yUyi0i" role="3clF45" />
+      <node concept="3Tm6S6" id="7Aoa2yUyi0h" role="1B3o_S" />
+      <node concept="P$JXv" id="7Aoa2yUyOKd" role="lGtFl">
+        <node concept="TZ5HA" id="7Aoa2yUyOKe" role="TZ5H$">
+          <node concept="1dT_AC" id="7Aoa2yUyOKf" role="1dT_Ay">
+            <property role="1dT_AB" value="Extracted from MatchingUtil" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1z4$59jbqtt" role="jymVt" />
+    <node concept="2YIFZL" id="7Aoa2yUvnZ2" role="jymVt">
+      <property role="TrG5h" value="matchProperties" />
+      <node concept="37vLTG" id="7Aoa2yUvnZ3" role="3clF46">
+        <property role="TrG5h" value="node1" />
+        <node concept="3uibUv" id="7Aoa2yUvnZ4" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7Aoa2yUvnZ5" role="3clF46">
+        <property role="TrG5h" value="node2" />
+        <node concept="3uibUv" id="7Aoa2yUvnZ6" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7Aoa2yUvnZ7" role="3clF46">
+        <property role="TrG5h" value="property" />
+        <node concept="3uibUv" id="7Aoa2yUvnZ8" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="7Aoa2yUvnZ9" role="3clF47">
+        <node concept="3SKdUt" id="7Aoa2yUvnZW" role="3cqZAp">
+          <node concept="1PaTwC" id="7Aoa2yUvnZX" role="1aUNEU">
+            <node concept="3oM_SD" id="7Aoa2yUvnZZ" role="1PaTwD">
+              <property role="3oM_SC" value="use" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo00" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo01" role="1PaTwD">
+              <property role="3oM_SC" value="SNode.getProperty()" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo02" role="1PaTwD">
+              <property role="3oM_SC" value="directly" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo03" role="1PaTwD">
+              <property role="3oM_SC" value="(not" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo04" role="1PaTwD">
+              <property role="3oM_SC" value="SNodeAccessUtil.getProperty())" />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="7Aoa2yUvo05" role="3cqZAp">
+          <node concept="1PaTwC" id="7Aoa2yUvo06" role="1aUNEU">
+            <node concept="3oM_SD" id="7Aoa2yUvo08" role="1PaTwD">
+              <property role="3oM_SC" value="as" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo09" role="1PaTwD">
+              <property role="3oM_SC" value="we" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0a" role="1PaTwD">
+              <property role="3oM_SC" value="are" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0b" role="1PaTwD">
+              <property role="3oM_SC" value="checking" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0c" role="1PaTwD">
+              <property role="3oM_SC" value="for" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0d" role="1PaTwD">
+              <property role="3oM_SC" value="structural" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0e" role="1PaTwD">
+              <property role="3oM_SC" value="equality." />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0f" role="1PaTwD">
+              <property role="3oM_SC" value="If" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0g" role="1PaTwD">
+              <property role="3oM_SC" value="there's" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0h" role="1PaTwD">
+              <property role="3oM_SC" value="e.g." />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0i" role="1PaTwD">
+              <property role="3oM_SC" value="a" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0j" role="1PaTwD">
+              <property role="3oM_SC" value="'derived'" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0k" role="1PaTwD">
+              <property role="3oM_SC" value="property" />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="7Aoa2yUvo0l" role="3cqZAp">
+          <node concept="1PaTwC" id="7Aoa2yUvo0m" role="1aUNEU">
+            <node concept="3oM_SD" id="7Aoa2yUvo0o" role="1PaTwD">
+              <property role="3oM_SC" value="==" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0p" role="1PaTwD">
+              <property role="3oM_SC" value="getName()" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0q" role="1PaTwD">
+              <property role="3oM_SC" value="+" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0r" role="1PaTwD">
+              <property role="3oM_SC" value="getNodeId()," />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0s" role="1PaTwD">
+              <property role="3oM_SC" value="its" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0t" role="1PaTwD">
+              <property role="3oM_SC" value="values" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0u" role="1PaTwD">
+              <property role="3oM_SC" value="from" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0v" role="1PaTwD">
+              <property role="3oM_SC" value="SNodeAccessUtil" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0w" role="1PaTwD">
+              <property role="3oM_SC" value="would" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0x" role="1PaTwD">
+              <property role="3oM_SC" value="differ" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0y" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0z" role="1PaTwD">
+              <property role="3oM_SC" value="nodes" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0$" role="1PaTwD">
+              <property role="3oM_SC" value="would" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0_" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0A" role="1PaTwD">
+              <property role="3oM_SC" value="match" />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="7Aoa2yUvo0B" role="3cqZAp">
+          <node concept="1PaTwC" id="7Aoa2yUvo0C" role="1aUNEU">
+            <node concept="3oM_SD" id="7Aoa2yUvo0E" role="1PaTwD">
+              <property role="3oM_SC" value="(assuming" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0F" role="1PaTwD">
+              <property role="3oM_SC" value="NodeId" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0G" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0H" role="1PaTwD">
+              <property role="3oM_SC" value="different" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0I" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0J" role="1PaTwD">
+              <property role="3oM_SC" value="nodes" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0K" role="1PaTwD">
+              <property role="3oM_SC" value="otherwise" />
+            </node>
+            <node concept="3oM_SD" id="7Aoa2yUvo0L" role="1PaTwD">
+              <property role="3oM_SC" value="match)." />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7Aoa2yUvnZb" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yUvnZa" role="3cpWs9">
+            <property role="TrG5h" value="stringValue1" />
+            <node concept="3uibUv" id="7Aoa2yUvnZc" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+            </node>
+            <node concept="2OqwBi" id="7Aoa2yUvxj4" role="33vP2m">
+              <node concept="37vLTw" id="7Aoa2yUvu2C" role="2Oq$k0">
+                <ref role="3cqZAo" node="7Aoa2yUvnZ3" resolve="node1" />
+              </node>
+              <node concept="liA8E" id="7Aoa2yUvxj5" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SNode.getProperty(org.jetbrains.mps.openapi.language.SProperty)" resolve="getProperty" />
+                <node concept="37vLTw" id="7Aoa2yUvxj6" role="37wK5m">
+                  <ref role="3cqZAo" node="7Aoa2yUvnZ7" resolve="property" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7Aoa2yUvnZg" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yUvnZf" role="3cpWs9">
+            <property role="TrG5h" value="stringValue2" />
+            <node concept="3uibUv" id="7Aoa2yUvnZh" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+            </node>
+            <node concept="2OqwBi" id="7Aoa2yUvzJj" role="33vP2m">
+              <node concept="37vLTw" id="7Aoa2yUvu3L" role="2Oq$k0">
+                <ref role="3cqZAo" node="7Aoa2yUvnZ5" resolve="node2" />
+              </node>
+              <node concept="liA8E" id="7Aoa2yUvzJk" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SNode.getProperty(org.jetbrains.mps.openapi.language.SProperty)" resolve="getProperty" />
+                <node concept="37vLTw" id="7Aoa2yUvzJl" role="37wK5m">
+                  <ref role="3cqZAo" node="7Aoa2yUvnZ7" resolve="property" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7Aoa2yUvnZl" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yUvnZk" role="3cpWs9">
+            <property role="TrG5h" value="propertyValue1" />
+            <node concept="3uibUv" id="7Aoa2yUvnZm" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7Aoa2yUvnZo" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yUvnZn" role="3cpWs9">
+            <property role="TrG5h" value="propertyValue2" />
+            <node concept="3uibUv" id="7Aoa2yUvnZp" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="7Aoa2yUvnZq" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yUvuzb" role="3clFbw">
+            <node concept="37vLTw" id="7Aoa2yUvu7b" role="2Oq$k0">
+              <ref role="3cqZAo" node="7Aoa2yUvnZ7" resolve="property" />
+            </node>
+            <node concept="liA8E" id="7Aoa2yUvuzc" role="2OqNvi">
+              <ref role="37wK5l" to="c17a:~SConceptFeature.isValid()" resolve="isValid" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="7Aoa2yUvnZG" role="9aQIa">
+            <node concept="3clFbS" id="7Aoa2yUvnZH" role="9aQI4">
+              <node concept="3clFbF" id="7Aoa2yUvnZI" role="3cqZAp">
+                <node concept="37vLTI" id="7Aoa2yUvnZJ" role="3clFbG">
+                  <node concept="37vLTw" id="7Aoa2yUvnZK" role="37vLTJ">
+                    <ref role="3cqZAo" node="7Aoa2yUvnZk" resolve="propertyValue1" />
+                  </node>
+                  <node concept="37vLTw" id="7Aoa2yUvnZL" role="37vLTx">
+                    <ref role="3cqZAo" node="7Aoa2yUvnZa" resolve="stringValue1" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="7Aoa2yUvnZM" role="3cqZAp">
+                <node concept="37vLTI" id="7Aoa2yUvnZN" role="3clFbG">
+                  <node concept="37vLTw" id="7Aoa2yUvnZO" role="37vLTJ">
+                    <ref role="3cqZAo" node="7Aoa2yUvnZn" resolve="propertyValue2" />
+                  </node>
+                  <node concept="37vLTw" id="7Aoa2yUvnZP" role="37vLTx">
+                    <ref role="3cqZAo" node="7Aoa2yUvnZf" resolve="stringValue2" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbS" id="7Aoa2yUvnZt" role="3clFbx">
+            <node concept="3cpWs8" id="7Aoa2yUvnZv" role="3cqZAp">
+              <node concept="3cpWsn" id="7Aoa2yUvnZu" role="3cpWs9">
+                <property role="TrG5h" value="dataType" />
+                <node concept="3uibUv" id="7Aoa2yUvnZw" role="1tU5fm">
+                  <ref role="3uigEE" to="c17a:~SDataType" resolve="SDataType" />
+                </node>
+                <node concept="2OqwBi" id="7Aoa2yUvuwR" role="33vP2m">
+                  <node concept="37vLTw" id="7Aoa2yUvu4U" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7Aoa2yUvnZ7" resolve="property" />
+                  </node>
+                  <node concept="liA8E" id="7Aoa2yUvuwS" role="2OqNvi">
+                    <ref role="37wK5l" to="c17a:~SProperty.getType()" resolve="getType" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7Aoa2yUvnZy" role="3cqZAp">
+              <node concept="37vLTI" id="7Aoa2yUvnZz" role="3clFbG">
+                <node concept="37vLTw" id="7Aoa2yUvnZ$" role="37vLTJ">
+                  <ref role="3cqZAo" node="7Aoa2yUvnZk" resolve="propertyValue1" />
+                </node>
+                <node concept="2OqwBi" id="7Aoa2yUvurp" role="37vLTx">
+                  <node concept="37vLTw" id="7Aoa2yUvu62" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7Aoa2yUvnZu" resolve="dataType" />
+                  </node>
+                  <node concept="liA8E" id="7Aoa2yUvurq" role="2OqNvi">
+                    <ref role="37wK5l" to="c17a:~SDataType.fromString(java.lang.String)" resolve="fromString" />
+                    <node concept="37vLTw" id="7Aoa2yUvurr" role="37wK5m">
+                      <ref role="3cqZAo" node="7Aoa2yUvnZa" resolve="stringValue1" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7Aoa2yUvnZB" role="3cqZAp">
+              <node concept="37vLTI" id="7Aoa2yUvnZC" role="3clFbG">
+                <node concept="37vLTw" id="7Aoa2yUvnZD" role="37vLTJ">
+                  <ref role="3cqZAo" node="7Aoa2yUvnZn" resolve="propertyValue2" />
+                </node>
+                <node concept="2OqwBi" id="7Aoa2yUvut2" role="37vLTx">
+                  <node concept="37vLTw" id="7Aoa2yUvu1v" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7Aoa2yUvnZu" resolve="dataType" />
+                  </node>
+                  <node concept="liA8E" id="7Aoa2yUvut3" role="2OqNvi">
+                    <ref role="37wK5l" to="c17a:~SDataType.fromString(java.lang.String)" resolve="fromString" />
+                    <node concept="37vLTw" id="7Aoa2yUvut4" role="37wK5m">
+                      <ref role="3cqZAo" node="7Aoa2yUvnZf" resolve="stringValue2" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="7Aoa2yUvnZQ" role="3cqZAp">
+          <node concept="2YIFZM" id="7Aoa2yUvtZM" role="3cqZAk">
+            <ref role="1Pybhc" to="33ny:~Objects" resolve="Objects" />
+            <ref role="37wK5l" to="33ny:~Objects.equals(java.lang.Object,java.lang.Object)" resolve="equals" />
+            <node concept="37vLTw" id="7Aoa2yUvtZN" role="37wK5m">
+              <ref role="3cqZAo" node="7Aoa2yUvnZk" resolve="propertyValue1" />
+            </node>
+            <node concept="37vLTw" id="7Aoa2yUvtZO" role="37wK5m">
+              <ref role="3cqZAo" node="7Aoa2yUvnZn" resolve="propertyValue2" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="7Aoa2yUvnZU" role="1B3o_S" />
+      <node concept="10P_77" id="7Aoa2yUvnZV" role="3clF45" />
+      <node concept="P$JXv" id="7Aoa2yUv$TU" role="lGtFl">
+        <node concept="TZ5HA" id="7Aoa2yUv$TV" role="TZ5H$">
+          <node concept="1dT_AC" id="7Aoa2yUv$TW" role="1dT_Ay">
+            <property role="1dT_AB" value="Copied from MatchingUtil" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1z4$59jbqtB" role="jymVt" />
+    <node concept="312cEg" id="1z4$59jbqtC" role="jymVt">
+      <property role="TrG5h" value="hash" />
+      <node concept="3Tm6S6" id="1z4$59jbqtD" role="1B3o_S" />
+      <node concept="10Oyi0" id="1z4$59jbqtE" role="1tU5fm" />
+    </node>
+    <node concept="3Tm1VV" id="7Aoa2yUZP8d" role="1B3o_S" />
+    <node concept="312cEg" id="1z4$59jbqtG" role="jymVt">
+      <property role="TrG5h" value="wrapped" />
+      <node concept="3Tm6S6" id="1z4$59jbqtH" role="1B3o_S" />
+      <node concept="3Tqbb2" id="1z4$59jbqtI" role="1tU5fm" />
+    </node>
+    <node concept="3UR2Jj" id="1z4$59jbqtJ" role="lGtFl">
+      <node concept="TZ5HA" id="1z4$59jbqtK" role="TZ5H$">
+        <node concept="1dT_AC" id="1z4$59jbqtL" role="1dT_Ay">
+          <property role="1dT_AB" value="A wrapper for SNode instances that delegates hashCode/equals methods to those defined in" />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="1z4$59jbqtM" role="TZ5H$">
+        <node concept="1dT_AC" id="1z4$59jbqtN" role="1dT_Ay">
+          <property role="1dT_AB" value="" />
+        </node>
+        <node concept="1dT_AA" id="1z4$59jbqtO" role="1dT_Ay">
+          <node concept="92FcH" id="1z4$59jbqtP" role="qph3F">
+            <node concept="TZ5HA" id="1z4$59jbqtQ" role="2XjZqd" />
+            <node concept="VXe08" id="1z4$59jbqtR" role="92FcQ">
+              <ref role="VXe09" to="ggp6:~MatchingUtil" resolve="MatchingUtil" />
+            </node>
+          </node>
+        </node>
+        <node concept="1dT_AC" id="1z4$59jbqtS" role="1dT_Ay">
+          <property role="1dT_AB" value="." />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="1z4$59jbqtT" role="TZ5H$">
+        <node concept="1dT_AC" id="1z4$59jbqtU" role="1dT_Ay">
+          <property role="1dT_AB" value="" />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="1z4$59jbqtV" role="TZ5H$">
+        <node concept="1dT_AC" id="1z4$59jbqtW" role="1dT_Ay">
+          <property role="1dT_AB" value="Instances of this class can be used as keys in hash map/set." />
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="3FEFhOSKJFg" role="jymVt">
+      <property role="TrG5h" value="strong" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="3FEFhOSKJFh" role="1B3o_S" />
+      <node concept="10P_77" id="3FEFhOSKJFj" role="1tU5fm" />
+    </node>
+  </node>
+  <node concept="312cEu" id="7Aoa2yVdSP8">
+    <property role="TrG5h" value="ReportedTypes" />
+    <node concept="2tJIrI" id="7Aoa2yVdSQ9" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVI_mh" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="allTypes" />
+      <node concept="3rvAFt" id="7Aoa2yVI_mi" role="3clF45">
+        <node concept="2sp9CU" id="7Aoa2yVI_mj" role="3rvQeY" />
+        <node concept="3Tqbb2" id="7Aoa2yVI_mk" role="3rvSg0" />
+      </node>
+      <node concept="3Tm1VV" id="7Aoa2yVI_ml" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVI_mm" role="3clF47">
+        <node concept="3clFbF" id="7Aoa2yVI_mn" role="3cqZAp">
+          <node concept="37vLTw" id="7Aoa2yVI_mo" role="3clFbG">
+            <ref role="3cqZAo" node="7Aoa2yVdVB5" resolve="typeNodes" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="7Aoa2yVI_mp" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+      </node>
+      <node concept="P$JXv" id="7Aoa2yVI_LX" role="lGtFl">
+        <node concept="TZ5HA" id="7Aoa2yVI_LY" role="TZ5H$">
+          <node concept="1dT_AC" id="7Aoa2yVI_LZ" role="1dT_Ay">
+            <property role="1dT_AB" value="Only used by tests." />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVI_mg" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVpIT7" role="jymVt">
+      <property role="TrG5h" value="getType" />
+      <node concept="37vLTG" id="7Aoa2yVpIT8" role="3clF46">
+        <property role="TrG5h" value="nodeRef" />
+        <node concept="3uibUv" id="7Aoa2yVpIT9" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="7Aoa2yVpITa" role="3clF45" />
+      <node concept="3Tm1VV" id="7Aoa2yVpITb" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVpITc" role="3clF47">
+        <node concept="3clFbF" id="7Aoa2yVpITd" role="3cqZAp">
+          <node concept="3EllGN" id="7Aoa2yVpITe" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVpITf" role="3ElVtu">
+              <ref role="3cqZAo" node="7Aoa2yVpIT8" resolve="nodeRef" />
+            </node>
+            <node concept="37vLTw" id="7Aoa2yVpITg" role="3ElQJh">
+              <ref role="3cqZAo" node="7Aoa2yVdVB5" resolve="typeNodes" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVpK57" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVe2QA" role="jymVt">
+      <property role="TrG5h" value="putType" />
+      <node concept="37vLTG" id="7Aoa2yVe2QB" role="3clF46">
+        <property role="TrG5h" value="ref" />
+        <node concept="3uibUv" id="7Aoa2yVe2QC" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVe2QD" role="3clF46">
+        <property role="TrG5h" value="type" />
+        <node concept="3Tqbb2" id="7Aoa2yVe2QE" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="7Aoa2yVe2QF" role="3clF45" />
+      <node concept="3Tm1VV" id="7Aoa2yVe3LF" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVe2QH" role="3clF47">
+        <node concept="3clFbF" id="7Aoa2yVe2QI" role="3cqZAp">
+          <node concept="37vLTI" id="7Aoa2yVe2QJ" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVe2QK" role="37vLTx">
+              <ref role="3cqZAo" node="7Aoa2yVe2QD" resolve="type" />
+            </node>
+            <node concept="3EllGN" id="7Aoa2yVe2QL" role="37vLTJ">
+              <node concept="37vLTw" id="7Aoa2yVe2QM" role="3ElVtu">
+                <ref role="3cqZAo" node="7Aoa2yVe2QB" resolve="ref" />
+              </node>
+              <node concept="37vLTw" id="7Aoa2yVe2QN" role="3ElQJh">
+                <ref role="3cqZAo" node="7Aoa2yVdVB5" resolve="typeNodes" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVe2QO" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVe2QP" role="jymVt">
+      <property role="TrG5h" value="putAllTypes" />
+      <node concept="37vLTG" id="7Aoa2yVe2QQ" role="3clF46">
+        <property role="TrG5h" value="loc2typeNode" />
+        <node concept="3rvAFt" id="7Aoa2yVe2QR" role="1tU5fm">
+          <node concept="3Tqbb2" id="7Aoa2yVe2QS" role="3rvSg0" />
+          <node concept="2sp9CU" id="7Aoa2yVe2QT" role="3rvQeY" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7Aoa2yVe2QU" role="3clF45" />
+      <node concept="3Tm1VV" id="7Aoa2yVe3VA" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVe2QW" role="3clF47">
+        <node concept="1DcWWT" id="7Aoa2yVe2QX" role="3cqZAp">
+          <node concept="3clFbS" id="7Aoa2yVe2QY" role="2LFqv$">
+            <node concept="3cpWs8" id="7Aoa2yVe2QZ" role="3cqZAp">
+              <node concept="3cpWsn" id="7Aoa2yVe2R0" role="3cpWs9">
+                <property role="TrG5h" value="typeNode" />
+                <node concept="3Tqbb2" id="7Aoa2yVe2R1" role="1tU5fm" />
+                <node concept="2OqwBi" id="7Aoa2yVe2R2" role="33vP2m">
+                  <node concept="37vLTw" id="7Aoa2yVe2R3" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7Aoa2yVe2Rl" resolve="m" />
+                  </node>
+                  <node concept="3AV6Ez" id="7Aoa2yVe2R4" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="7Aoa2yVe2R5" role="3cqZAp">
+              <node concept="3clFbS" id="7Aoa2yVe2R6" role="3clFbx">
+                <node concept="3clFbF" id="7Aoa2yVe2R7" role="3cqZAp">
+                  <node concept="1rXfSq" id="7Aoa2yVe2R8" role="3clFbG">
+                    <ref role="37wK5l" node="7Aoa2yVe2QA" resolve="putType" />
+                    <node concept="2OqwBi" id="7Aoa2yVe2R9" role="37wK5m">
+                      <node concept="37vLTw" id="7Aoa2yVe2Ra" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7Aoa2yVe2Rl" resolve="m" />
+                      </node>
+                      <node concept="3AY5_j" id="7Aoa2yVe2Rb" role="2OqNvi" />
+                    </node>
+                    <node concept="2OqwBi" id="7Aoa2yVe2Rc" role="37wK5m">
+                      <node concept="37vLTw" id="7Aoa2yVe2Rd" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7Aoa2yVe2Rl" resolve="m" />
+                      </node>
+                      <node concept="3AV6Ez" id="7Aoa2yVe2Re" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3y3z36" id="7Aoa2yVe2Rf" role="3clFbw">
+                <node concept="10Nm6u" id="7Aoa2yVe2Rg" role="3uHU7w" />
+                <node concept="37vLTw" id="7Aoa2yVe2Rh" role="3uHU7B">
+                  <ref role="3cqZAo" node="7Aoa2yVe2R0" resolve="typeNode" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="7Aoa2yVe2Ri" role="1DdaDG">
+            <node concept="37vLTw" id="7Aoa2yVe2Rj" role="2Oq$k0">
+              <ref role="3cqZAo" node="7Aoa2yVe2QQ" resolve="loc2typeNode" />
+            </node>
+            <node concept="3CFNJx" id="7Aoa2yVe2Rk" role="2OqNvi" />
+          </node>
+          <node concept="3cpWsn" id="7Aoa2yVe2Rl" role="1Duv9x">
+            <property role="TrG5h" value="m" />
+            <node concept="3f3tKP" id="7Aoa2yVe2Rm" role="1tU5fm">
+              <node concept="3Tqbb2" id="7Aoa2yVe2Rn" role="3f3$T$" />
+              <node concept="2sp9CU" id="7Aoa2yVe2Ro" role="3f3zw5" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVe2Q_" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVe00r" role="jymVt">
+      <property role="TrG5h" value="dropInvalidated" />
+      <node concept="37vLTG" id="7Aoa2yVe00s" role="3clF46">
+        <property role="TrG5h" value="origins" />
+        <node concept="3vKaQO" id="7Aoa2yVe00t" role="1tU5fm">
+          <node concept="3Tqbb2" id="7Aoa2yVe00u" role="3O5elw" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7Aoa2yVe00v" role="3clF45" />
+      <node concept="3Tm1VV" id="7Aoa2yVe0BO" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVe00x" role="3clF47">
+        <node concept="3clFbJ" id="7Aoa2yVe00y" role="3cqZAp">
+          <node concept="3clFbS" id="7Aoa2yVe00z" role="3clFbx">
+            <node concept="1DcWWT" id="7Aoa2yVe00$" role="3cqZAp">
+              <node concept="3clFbS" id="7Aoa2yVe00_" role="2LFqv$">
+                <node concept="3clFbF" id="7Aoa2yVe00A" role="3cqZAp">
+                  <node concept="2OqwBi" id="7Aoa2yVe00B" role="3clFbG">
+                    <node concept="37vLTw" id="7Aoa2yVe00C" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7Aoa2yVdVB5" resolve="typeNodes" />
+                    </node>
+                    <node concept="kI3uX" id="7Aoa2yVe00D" role="2OqNvi">
+                      <node concept="2OqwBi" id="7Aoa2yVe00E" role="kIiFs">
+                        <node concept="liA8E" id="7Aoa2yVe00F" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                        </node>
+                        <node concept="2JrnkZ" id="7Aoa2yVe00G" role="2Oq$k0">
+                          <node concept="37vLTw" id="7Aoa2yVe00H" role="2JrQYb">
+                            <ref role="3cqZAo" node="7Aoa2yVe00I" resolve="org" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWsn" id="7Aoa2yVe00I" role="1Duv9x">
+                <property role="TrG5h" value="org" />
+                <node concept="3Tqbb2" id="7Aoa2yVe00J" role="1tU5fm" />
+              </node>
+              <node concept="37vLTw" id="7Aoa2yVe00K" role="1DdaDG">
+                <ref role="3cqZAo" node="7Aoa2yVe00s" resolve="origins" />
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="7Aoa2yVe00L" role="3clFbw">
+            <node concept="10Nm6u" id="7Aoa2yVe00M" role="3uHU7w" />
+            <node concept="37vLTw" id="7Aoa2yVe00N" role="3uHU7B">
+              <ref role="3cqZAo" node="7Aoa2yVe00s" resolve="origins" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVe00O" role="jymVt" />
+    <node concept="2tJIrI" id="7Aoa2yVdVCm" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVdVDc" role="jymVt">
+      <property role="TrG5h" value="clear" />
+      <node concept="3cqZAl" id="7Aoa2yVdVDe" role="3clF45" />
+      <node concept="3Tm1VV" id="7Aoa2yVdVDf" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVdVDg" role="3clF47">
+        <node concept="3clFbF" id="7Aoa2yVdVGl" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVdWzz" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVdVGk" role="2Oq$k0">
+              <ref role="3cqZAo" node="7Aoa2yVdVB5" resolve="typeNodes" />
+            </node>
+            <node concept="1yHZxX" id="7Aoa2yVdXJ1" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVdSQa" role="jymVt" />
+    <node concept="312cEg" id="7Aoa2yVdVB5" role="jymVt">
+      <property role="TrG5h" value="typeNodes" />
+      <node concept="3Tm6S6" id="7Aoa2yVdVB6" role="1B3o_S" />
+      <node concept="3rvAFt" id="7Aoa2yVdVB7" role="1tU5fm">
+        <node concept="2sp9CU" id="7Aoa2yVdVB8" role="3rvQeY" />
+        <node concept="3Tqbb2" id="7Aoa2yVdVB9" role="3rvSg0" />
+      </node>
+      <node concept="2ShNRf" id="7Aoa2yVdVBa" role="33vP2m">
+        <node concept="3rGOSV" id="7Aoa2yVdVBb" role="2ShVmc">
+          <node concept="2sp9CU" id="7Aoa2yVdVBc" role="3rHrn6" />
+          <node concept="3Tqbb2" id="7Aoa2yVdVBd" role="3rHtpV" />
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="7Aoa2yVdSP9" role="1B3o_S" />
+  </node>
+  <node concept="312cEu" id="7Aoa2yVfU_u">
+    <property role="TrG5h" value="ReportedItems" />
+    <node concept="2tJIrI" id="7Aoa2yVfZf6" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVl_uk" role="jymVt">
+      <property role="TrG5h" value="allReportItems" />
+      <node concept="3Tm1VV" id="7Aoa2yVl_ul" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVl_um" role="3clF47">
+        <node concept="3cpWs8" id="7Aoa2yVl_un" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVl_uo" role="3cpWs9">
+            <property role="TrG5h" value="list" />
+            <node concept="_YKpA" id="7Aoa2yVl_up" role="1tU5fm">
+              <node concept="3uibUv" id="7Aoa2yVl_uq" role="_ZDj9">
+                <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="7Aoa2yVl_ur" role="33vP2m">
+              <node concept="Tc6Ow" id="7Aoa2yVl_us" role="2ShVmc">
+                <node concept="3uibUv" id="7Aoa2yVl_ut" role="HW$YZ">
+                  <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7Aoa2yVl_uu" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVl_uv" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVl_uw" role="2Oq$k0">
+              <ref role="3cqZAo" node="7Aoa2yVl_uo" resolve="list" />
+            </node>
+            <node concept="X8dFx" id="7Aoa2yVl_ux" role="2OqNvi">
+              <node concept="37vLTw" id="7Aoa2yVl_uy" role="25WWJ7">
+                <ref role="3cqZAo" node="7Aoa2yVfZff" resolve="feedbackReportItems" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7Aoa2yVl_uz" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVl_u$" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVl_u_" role="2Oq$k0">
+              <ref role="3cqZAo" node="7Aoa2yVl_uo" resolve="list" />
+            </node>
+            <node concept="X8dFx" id="7Aoa2yVl_uA" role="2OqNvi">
+              <node concept="37vLTw" id="7Aoa2yVl_uB" role="25WWJ7">
+                <ref role="3cqZAo" node="7Aoa2yVfZf8" resolve="auxReportItems" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7Aoa2yVl_uC" role="3cqZAp">
+          <node concept="37vLTw" id="7Aoa2yVl_uD" role="3clFbG">
+            <ref role="3cqZAo" node="7Aoa2yVl_uo" resolve="list" />
+          </node>
+        </node>
+      </node>
+      <node concept="3vKaQO" id="7Aoa2yVl_uE" role="3clF45">
+        <node concept="3uibUv" id="7Aoa2yVl_uF" role="3O5elw">
+          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVltoJ" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVg8Dv" role="jymVt">
+      <property role="TrG5h" value="addReportItems" />
+      <node concept="3Tm1VV" id="7Aoa2yVlBo1" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVg8Dx" role="3clF47">
+        <node concept="1DcWWT" id="7Aoa2yVg8Dy" role="3cqZAp">
+          <node concept="3clFbS" id="7Aoa2yVg8Dz" role="2LFqv$">
+            <node concept="3clFbF" id="7Aoa2yVg8D$" role="3cqZAp">
+              <node concept="1rXfSq" id="7Aoa2yVg8D_" role="3clFbG">
+                <ref role="37wK5l" node="7Aoa2yVg8DK" />
+                <node concept="37vLTw" id="7Aoa2yVg8DA" role="37wK5m">
+                  <ref role="3cqZAo" node="7Aoa2yVg8DB" resolve="it" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="7Aoa2yVg8DB" role="1Duv9x">
+            <property role="TrG5h" value="it" />
+            <node concept="3uibUv" id="7Aoa2yVg8DC" role="1tU5fm">
+              <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+            </node>
+          </node>
+          <node concept="37vLTw" id="7Aoa2yVg8DD" role="1DdaDG">
+            <ref role="3cqZAo" node="7Aoa2yVg8DF" resolve="items" />
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7Aoa2yVg8DE" role="3clF45" />
+      <node concept="37vLTG" id="7Aoa2yVg8DF" role="3clF46">
+        <property role="TrG5h" value="items" />
+        <node concept="A3Dl8" id="7Aoa2yVg8DG" role="1tU5fm">
+          <node concept="3qUE_q" id="7Aoa2yVg8DH" role="A3Ik2">
+            <node concept="3uibUv" id="7Aoa2yVg8DI" role="3qUE_r">
+              <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVg8DJ" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVg8DK" role="jymVt">
+      <property role="TrG5h" value="addReportItem" />
+      <node concept="3Tm1VV" id="7Aoa2yVlBOU" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVg8DM" role="3clF47">
+        <node concept="3clFbJ" id="7Aoa2yVg8DN" role="3cqZAp">
+          <node concept="3clFbS" id="7Aoa2yVg8DO" role="3clFbx">
+            <node concept="3cpWs8" id="7Aoa2yVg8DP" role="3cqZAp">
+              <node concept="3cpWsn" id="7Aoa2yVg8DQ" role="3cpWs9">
+                <property role="TrG5h" value="fbReportItem" />
+                <node concept="3uibUv" id="7Aoa2yVg8DR" role="1tU5fm">
+                  <ref role="3uigEE" to="hano:1FOQehwovmW" resolve="FeedbackReportItem" />
+                </node>
+                <node concept="1eOMI4" id="7Aoa2yVg8DS" role="33vP2m">
+                  <node concept="10QFUN" id="7Aoa2yVg8DT" role="1eOMHV">
+                    <node concept="3uibUv" id="7Aoa2yVg8DU" role="10QFUM">
+                      <ref role="3uigEE" to="hano:1FOQehwovmW" resolve="FeedbackReportItem" />
+                    </node>
+                    <node concept="37vLTw" id="7Aoa2yVg8DV" role="10QFUP">
+                      <ref role="3cqZAo" node="7Aoa2yVg8Ed" resolve="reportItem" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7Aoa2yVg8DW" role="3cqZAp">
+              <node concept="2OqwBi" id="7Aoa2yVg8DX" role="3clFbG">
+                <node concept="37vLTw" id="7Aoa2yVg8DY" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7Aoa2yVfZff" resolve="feedbackReportItems" />
+                </node>
+                <node concept="TSZUe" id="7Aoa2yVg8DZ" role="2OqNvi">
+                  <node concept="37vLTw" id="7Aoa2yVg8E0" role="25WWJ7">
+                    <ref role="3cqZAo" node="7Aoa2yVg8DQ" resolve="fbReportItem" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="7Aoa2yVg8E1" role="3cqZAp" />
+          </node>
+          <node concept="2ZW3vV" id="7Aoa2yVg8E2" role="3clFbw">
+            <node concept="3uibUv" id="7Aoa2yVg8E3" role="2ZW6by">
+              <ref role="3uigEE" to="hano:1FOQehwovmW" resolve="FeedbackReportItem" />
+            </node>
+            <node concept="37vLTw" id="7Aoa2yVg8E4" role="2ZW6bz">
+              <ref role="3cqZAo" node="7Aoa2yVg8Ed" resolve="reportItem" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="7Aoa2yVg8E5" role="9aQIa">
+            <node concept="3clFbS" id="7Aoa2yVg8E6" role="9aQI4">
+              <node concept="3clFbF" id="7Aoa2yVg8E7" role="3cqZAp">
+                <node concept="2OqwBi" id="7Aoa2yVg8E8" role="3clFbG">
+                  <node concept="37vLTw" id="7Aoa2yVg8E9" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7Aoa2yVfZf8" resolve="auxReportItems" />
+                  </node>
+                  <node concept="TSZUe" id="7Aoa2yVg8Ea" role="2OqNvi">
+                    <node concept="37vLTw" id="7Aoa2yVg8Eb" role="25WWJ7">
+                      <ref role="3cqZAo" node="7Aoa2yVg8Ed" resolve="reportItem" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7Aoa2yVg8Ec" role="3clF45" />
+      <node concept="37vLTG" id="7Aoa2yVg8Ed" role="3clF46">
+        <property role="TrG5h" value="reportItem" />
+        <node concept="3uibUv" id="7Aoa2yVg8Ee" role="1tU5fm">
+          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVg385" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVg38k" role="jymVt">
+      <property role="TrG5h" value="changedBasis" />
+      <node concept="37vLTG" id="7Aoa2yVg38l" role="3clF46">
+        <property role="TrG5h" value="invalidatedBasis" />
+        <node concept="3vKaQO" id="7Aoa2yVg38m" role="1tU5fm">
+          <node concept="3uibUv" id="7Aoa2yVg38n" role="3O5elw">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVg38o" role="3clF46">
+        <property role="TrG5h" value="validatedBasis" />
+        <node concept="3vKaQO" id="7Aoa2yVg38p" role="1tU5fm">
+          <node concept="3uibUv" id="7Aoa2yVg38q" role="3O5elw">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7Aoa2yVg38r" role="3clF45" />
+      <node concept="3Tm1VV" id="7Aoa2yVg3Gv" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVg38t" role="3clF47">
+        <node concept="3cpWs8" id="7Aoa2yVg38u" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVg38v" role="3cpWs9">
+            <property role="TrG5h" value="invalidatedSet" />
+            <node concept="2hMVRd" id="7Aoa2yVg38w" role="1tU5fm">
+              <node concept="3uibUv" id="7Aoa2yVg38x" role="2hN53Y">
+                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="7Aoa2yVg38y" role="33vP2m">
+              <node concept="2i4dXS" id="7Aoa2yVg38z" role="2ShVmc">
+                <node concept="3uibUv" id="7Aoa2yVg38$" role="HW$YZ">
+                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                </node>
+                <node concept="37vLTw" id="7Aoa2yVg38_" role="I$8f6">
+                  <ref role="3cqZAo" node="7Aoa2yVg38l" resolve="invalidatedBasis" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7Aoa2yVg38A" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVg38B" role="3cpWs9">
+            <property role="TrG5h" value="validatedSet" />
+            <node concept="2hMVRd" id="7Aoa2yVg38C" role="1tU5fm">
+              <node concept="3uibUv" id="7Aoa2yVg38D" role="2hN53Y">
+                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="7Aoa2yVg38E" role="33vP2m">
+              <node concept="2i4dXS" id="7Aoa2yVg38F" role="2ShVmc">
+                <node concept="3uibUv" id="7Aoa2yVg38G" role="HW$YZ">
+                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                </node>
+                <node concept="37vLTw" id="7Aoa2yVg38H" role="I$8f6">
+                  <ref role="3cqZAo" node="7Aoa2yVg38o" resolve="validatedBasis" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7Aoa2yVg38I" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVg38J" role="3cpWs9">
+            <property role="TrG5h" value="itr" />
+            <node concept="2YL$Hu" id="7Aoa2yVg38K" role="1tU5fm">
+              <node concept="3uibUv" id="7Aoa2yVg38L" role="uOL27">
+                <ref role="3uigEE" to="hano:1FOQehwovmW" resolve="FeedbackReportItem" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7Aoa2yVg38M" role="33vP2m">
+              <node concept="37vLTw" id="7Aoa2yVg38N" role="2Oq$k0">
+                <ref role="3cqZAo" node="7Aoa2yVfZff" resolve="feedbackReportItems" />
+              </node>
+              <node concept="uNJiE" id="7Aoa2yVg38O" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="2$JKZl" id="7Aoa2yVg38P" role="3cqZAp">
+          <node concept="3clFbS" id="7Aoa2yVg38Q" role="2LFqv$">
+            <node concept="3cpWs8" id="7Aoa2yVg38R" role="3cqZAp">
+              <node concept="3cpWsn" id="7Aoa2yVg38S" role="3cpWs9">
+                <property role="TrG5h" value="item" />
+                <node concept="3uibUv" id="7Aoa2yVg38T" role="1tU5fm">
+                  <ref role="3uigEE" to="hano:1FOQehwovmW" resolve="FeedbackReportItem" />
+                </node>
+                <node concept="2OqwBi" id="7Aoa2yVg38U" role="33vP2m">
+                  <node concept="37vLTw" id="7Aoa2yVg38V" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7Aoa2yVg38J" resolve="itr" />
+                  </node>
+                  <node concept="v1n4t" id="7Aoa2yVg38W" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="7Aoa2yVg38X" role="3cqZAp">
+              <node concept="3clFbS" id="7Aoa2yVg38Y" role="3clFbx">
+                <node concept="3clFbF" id="7Aoa2yVg38Z" role="3cqZAp">
+                  <node concept="2OqwBi" id="7Aoa2yVg390" role="3clFbG">
+                    <node concept="37vLTw" id="7Aoa2yVg391" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7Aoa2yVg38J" resolve="itr" />
+                    </node>
+                    <node concept="2YMH90" id="7Aoa2yVg392" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="3clFbH" id="7Aoa2yVg393" role="3cqZAp" />
+              </node>
+              <node concept="2OqwBi" id="7Aoa2yVg394" role="3clFbw">
+                <node concept="1eOMI4" id="7Aoa2yVg395" role="2Oq$k0">
+                  <node concept="2OqwBi" id="7Aoa2yVg396" role="1eOMHV">
+                    <node concept="37vLTw" id="7Aoa2yVg397" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7Aoa2yVg38S" resolve="item" />
+                    </node>
+                    <node concept="liA8E" id="7Aoa2yVg398" role="2OqNvi">
+                      <ref role="37wK5l" to="hano:55xYlrlZupy" resolve="getFeedbackBasis" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2HwmR7" id="7Aoa2yVg399" role="2OqNvi">
+                  <node concept="1bVj0M" id="7Aoa2yVg39a" role="23t8la">
+                    <node concept="3clFbS" id="7Aoa2yVg39b" role="1bW5cS">
+                      <node concept="3clFbF" id="7Aoa2yVg39c" role="3cqZAp">
+                        <node concept="2OqwBi" id="7Aoa2yVg39d" role="3clFbG">
+                          <node concept="37vLTw" id="7Aoa2yVg39e" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7Aoa2yVg38v" resolve="invalidatedSet" />
+                          </node>
+                          <node concept="3JPx81" id="7Aoa2yVg39f" role="2OqNvi">
+                            <node concept="37vLTw" id="7Aoa2yVg39g" role="25WWJ7">
+                              <ref role="3cqZAo" node="7Aoa2yVg39h" resolve="it" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="gl6BB" id="7Aoa2yVg39h" role="1bW2Oz">
+                      <property role="TrG5h" value="it" />
+                      <node concept="2jxLKc" id="7Aoa2yVg39i" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3eNFk2" id="7Aoa2yVg39j" role="3eNLev">
+                <node concept="3clFbS" id="7Aoa2yVg39k" role="3eOfB_">
+                  <node concept="3clFbF" id="7Aoa2yVg39l" role="3cqZAp">
+                    <node concept="2OqwBi" id="7Aoa2yVg39m" role="3clFbG">
+                      <node concept="37vLTw" id="7Aoa2yVg39n" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7Aoa2yVg38J" resolve="itr" />
+                      </node>
+                      <node concept="2YMH90" id="7Aoa2yVg39o" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="7Aoa2yVg39p" role="3eO9$A">
+                  <node concept="1eOMI4" id="7Aoa2yVg39q" role="2Oq$k0">
+                    <node concept="2OqwBi" id="7Aoa2yVg39r" role="1eOMHV">
+                      <node concept="37vLTw" id="7Aoa2yVg39s" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7Aoa2yVg38S" resolve="item" />
+                      </node>
+                      <node concept="liA8E" id="7Aoa2yVg39t" role="2OqNvi">
+                        <ref role="37wK5l" to="hano:55xYlrlZupy" resolve="getFeedbackBasis" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2HxqBE" id="7Aoa2yVg39u" role="2OqNvi">
+                    <node concept="1bVj0M" id="7Aoa2yVg39v" role="23t8la">
+                      <node concept="3clFbS" id="7Aoa2yVg39w" role="1bW5cS">
+                        <node concept="3clFbF" id="7Aoa2yVg39x" role="3cqZAp">
+                          <node concept="2OqwBi" id="7Aoa2yVg39y" role="3clFbG">
+                            <node concept="37vLTw" id="7Aoa2yVg39z" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7Aoa2yVg38B" resolve="validatedSet" />
+                            </node>
+                            <node concept="3JPx81" id="7Aoa2yVg39$" role="2OqNvi">
+                              <node concept="37vLTw" id="7Aoa2yVg39_" role="25WWJ7">
+                                <ref role="3cqZAo" node="7Aoa2yVg39A" resolve="it" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="gl6BB" id="7Aoa2yVg39A" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="7Aoa2yVg39B" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="7Aoa2yVg39C" role="2$JKZa">
+            <node concept="37vLTw" id="7Aoa2yVg39D" role="2Oq$k0">
+              <ref role="3cqZAo" node="7Aoa2yVg38J" resolve="itr" />
+            </node>
+            <node concept="v0PNk" id="7Aoa2yVg39E" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVg386" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVQVr5" role="jymVt">
+      <property role="TrG5h" value="clear" />
+      <node concept="3cqZAl" id="7Aoa2yVQVr7" role="3clF45" />
+      <node concept="3Tm1VV" id="7Aoa2yVQVr8" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVQVr9" role="3clF47">
+        <node concept="3clFbF" id="7Aoa2yVQYid" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVR1rC" role="3clFbG">
+            <node concept="2OqwBi" id="7Aoa2yVQYYq" role="2Oq$k0">
+              <node concept="Xjq3P" id="7Aoa2yVQYic" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7Aoa2yVQZFW" role="2OqNvi">
+                <ref role="2Oxat5" node="7Aoa2yVfZff" resolve="feedbackReportItems" />
+              </node>
+            </node>
+            <node concept="2Kehj3" id="7Aoa2yVR3uN" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="7Aoa2yVR44D" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVR6DE" role="3clFbG">
+            <node concept="2OqwBi" id="7Aoa2yVR4nQ" role="2Oq$k0">
+              <node concept="Xjq3P" id="7Aoa2yVR44B" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7Aoa2yVR4Vn" role="2OqNvi">
+                <ref role="2Oxat5" node="7Aoa2yVfZf8" resolve="auxReportItems" />
+              </node>
+            </node>
+            <node concept="2Kehj3" id="7Aoa2yVR9VT" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVQUXJ" role="jymVt" />
+    <node concept="312cEg" id="7Aoa2yVfZf8" role="jymVt">
+      <property role="TrG5h" value="auxReportItems" />
+      <node concept="3Tm6S6" id="7Aoa2yVfZf9" role="1B3o_S" />
+      <node concept="_YKpA" id="7Aoa2yVfZfa" role="1tU5fm">
+        <node concept="3uibUv" id="7Aoa2yVfZfb" role="_ZDj9">
+          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="7Aoa2yVfZfc" role="33vP2m">
+        <node concept="Tc6Ow" id="7Aoa2yVfZfd" role="2ShVmc">
+          <node concept="3uibUv" id="7Aoa2yVfZfe" role="HW$YZ">
+            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="7Aoa2yVfZff" role="jymVt">
+      <property role="TrG5h" value="feedbackReportItems" />
+      <node concept="3Tm6S6" id="7Aoa2yVfZfg" role="1B3o_S" />
+      <node concept="_YKpA" id="7Aoa2yVfZfh" role="1tU5fm">
+        <node concept="3uibUv" id="7Aoa2yVfZfi" role="_ZDj9">
+          <ref role="3uigEE" to="hano:1FOQehwovmW" resolve="FeedbackReportItem" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="7Aoa2yVfZfj" role="33vP2m">
+        <node concept="Tc6Ow" id="7Aoa2yVfZfk" role="2ShVmc">
+          <node concept="3uibUv" id="7Aoa2yVfZfl" role="HW$YZ">
+            <ref role="3uigEE" to="hano:1FOQehwovmW" resolve="FeedbackReportItem" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVfZf7" role="jymVt" />
+    <node concept="3Tm1VV" id="7Aoa2yVfU_v" role="1B3o_S" />
+  </node>
+  <node concept="312cEu" id="7Aoa2yVt0Sb">
+    <property role="TrG5h" value="ConversionInfo" />
+    <node concept="2tJIrI" id="7Aoa2yVtFg_" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVtzdU" role="jymVt">
+      <property role="TrG5h" value="convertsTo" />
+      <node concept="37vLTG" id="7Aoa2yVtzdV" role="3clF46">
+        <property role="TrG5h" value="source" />
+        <node concept="3Tqbb2" id="7Aoa2yVtzdW" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVtzdX" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="3Tqbb2" id="7Aoa2yVtzdY" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVtzdZ" role="3clF46">
+        <property role="TrG5h" value="strong" />
+        <node concept="10P_77" id="7Aoa2yVtze0" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="7Aoa2yVtze1" role="3clF45">
+        <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+      </node>
+      <node concept="3Tm1VV" id="7Aoa2yVtze2" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVtze3" role="3clF47">
+        <node concept="3cpWs8" id="7Aoa2yVtze4" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVtze5" role="3cpWs9">
+            <property role="TrG5h" value="map" />
+            <node concept="3uibUv" id="7Aoa2yVtze6" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+              <node concept="3uibUv" id="7Aoa2yVtze7" role="11_B2D">
+                <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+              </node>
+              <node concept="3uibUv" id="7Aoa2yVtze8" role="11_B2D">
+                <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7Aoa2yVtze9" role="33vP2m">
+              <node concept="37vLTw" id="7Aoa2yVtzea" role="2Oq$k0">
+                <ref role="3cqZAo" node="7Aoa2yVt33a" resolve="convertsToCache" />
+              </node>
+              <node concept="liA8E" id="7Aoa2yVtzeb" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
+                <node concept="2ShNRf" id="7Aoa2yVtzec" role="37wK5m">
+                  <node concept="1pGfFk" id="7Aoa2yVtzed" role="2ShVmc">
+                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    <node concept="37vLTw" id="7Aoa2yVtzee" role="37wK5m">
+                      <ref role="3cqZAo" node="7Aoa2yVtzdV" resolve="source" />
+                    </node>
+                    <node concept="37vLTw" id="7Aoa2yVtzef" role="37wK5m">
+                      <ref role="3cqZAo" node="7Aoa2yVtzdZ" resolve="strong" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="7Aoa2yVtzeg" role="3cqZAp">
+          <node concept="3clFbS" id="7Aoa2yVtzeh" role="3clFbx">
+            <node concept="3cpWs6" id="7Aoa2yVtzei" role="3cqZAp">
+              <node concept="10Nm6u" id="7Aoa2yVtzej" role="3cqZAk" />
+            </node>
+          </node>
+          <node concept="3clFbC" id="7Aoa2yVtzek" role="3clFbw">
+            <node concept="10Nm6u" id="7Aoa2yVtzel" role="3uHU7w" />
+            <node concept="37vLTw" id="7Aoa2yVtzem" role="3uHU7B">
+              <ref role="3cqZAo" node="7Aoa2yVtze5" resolve="map" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7Aoa2yVtzen" role="3cqZAp" />
+        <node concept="3clFbF" id="7Aoa2yVtzeo" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVtzep" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVtzeq" role="2Oq$k0">
+              <ref role="3cqZAo" node="7Aoa2yVtze5" resolve="map" />
+            </node>
+            <node concept="liA8E" id="7Aoa2yVtzer" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
+              <node concept="2ShNRf" id="7Aoa2yVtzes" role="37wK5m">
+                <node concept="1pGfFk" id="7Aoa2yVtzet" role="2ShVmc">
+                  <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                  <node concept="37vLTw" id="7Aoa2yVtzeu" role="37wK5m">
+                    <ref role="3cqZAo" node="7Aoa2yVtzdX" resolve="target" />
+                  </node>
+                  <node concept="37vLTw" id="7Aoa2yVtzev" role="37wK5m">
+                    <ref role="3cqZAo" node="7Aoa2yVtzdZ" resolve="strong" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVtzew" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVtzex" role="jymVt">
+      <property role="TrG5h" value="coerceToConcept" />
+      <node concept="37vLTG" id="7Aoa2yVtzey" role="3clF46">
+        <property role="TrG5h" value="source" />
+        <node concept="3Tqbb2" id="7Aoa2yVtzez" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVtze$" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="3bZ5Sz" id="7Aoa2yVtze_" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVtzeA" role="3clF46">
+        <property role="TrG5h" value="strong" />
+        <node concept="10P_77" id="7Aoa2yVtzeB" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="7Aoa2yVtzeC" role="3clF45">
+        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+        <node concept="3uibUv" id="7Aoa2yVtzeD" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+        </node>
+        <node concept="3Tqbb2" id="7Aoa2yVtzeE" role="11_B2D" />
+      </node>
+      <node concept="3Tm1VV" id="7Aoa2yVtzeF" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVtzeG" role="3clF47">
+        <node concept="3cpWs8" id="7Aoa2yVtzeH" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVtzeI" role="3cpWs9">
+            <property role="TrG5h" value="map" />
+            <node concept="3uibUv" id="7Aoa2yVtzeJ" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+              <node concept="3bZ5Sz" id="7Aoa2yVtzeK" role="11_B2D" />
+              <node concept="3uibUv" id="7Aoa2yVtzeL" role="11_B2D">
+                <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+                <node concept="3uibUv" id="7Aoa2yVtzeM" role="11_B2D">
+                  <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+                </node>
+                <node concept="3Tqbb2" id="7Aoa2yVtzeN" role="11_B2D" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7Aoa2yVtzeO" role="33vP2m">
+              <node concept="37vLTw" id="7Aoa2yVtzeP" role="2Oq$k0">
+                <ref role="3cqZAo" node="7Aoa2yVt33n" resolve="coerceToConceptCache" />
+              </node>
+              <node concept="liA8E" id="7Aoa2yVtzeQ" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
+                <node concept="2ShNRf" id="7Aoa2yVtzeR" role="37wK5m">
+                  <node concept="1pGfFk" id="7Aoa2yVtzeS" role="2ShVmc">
+                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    <node concept="37vLTw" id="7Aoa2yVtzeT" role="37wK5m">
+                      <ref role="3cqZAo" node="7Aoa2yVtzey" resolve="source" />
+                    </node>
+                    <node concept="37vLTw" id="7Aoa2yVtzeU" role="37wK5m">
+                      <ref role="3cqZAo" node="7Aoa2yVtzeA" resolve="strong" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="7Aoa2yVtzeV" role="3cqZAp">
+          <node concept="3clFbS" id="7Aoa2yVtzeW" role="3clFbx">
+            <node concept="3cpWs6" id="7Aoa2yVtzeX" role="3cqZAp">
+              <node concept="10Nm6u" id="7Aoa2yVtzeY" role="3cqZAk" />
+            </node>
+          </node>
+          <node concept="3clFbC" id="7Aoa2yVtzeZ" role="3clFbw">
+            <node concept="10Nm6u" id="7Aoa2yVtzf0" role="3uHU7w" />
+            <node concept="37vLTw" id="7Aoa2yVtzf1" role="3uHU7B">
+              <ref role="3cqZAo" node="7Aoa2yVtzeI" resolve="map" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7Aoa2yVtzf2" role="3cqZAp" />
+        <node concept="3clFbF" id="7Aoa2yVtzf3" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVtzf4" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVtzf5" role="2Oq$k0">
+              <ref role="3cqZAo" node="7Aoa2yVtzeI" resolve="map" />
+            </node>
+            <node concept="liA8E" id="7Aoa2yVtzf6" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
+              <node concept="37vLTw" id="7Aoa2yVtzf7" role="37wK5m">
+                <ref role="3cqZAo" node="7Aoa2yVtze$" resolve="target" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVtzf8" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVtzf9" role="jymVt">
+      <property role="TrG5h" value="coerceTo" />
+      <node concept="37vLTG" id="7Aoa2yVtzfa" role="3clF46">
+        <property role="TrG5h" value="source" />
+        <node concept="3Tqbb2" id="7Aoa2yVtzfb" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVtzfc" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="3Tqbb2" id="7Aoa2yVtzfd" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVtzfe" role="3clF46">
+        <property role="TrG5h" value="strong" />
+        <node concept="10P_77" id="7Aoa2yVtzff" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="7Aoa2yVtzfg" role="3clF45">
+        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+        <node concept="3uibUv" id="7Aoa2yVtzfh" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+        </node>
+        <node concept="3Tqbb2" id="7Aoa2yVtzfi" role="11_B2D" />
+      </node>
+      <node concept="3Tm1VV" id="7Aoa2yVtzfj" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVtzfk" role="3clF47">
+        <node concept="3cpWs8" id="7Aoa2yVtzfl" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVtzfm" role="3cpWs9">
+            <property role="TrG5h" value="map" />
+            <node concept="3uibUv" id="7Aoa2yVtzfn" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+              <node concept="3uibUv" id="7Aoa2yVtzfo" role="11_B2D">
+                <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+              </node>
+              <node concept="3uibUv" id="7Aoa2yVtzfp" role="11_B2D">
+                <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+                <node concept="3uibUv" id="7Aoa2yVtzfq" role="11_B2D">
+                  <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+                </node>
+                <node concept="3Tqbb2" id="7Aoa2yVtzfr" role="11_B2D" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7Aoa2yVtzfs" role="33vP2m">
+              <node concept="37vLTw" id="7Aoa2yVtzft" role="2Oq$k0">
+                <ref role="3cqZAo" node="7Aoa2yVt33C" resolve="coerceToCache" />
+              </node>
+              <node concept="liA8E" id="7Aoa2yVtzfu" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
+                <node concept="2ShNRf" id="7Aoa2yVtzfv" role="37wK5m">
+                  <node concept="1pGfFk" id="7Aoa2yVtzfw" role="2ShVmc">
+                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    <node concept="37vLTw" id="7Aoa2yVtzfx" role="37wK5m">
+                      <ref role="3cqZAo" node="7Aoa2yVtzfa" resolve="source" />
+                    </node>
+                    <node concept="37vLTw" id="7Aoa2yVtzfy" role="37wK5m">
+                      <ref role="3cqZAo" node="7Aoa2yVtzfe" resolve="strong" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="7Aoa2yVtzfz" role="3cqZAp">
+          <node concept="3clFbS" id="7Aoa2yVtzf$" role="3clFbx">
+            <node concept="3cpWs6" id="7Aoa2yVtzf_" role="3cqZAp">
+              <node concept="10Nm6u" id="7Aoa2yVtzfA" role="3cqZAk" />
+            </node>
+          </node>
+          <node concept="3clFbC" id="7Aoa2yVtzfB" role="3clFbw">
+            <node concept="10Nm6u" id="7Aoa2yVtzfC" role="3uHU7w" />
+            <node concept="37vLTw" id="7Aoa2yVtzfD" role="3uHU7B">
+              <ref role="3cqZAo" node="7Aoa2yVtzfm" resolve="map" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7Aoa2yVtzfE" role="3cqZAp" />
+        <node concept="3clFbF" id="7Aoa2yVtzfF" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVtzfG" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVtzfH" role="2Oq$k0">
+              <ref role="3cqZAo" node="7Aoa2yVtzfm" resolve="map" />
+            </node>
+            <node concept="liA8E" id="7Aoa2yVtzfI" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
+              <node concept="2ShNRf" id="7Aoa2yVtzfJ" role="37wK5m">
+                <node concept="1pGfFk" id="7Aoa2yVtzfK" role="2ShVmc">
+                  <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                  <node concept="37vLTw" id="7Aoa2yVtzfL" role="37wK5m">
+                    <ref role="3cqZAo" node="7Aoa2yVtzfc" resolve="target" />
+                  </node>
+                  <node concept="37vLTw" id="7Aoa2yVtzfM" role="37wK5m">
+                    <ref role="3cqZAo" node="7Aoa2yVtzfe" resolve="strong" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVt32Z" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVtaSh" role="jymVt">
+      <property role="TrG5h" value="putConvertsTo" />
+      <node concept="37vLTG" id="7Aoa2yVtaSi" role="3clF46">
+        <property role="TrG5h" value="source" />
+        <node concept="3Tqbb2" id="7Aoa2yVtaSj" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVtaSk" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="3Tqbb2" id="7Aoa2yVtaSl" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVtaSm" role="3clF46">
+        <property role="TrG5h" value="strong" />
+        <node concept="10P_77" id="7Aoa2yVtaSn" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVtaSo" role="3clF46">
+        <property role="TrG5h" value="value" />
+        <node concept="3uibUv" id="7Aoa2yVtaSp" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7Aoa2yVtaSq" role="3clF45" />
+      <node concept="3Tmbuc" id="7Aoa2yVtaSr" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVtaSs" role="3clF47">
+        <node concept="3cpWs8" id="7Aoa2yVtaSt" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVtaSu" role="3cpWs9">
+            <property role="TrG5h" value="map" />
+            <node concept="3uibUv" id="7Aoa2yVtaSv" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+              <node concept="3uibUv" id="7Aoa2yVtaSw" role="11_B2D">
+                <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+              </node>
+              <node concept="3uibUv" id="7Aoa2yVtaSx" role="11_B2D">
+                <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7Aoa2yVtaSy" role="33vP2m">
+              <node concept="37vLTw" id="7Aoa2yVtaSz" role="2Oq$k0">
+                <ref role="3cqZAo" node="7Aoa2yVt33a" resolve="convertsToCache" />
+              </node>
+              <node concept="liA8E" id="7Aoa2yVtaS$" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Map.computeIfAbsent(java.lang.Object,java.util.function.Function)" resolve="computeIfAbsent" />
+                <node concept="2ShNRf" id="7Aoa2yVtaS_" role="37wK5m">
+                  <node concept="1pGfFk" id="7Aoa2yVtaSA" role="2ShVmc">
+                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    <node concept="37vLTw" id="7Aoa2yVtaSB" role="37wK5m">
+                      <ref role="3cqZAo" node="7Aoa2yVtaSi" resolve="source" />
+                    </node>
+                    <node concept="37vLTw" id="7Aoa2yVtaSC" role="37wK5m">
+                      <ref role="3cqZAo" node="7Aoa2yVtaSm" resolve="strong" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="1bVj0M" id="7Aoa2yVtaSD" role="37wK5m">
+                  <node concept="3clFbS" id="7Aoa2yVtaSE" role="1bW5cS">
+                    <node concept="3clFbF" id="7Aoa2yVtaSF" role="3cqZAp">
+                      <node concept="2ShNRf" id="7Aoa2yVtaSG" role="3clFbG">
+                        <node concept="1pGfFk" id="7Aoa2yVtaSH" role="2ShVmc">
+                          <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
+                          <node concept="3uibUv" id="7Aoa2yVtaSI" role="1pMfVU">
+                            <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                          </node>
+                          <node concept="3uibUv" id="7Aoa2yVtaSJ" role="1pMfVU">
+                            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="7Aoa2yVtaSK" role="3cqZAp" />
+                  </node>
+                  <node concept="37vLTG" id="7Aoa2yVtaSL" role="1bW2Oz">
+                    <property role="TrG5h" value="k" />
+                    <node concept="3uibUv" id="7Aoa2yVtaSM" role="1tU5fm">
+                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7Aoa2yVtaSN" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVtaSO" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVtaSP" role="2Oq$k0">
+              <ref role="3cqZAo" node="7Aoa2yVtaSu" resolve="map" />
+            </node>
+            <node concept="liA8E" id="7Aoa2yVtaSQ" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
+              <node concept="2ShNRf" id="7Aoa2yVtaSR" role="37wK5m">
+                <node concept="1pGfFk" id="7Aoa2yVtaSS" role="2ShVmc">
+                  <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                  <node concept="37vLTw" id="7Aoa2yVtaST" role="37wK5m">
+                    <ref role="3cqZAo" node="7Aoa2yVtaSk" resolve="target" />
+                  </node>
+                  <node concept="37vLTw" id="7Aoa2yVtaSU" role="37wK5m">
+                    <ref role="3cqZAo" node="7Aoa2yVtaSm" resolve="strong" />
+                  </node>
+                </node>
+              </node>
+              <node concept="37vLTw" id="7Aoa2yVtaSV" role="37wK5m">
+                <ref role="3cqZAo" node="7Aoa2yVtaSo" resolve="value" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVtrqe" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVthjU" role="jymVt">
+      <property role="TrG5h" value="putCoerceToConcept" />
+      <node concept="37vLTG" id="7Aoa2yVthjV" role="3clF46">
+        <property role="TrG5h" value="source" />
+        <node concept="3Tqbb2" id="7Aoa2yVthjW" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVthjX" role="3clF46">
+        <property role="TrG5h" value="targetConcept" />
+        <node concept="3bZ5Sz" id="7Aoa2yVthjY" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVthjZ" role="3clF46">
+        <property role="TrG5h" value="strong" />
+        <node concept="10P_77" id="7Aoa2yVthk0" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVthk1" role="3clF46">
+        <property role="TrG5h" value="value" />
+        <node concept="3uibUv" id="7Aoa2yVthk2" role="1tU5fm">
+          <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+          <node concept="3uibUv" id="7Aoa2yVthk3" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+          </node>
+          <node concept="3Tqbb2" id="7Aoa2yVthk4" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7Aoa2yVthk5" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVthk6" role="3clF47">
+        <node concept="3cpWs8" id="7Aoa2yVthk7" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVthk8" role="3cpWs9">
+            <property role="TrG5h" value="map" />
+            <node concept="3uibUv" id="7Aoa2yVthk9" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+              <node concept="3bZ5Sz" id="7Aoa2yVthka" role="11_B2D" />
+              <node concept="3uibUv" id="7Aoa2yVthkb" role="11_B2D">
+                <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+                <node concept="3uibUv" id="7Aoa2yVthkc" role="11_B2D">
+                  <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+                </node>
+                <node concept="3Tqbb2" id="7Aoa2yVthkd" role="11_B2D" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7Aoa2yVthke" role="33vP2m">
+              <node concept="37vLTw" id="7Aoa2yVthkf" role="2Oq$k0">
+                <ref role="3cqZAo" node="7Aoa2yVt33n" resolve="coerceToConceptCache" />
+              </node>
+              <node concept="liA8E" id="7Aoa2yVthkg" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Map.computeIfAbsent(java.lang.Object,java.util.function.Function)" resolve="computeIfAbsent" />
+                <node concept="2ShNRf" id="7Aoa2yVthkh" role="37wK5m">
+                  <node concept="1pGfFk" id="7Aoa2yVthki" role="2ShVmc">
+                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    <node concept="37vLTw" id="7Aoa2yVthkj" role="37wK5m">
+                      <ref role="3cqZAo" node="7Aoa2yVthjV" resolve="source" />
+                    </node>
+                    <node concept="37vLTw" id="7Aoa2yVthkk" role="37wK5m">
+                      <ref role="3cqZAo" node="7Aoa2yVthjZ" resolve="strong" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="1bVj0M" id="7Aoa2yVthkl" role="37wK5m">
+                  <node concept="3clFbS" id="7Aoa2yVthkm" role="1bW5cS">
+                    <node concept="3clFbF" id="7Aoa2yVthkn" role="3cqZAp">
+                      <node concept="2ShNRf" id="7Aoa2yVthko" role="3clFbG">
+                        <node concept="1pGfFk" id="7Aoa2yVthkp" role="2ShVmc">
+                          <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
+                          <node concept="3bZ5Sz" id="7Aoa2yVthkq" role="1pMfVU" />
+                          <node concept="3uibUv" id="7Aoa2yVthkr" role="1pMfVU">
+                            <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+                            <node concept="3uibUv" id="7Aoa2yVthks" role="11_B2D">
+                              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+                            </node>
+                            <node concept="3Tqbb2" id="7Aoa2yVthkt" role="11_B2D" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="7Aoa2yVthku" role="3cqZAp" />
+                  </node>
+                  <node concept="37vLTG" id="7Aoa2yVthkv" role="1bW2Oz">
+                    <property role="TrG5h" value="k" />
+                    <node concept="3uibUv" id="7Aoa2yVthkw" role="1tU5fm">
+                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7Aoa2yVthkx" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVthky" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVthkz" role="2Oq$k0">
+              <ref role="3cqZAo" node="7Aoa2yVthk8" resolve="map" />
+            </node>
+            <node concept="liA8E" id="7Aoa2yVthk$" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
+              <node concept="37vLTw" id="7Aoa2yVthk_" role="37wK5m">
+                <ref role="3cqZAo" node="7Aoa2yVthjX" resolve="targetConcept" />
+              </node>
+              <node concept="37vLTw" id="7Aoa2yVthkA" role="37wK5m">
+                <ref role="3cqZAo" node="7Aoa2yVthk1" resolve="value" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7Aoa2yVthkB" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVt5Qr" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVtoMZ" role="jymVt">
+      <property role="TrG5h" value="putCoerceTo" />
+      <node concept="37vLTG" id="7Aoa2yVtoN0" role="3clF46">
+        <property role="TrG5h" value="source" />
+        <node concept="3Tqbb2" id="7Aoa2yVtoN1" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVtoN2" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="3Tqbb2" id="7Aoa2yVtoN3" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVtoN4" role="3clF46">
+        <property role="TrG5h" value="strong" />
+        <node concept="10P_77" id="7Aoa2yVtoN5" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVtoN6" role="3clF46">
+        <property role="TrG5h" value="value" />
+        <node concept="3uibUv" id="7Aoa2yVtoN7" role="1tU5fm">
+          <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+          <node concept="3uibUv" id="7Aoa2yVtoN8" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+          </node>
+          <node concept="3Tqbb2" id="7Aoa2yVtoN9" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7Aoa2yVtoNa" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVtoNb" role="3clF47">
+        <node concept="3cpWs8" id="7Aoa2yVtoNc" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVtoNd" role="3cpWs9">
+            <property role="TrG5h" value="map" />
+            <node concept="3uibUv" id="7Aoa2yVtoNe" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+              <node concept="3uibUv" id="7Aoa2yVtoNf" role="11_B2D">
+                <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+              </node>
+              <node concept="3uibUv" id="7Aoa2yVtoNg" role="11_B2D">
+                <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+                <node concept="3uibUv" id="7Aoa2yVtoNh" role="11_B2D">
+                  <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+                </node>
+                <node concept="3Tqbb2" id="7Aoa2yVtoNi" role="11_B2D" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7Aoa2yVtoNj" role="33vP2m">
+              <node concept="37vLTw" id="7Aoa2yVtoNk" role="2Oq$k0">
+                <ref role="3cqZAo" node="7Aoa2yVt33C" resolve="coerceToCache" />
+              </node>
+              <node concept="liA8E" id="7Aoa2yVtoNl" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~Map.computeIfAbsent(java.lang.Object,java.util.function.Function)" resolve="computeIfAbsent" />
+                <node concept="2ShNRf" id="7Aoa2yVtoNm" role="37wK5m">
+                  <node concept="1pGfFk" id="7Aoa2yVtoNn" role="2ShVmc">
+                    <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    <node concept="37vLTw" id="7Aoa2yVtoNo" role="37wK5m">
+                      <ref role="3cqZAo" node="7Aoa2yVtoN0" resolve="source" />
+                    </node>
+                    <node concept="37vLTw" id="7Aoa2yVtoNp" role="37wK5m">
+                      <ref role="3cqZAo" node="7Aoa2yVtoN4" resolve="strong" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="1bVj0M" id="7Aoa2yVtoNq" role="37wK5m">
+                  <node concept="3clFbS" id="7Aoa2yVtoNr" role="1bW5cS">
+                    <node concept="3clFbF" id="7Aoa2yVtoNs" role="3cqZAp">
+                      <node concept="2ShNRf" id="7Aoa2yVtoNt" role="3clFbG">
+                        <node concept="1pGfFk" id="7Aoa2yVtoNu" role="2ShVmc">
+                          <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
+                          <node concept="3uibUv" id="7Aoa2yVtoNv" role="1pMfVU">
+                            <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                          </node>
+                          <node concept="3uibUv" id="7Aoa2yVtoNw" role="1pMfVU">
+                            <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+                            <node concept="3uibUv" id="7Aoa2yVtoNx" role="11_B2D">
+                              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+                            </node>
+                            <node concept="3Tqbb2" id="7Aoa2yVtoNy" role="11_B2D" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="7Aoa2yVtoNz" role="3cqZAp" />
+                  </node>
+                  <node concept="37vLTG" id="7Aoa2yVtoN$" role="1bW2Oz">
+                    <property role="TrG5h" value="k" />
+                    <node concept="3uibUv" id="7Aoa2yVtoN_" role="1tU5fm">
+                      <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7Aoa2yVtoNA" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVtoNB" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVtoNC" role="2Oq$k0">
+              <ref role="3cqZAo" node="7Aoa2yVtoNd" resolve="map" />
+            </node>
+            <node concept="liA8E" id="7Aoa2yVtoND" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
+              <node concept="2ShNRf" id="7Aoa2yVtoNE" role="37wK5m">
+                <node concept="1pGfFk" id="7Aoa2yVtoNF" role="2ShVmc">
+                  <ref role="37wK5l" node="1z4$59jbqsw" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+                  <node concept="37vLTw" id="7Aoa2yVtoNG" role="37wK5m">
+                    <ref role="3cqZAo" node="7Aoa2yVtoN2" resolve="target" />
+                  </node>
+                  <node concept="37vLTw" id="7Aoa2yVtoNH" role="37wK5m">
+                    <ref role="3cqZAo" node="7Aoa2yVtoN4" resolve="strong" />
+                  </node>
+                </node>
+              </node>
+              <node concept="37vLTw" id="7Aoa2yVtoNI" role="37wK5m">
+                <ref role="3cqZAo" node="7Aoa2yVtoN6" resolve="value" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7Aoa2yVtoNJ" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVt5Qs" role="jymVt" />
+    <node concept="2tJIrI" id="7Aoa2yVt5Qt" role="jymVt" />
+    <node concept="312cEg" id="7Aoa2yVt33a" role="jymVt">
+      <property role="TrG5h" value="convertsToCache" />
+      <node concept="3Tm6S6" id="7Aoa2yVt33b" role="1B3o_S" />
+      <node concept="3uibUv" id="7Aoa2yVt33c" role="1tU5fm">
+        <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+        <node concept="3uibUv" id="7Aoa2yVt33d" role="11_B2D">
+          <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+        </node>
+        <node concept="3uibUv" id="7Aoa2yVt33e" role="11_B2D">
+          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+          <node concept="3uibUv" id="7Aoa2yVt33f" role="11_B2D">
+            <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+          </node>
+          <node concept="3uibUv" id="7Aoa2yVt33g" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+          </node>
+        </node>
+      </node>
+      <node concept="2ShNRf" id="7Aoa2yVt33h" role="33vP2m">
+        <node concept="1pGfFk" id="7Aoa2yVt33i" role="2ShVmc">
+          <property role="373rjd" value="true" />
+          <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="7Aoa2yVt33n" role="jymVt">
+      <property role="TrG5h" value="coerceToConceptCache" />
+      <node concept="3Tm6S6" id="7Aoa2yVt33o" role="1B3o_S" />
+      <node concept="3uibUv" id="7Aoa2yVt33p" role="1tU5fm">
+        <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+        <node concept="3uibUv" id="7Aoa2yVt33q" role="11_B2D">
+          <ref role="3uigEE" node="1z4$59jbqsu" resolve="MatchSNodeWrapper" />
+        </node>
+        <node concept="3uibUv" id="7Aoa2yVt33r" role="11_B2D">
+          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+          <node concept="3bZ5Sz" id="7Aoa2yVt33s" role="11_B2D" />
+          <node concept="3uibUv" id="7Aoa2yVt33t" role="11_B2D">
+            <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+            <node concept="3uibUv" id="7Aoa2yVt33u" role="11_B2D">
+              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+            </node>
+            <node concept="3Tqbb2" id="7Aoa2yVt33v" role="11_B2D" />
+          </node>
+        </node>
+      </node>
+      <node concept="2ShNRf" id="7Aoa2yVt33w" role="33vP2m">
+        <node concept="1pGfFk" id="7Aoa2yVt33x" role="2ShVmc">
+          <property role="373rjd" value="true" />
+          <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="7Aoa2yVt33C" role="jymVt">
+      <property role="TrG5h" value="coerceToCache" />
+      <node concept="3Tm6S6" id="7Aoa2yVt33D" role="1B3o_S" />
+      <node concept="3uibUv" id="7Aoa2yVt33E" role="1tU5fm">
+        <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+        <node concept="3uibUv" id="7Aoa2yVt33F" role="11_B2D">
+          <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+        </node>
+        <node concept="3uibUv" id="7Aoa2yVt33G" role="11_B2D">
+          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+          <node concept="3uibUv" id="7Aoa2yVt33H" role="11_B2D">
+            <ref role="3uigEE" node="1z4$59jbqsu" resolve="TypecheckingResultsCache.MatchSNodeWrapper" />
+          </node>
+          <node concept="3uibUv" id="7Aoa2yVt33I" role="11_B2D">
+            <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+            <node concept="3uibUv" id="7Aoa2yVt33J" role="11_B2D">
+              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+            </node>
+            <node concept="3Tqbb2" id="7Aoa2yVt33K" role="11_B2D" />
+          </node>
+        </node>
+      </node>
+      <node concept="2ShNRf" id="7Aoa2yVt33L" role="33vP2m">
+        <node concept="1pGfFk" id="7Aoa2yVt33M" role="2ShVmc">
+          <property role="373rjd" value="true" />
+          <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="7Aoa2yVt0Sc" role="1B3o_S" />
+  </node>
+  <node concept="312cEu" id="7Aoa2yVx5U6">
+    <property role="3GE5qa" value="requests" />
+    <property role="TrG5h" value="AbstractConvertsRequest" />
+    <property role="1sVAO0" value="true" />
+    <node concept="2tJIrI" id="7Aoa2yVx5UY" role="jymVt" />
+    <node concept="Wx3nA" id="7Aoa2yVuwe5" role="jymVt">
+      <property role="TrG5h" value="CONVERSION_INFO" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3uibUv" id="7Aoa2yVuwe6" role="1tU5fm">
+        <ref role="3uigEE" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
+        <node concept="3uibUv" id="7Aoa2yVuwe7" role="11_B2D">
+          <ref role="3uigEE" node="7Aoa2yVt0Sb" resolve="ConversionInfo" />
+        </node>
+      </node>
+      <node concept="2YIFZM" id="7Aoa2yVuwe8" role="33vP2m">
+        <ref role="37wK5l" node="7Aoa2yVep9e" resolve="of" />
+        <ref role="1Pybhc" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
+        <node concept="3VsKOn" id="7Aoa2yVuwe9" role="37wK5m">
+          <ref role="3VsUkX" node="7Aoa2yVt0Sb" resolve="ConversionInfo" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7Aoa2yV_REs" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVxdea" role="jymVt" />
+    <node concept="2tJIrI" id="7Aoa2yVxdkx" role="jymVt" />
+    <node concept="3clFbW" id="7Aoa2yVx6AT" role="jymVt">
+      <node concept="37vLTG" id="7Aoa2yVx6BS" role="3clF46">
+        <property role="TrG5h" value="query" />
+        <node concept="16syzq" id="7Aoa2yVx6Do" role="1tU5fm">
+          <ref role="16sUi3" node="7Aoa2yVx68b" resolve="Q" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7Aoa2yVx6AV" role="3clF45" />
+      <node concept="3Tm1VV" id="7Aoa2yVx6AW" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVx6AX" role="3clF47">
+        <node concept="XkiVB" id="7Aoa2yVx7BW" role="3cqZAp">
+          <ref role="37wK5l" node="1z4$59irJq1" resolve="Request" />
+          <node concept="37vLTw" id="7Aoa2yVx7JJ" role="37wK5m">
+            <ref role="3cqZAo" node="7Aoa2yVx6BS" resolve="query" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVxiQ3" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVxjvu" role="jymVt">
+      <property role="TrG5h" value="response" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="37vLTG" id="7Aoa2yVxBJC" role="3clF46">
+        <property role="TrG5h" value="executionOk" />
+        <node concept="10P_77" id="7Aoa2yVxBJD" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="7Aoa2yVxksd" role="3clF45">
+        <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
+        <node concept="16syzq" id="7Aoa2yVxr0G" role="11_B2D">
+          <ref role="16sUi3" node="7Aoa2yVx690" resolve="T" />
+        </node>
+      </node>
+      <node concept="3Tmbuc" id="7Aoa2yVxk67" role="1B3o_S" />
+      <node concept="3clFbS" id="7Aoa2yVxjvy" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVxjay" role="jymVt" />
+    <node concept="3clFb_" id="7Aoa2yVxi6Q" role="jymVt">
+      <property role="TrG5h" value="calcConverts" />
+      <node concept="3clFbS" id="7Aoa2yVxi6R" role="3clF47">
+        <node concept="3clFbH" id="7Aoa2yVxi6S" role="3cqZAp" />
+        <node concept="3cpWs8" id="7Aoa2yVxErB" role="3cqZAp">
+          <node concept="3cpWsn" id="7Aoa2yVxErC" role="3cpWs9">
+            <property role="TrG5h" value="strategy" />
+            <node concept="3uibUv" id="7Aoa2yVxErD" role="1tU5fm">
+              <ref role="3uigEE" node="61G6TdCqpnb" resolve="TypecheckingStrategy" />
+            </node>
+            <node concept="2ShNRf" id="7Aoa2yVxErE" role="33vP2m">
+              <node concept="1pGfFk" id="7Aoa2yVxErF" role="2ShVmc">
+                <ref role="37wK5l" node="5Qx6_65F4Qp" />
+                <node concept="Xjq3P" id="7Aoa2yVxErG" role="37wK5m" />
+                <node concept="37vLTw" id="7Aoa2yVxFqa" role="37wK5m">
+                  <ref role="3cqZAo" node="7Aoa2yVxi7k" resolve="repository" />
+                </node>
+                <node concept="37vLTw" id="7Aoa2yVxErK" role="37wK5m">
+                  <ref role="3cqZAo" node="7Aoa2yVxi7m" resolve="messageHandler" />
+                </node>
+                <node concept="37vLTw" id="7Aoa2yVxFSI" role="37wK5m">
+                  <ref role="3cqZAo" node="7Aoa2yVxi7u" resolve="typeCollector" />
+                </node>
+                <node concept="37vLTw" id="7Aoa2yVxErO" role="37wK5m">
+                  <ref role="3cqZAo" node="7Aoa2yVxi7q" resolve="cachedData" />
+                </node>
+                <node concept="37vLTw" id="7Aoa2yVxErP" role="37wK5m">
+                  <ref role="3cqZAo" node="7Aoa2yVxi7s" resolve="fresh" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7Aoa2yVxi78" role="3cqZAp" />
+        <node concept="3clFbF" id="7Aoa2yVxi79" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVxi7a" role="3clFbG">
+            <node concept="37vLTw" id="7Aoa2yVxi7b" role="2Oq$k0">
+              <ref role="3cqZAo" node="7Aoa2yVxErC" resolve="strategy" />
+            </node>
+            <node concept="liA8E" id="7Aoa2yVxi7c" role="2OqNvi">
+              <ref role="37wK5l" node="7Aoa2yU04_N" resolve="launch" />
+              <node concept="3clFbT" id="7Aoa2yVxi7d" role="37wK5m">
+                <property role="3clFbU" value="true" />
+              </node>
+              <node concept="37Ijox" id="7Aoa2yVxuhW" role="37wK5m">
+                <ref role="37Ijqf" node="7Aoa2yVxjvu" resolve="response" />
+                <node concept="Xjq3P" id="7Aoa2yVxt0T" role="wWaWy" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="7Aoa2yVxi7h" role="3clF45">
+        <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
+        <node concept="16syzq" id="7Aoa2yVxK7w" role="11_B2D">
+          <ref role="16sUi3" node="7Aoa2yVx690" resolve="T" />
+        </node>
+      </node>
+      <node concept="3Tmbuc" id="7Aoa2yVxi7j" role="1B3o_S" />
+      <node concept="37vLTG" id="7Aoa2yVxi7k" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="7Aoa2yVxi7l" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVxi7m" role="3clF46">
+        <property role="TrG5h" value="messageHandler" />
+        <node concept="3uibUv" id="7Aoa2yVxi7n" role="1tU5fm">
+          <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVxi7q" role="3clF46">
+        <property role="TrG5h" value="cachedData" />
+        <node concept="3uibUv" id="7Aoa2yVxi7r" role="1tU5fm">
+          <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVxi7s" role="3clF46">
+        <property role="TrG5h" value="fresh" />
+        <node concept="10P_77" id="7Aoa2yVxi7t" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Aoa2yVxi7u" role="3clF46">
+        <property role="TrG5h" value="typeCollector" />
+        <node concept="3uibUv" id="7Aoa2yVxi7v" role="1tU5fm">
+          <ref role="3uigEE" node="5MNibENhpkH" resolve="TypeCollector" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7Aoa2yVxi7w" role="jymVt" />
+    <node concept="3Tm1VV" id="7Aoa2yVx5U7" role="1B3o_S" />
+    <node concept="16euLQ" id="7Aoa2yVx68b" role="16eVyc">
+      <property role="TrG5h" value="Q" />
+      <node concept="3uibUv" id="7Aoa2yVx68U" role="3ztrMU">
+        <ref role="3uigEE" to="ugy2:5EDW3XDYeWv" resolve="Query" />
+      </node>
+    </node>
+    <node concept="16euLQ" id="7Aoa2yVx690" role="16eVyc">
+      <property role="TrG5h" value="T" />
+    </node>
+    <node concept="3uibUv" id="7Aoa2yVx69K" role="1zkMxy">
+      <ref role="3uigEE" node="1z4$59iohfJ" resolve="Request" />
+      <node concept="16syzq" id="7Aoa2yVx6b3" role="11_B2D">
+        <ref role="16sUi3" node="7Aoa2yVx68b" resolve="Q" />
+      </node>
+      <node concept="16syzq" id="7Aoa2yVx6bQ" role="11_B2D">
+        <ref role="16sUi3" node="7Aoa2yVx690" resolve="T" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps
index 1fceeb00..e62c0d62 100644
--- a/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps
+++ b/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps
@@ -98,8 +98,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -136,30 +136,30 @@
       <property role="TrG5h" value="Test1" />
       <node concept="3cqZAl" id="5s5QomKHHK2" role="3clF45" />
       <node concept="3clFbS" id="5s5QomKHHK6" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwI1" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwI2" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwI3" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwI4" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH0oa" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH0rv" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH0rw" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH0rx" role="2Oq$k0">
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="27bTNFfbZPj" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbZPk" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbZPl" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH0ry" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH0rz" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH0r$" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbZPm" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbZPn" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH0r_" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH0rA" role="2tJFKM">
                         <ref role="2aWVGs" to="ious:3w0n0hzkQZ9" resolve="Test1" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbZRk" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH0rB" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwI7" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH0rC" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwI8" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH0rD" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -170,30 +170,30 @@
       <property role="TrG5h" value="Test2" />
       <node concept="3cqZAl" id="5RH_cL_9G1w" role="3clF45" />
       <node concept="3clFbS" id="5RH_cL_9G1x" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwIF" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwIG" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwIH" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwII" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH0O3" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH0Ro" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH0Rp" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH0Rq" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfc04W" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfc04X" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfc04Y" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH0Rr" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH0Rs" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH0Rt" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfc04Z" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfc050" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH0Ru" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH0Rv" role="2tJFKM">
                         <ref role="2aWVGs" to="ious:3w0n0hznGEq" resolve="Test2" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfc06X" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH0Rw" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwIL" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH0Rx" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwIM" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH0Ry" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -204,30 +204,30 @@
       <property role="TrG5h" value="Test3" />
       <node concept="3cqZAl" id="5RH_cL_9G27" role="3clF45" />
       <node concept="3clFbS" id="5RH_cL_9G28" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwJl" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwJm" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwJn" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwJo" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH1eU" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH1eY" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH1eZ" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH1f0" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfc08Q" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfc08R" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfc08S" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH1f1" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH1f2" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH1f3" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfc08T" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfc08U" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH1f4" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH1f5" role="2tJFKM">
                         <ref role="2aWVGs" to="ious:3w0n0hznGIK" resolve="Test3" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfc0aR" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH1f6" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwJr" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH1f7" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwJs" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH1f8" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -238,30 +238,30 @@
       <property role="TrG5h" value="Test4" />
       <node concept="3cqZAl" id="5RH_cL_9G2U" role="3clF45" />
       <node concept="3clFbS" id="5RH_cL_9G2V" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwJZ" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwK0" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwK1" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwK2" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH1Cb" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH1Fw" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH1Fx" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH1Fy" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfc0cK" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfc0cL" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfc0cM" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH1Fz" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH1F$" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH1F_" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfc0cN" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfc0cO" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH1FA" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH1FB" role="2tJFKM">
                         <ref role="2aWVGs" to="ious:3w0n0hznGNm" resolve="Test4" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfc0eL" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH1FC" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwK5" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH1FD" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwK6" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH1FE" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -272,30 +272,30 @@
       <property role="TrG5h" value="RelationTautology" />
       <node concept="3cqZAl" id="4h0MmDW5TTI" role="3clF45" />
       <node concept="3clFbS" id="4h0MmDW5TTJ" role="3clF47">
-        <node concept="2Hmddi" id="4h0MmDW5TTK" role="3cqZAp">
-          <node concept="2OqwBi" id="4h0MmDW5TTL" role="2Hmdds">
-            <node concept="2OqwBi" id="4h0MmDW5TTM" role="2Oq$k0">
-              <node concept="2YIFZM" id="4h0MmDW5TTN" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH232" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH26n" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH26o" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH26p" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="4h0MmDW5TTO" role="37wK5m">
-                  <node concept="2WthIp" id="4h0MmDW5TTP" role="2Oq$k0" />
-                  <node concept="2XshWL" id="4h0MmDW5TTQ" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH26q" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH26r" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH26s" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="4h0MmDW5TTR" role="2XxRq1">
-                      <node concept="ZC_QK" id="4h0MmDW5TV7" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH26t" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH26u" role="2tJFKM">
                         <ref role="2aWVGs" to="ious:4h0MmDW5CMA" resolve="Relation_Tautology" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="4h0MmDW5TTT" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH26v" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="4h0MmDW5TTU" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH26w" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="4h0MmDW5TTV" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH26x" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -306,30 +306,30 @@
       <property role="TrG5h" value="NotExists_implies_ForAll" />
       <node concept="3cqZAl" id="4h0MmDW5TVb" role="3clF45" />
       <node concept="3clFbS" id="4h0MmDW5TVc" role="3clF47">
-        <node concept="2Hmddi" id="4h0MmDW5TVd" role="3cqZAp">
-          <node concept="2OqwBi" id="4h0MmDW5TVe" role="2Hmdds">
-            <node concept="2OqwBi" id="4h0MmDW5TVf" role="2Oq$k0">
-              <node concept="2YIFZM" id="4h0MmDW5TVg" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH2tS" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH2xd" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH2xe" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH2xf" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="4h0MmDW5TVh" role="37wK5m">
-                  <node concept="2WthIp" id="4h0MmDW5TVi" role="2Oq$k0" />
-                  <node concept="2XshWL" id="4h0MmDW5TVj" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH2xg" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH2xh" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH2xi" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="4h0MmDW5TVk" role="2XxRq1">
-                      <node concept="ZC_QK" id="4h0MmDW5TWN" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH2xj" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH2xk" role="2tJFKM">
                         <ref role="2aWVGs" to="ious:4h0MmDW5Dv9" resolve="NotExists_implies_ForAll" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="4h0MmDW5TVm" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH2xl" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="4h0MmDW5TVn" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH2xm" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="4h0MmDW5TVo" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH2xn" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -340,30 +340,30 @@
       <property role="TrG5h" value="NotForall_implies_Exists" />
       <node concept="3cqZAl" id="4h0MmDW5TWR" role="3clF45" />
       <node concept="3clFbS" id="4h0MmDW5TWS" role="3clF47">
-        <node concept="2Hmddi" id="4h0MmDW5TWT" role="3cqZAp">
-          <node concept="2OqwBi" id="4h0MmDW5TWU" role="2Hmdds">
-            <node concept="2OqwBi" id="4h0MmDW5TWV" role="2Oq$k0">
-              <node concept="2YIFZM" id="4h0MmDW5TWW" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH2SJ" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH2W4" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH2W5" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH2W6" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="4h0MmDW5TWX" role="37wK5m">
-                  <node concept="2WthIp" id="4h0MmDW5TWY" role="2Oq$k0" />
-                  <node concept="2XshWL" id="4h0MmDW5TWZ" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH2W7" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH2W8" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH2W9" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="4h0MmDW5TX0" role="2XxRq1">
-                      <node concept="ZC_QK" id="4h0MmDW5TYI" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH2Wa" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH2Wb" role="2tJFKM">
                         <ref role="2aWVGs" to="ious:4h0MmDW5AwM" resolve="NotForall_implies_Exists" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="4h0MmDW5TX2" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH2Wc" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="4h0MmDW5TX3" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH2Wd" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="4h0MmDW5TX4" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH2We" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
diff --git a/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps
index c2773e31..8c649590 100644
--- a/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps
+++ b/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps
@@ -98,8 +98,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -136,30 +136,30 @@
       <property role="TrG5h" value="Example" />
       <node concept="3cqZAl" id="5s5QomKHHK2" role="3clF45" />
       <node concept="3clFbS" id="5s5QomKHHK6" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwWt" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwWu" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwWv" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwWw" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH3B5" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH3Eq" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH3Er" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH3Es" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbZAI" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbZAJ" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbZAK" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH3Et" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH3Eu" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH3Ev" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbZAL" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbZAM" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH3Ew" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH3Ex" role="2tJFKM">
                         <ref role="2aWVGs" to="fr15:3w0n0hzkMd2" resolve="Example" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbZCJ" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH3Ey" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwWz" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH3Ez" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwW$" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH3E$" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
diff --git a/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps
index dcd08c1e..a80dba1a 100644
--- a/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps
+++ b/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps
@@ -101,6 +101,9 @@
       <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
         <child id="7080278351417106681" name="expression" index="2Hmdds" />
       </concept>
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
+      </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@@ -136,30 +139,30 @@
       <property role="TrG5h" value="Contrapositive" />
       <node concept="3cqZAl" id="5s5QomKHHK2" role="3clF45" />
       <node concept="3clFbS" id="5s5QomKHHK6" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwKD" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwKE" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwKF" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwKG" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH4_h" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH4CA" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH4CB" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH4CC" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbXle" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbXlf" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbXlg" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH4CD" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH4CE" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH4CF" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbXlh" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbXli" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH4CG" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH4CH" role="2tJFKM">
                         <ref role="2aWVGs" to="ctog:2AfSc6Jv$28" resolve="Contrapositive" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbXnf" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH4CI" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwKJ" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH4CJ" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwKK" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH4CK" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -170,30 +173,30 @@
       <property role="TrG5h" value="Foo" />
       <node concept="3cqZAl" id="2dF51l1ebnh" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebni" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwLj" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwLk" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwLl" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwLm" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH58p" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH5bI" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH5bJ" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH5bK" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbXQp" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbXQq" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbXQr" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH5bL" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH5bM" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH5bN" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbXQs" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbXQt" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH5bO" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH5bP" role="2tJFKM">
                         <ref role="2aWVGs" to="ctog:4wvktoXPtyv" resolve="Foo" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbXSq" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH5bQ" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwLp" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH5bR" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwLq" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH5bS" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -204,30 +207,30 @@
       <property role="TrG5h" value="Implication" />
       <node concept="3cqZAl" id="2dF51l1ebnV" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebnW" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwLX" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwLY" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwLZ" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwM0" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH5Ei" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH5HB" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH5HC" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH5HD" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbXUj" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbXUk" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbXUl" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH5HE" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH5HF" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH5HG" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbXUm" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbXUn" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH5HH" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH5HI" role="2tJFKM">
                         <ref role="2aWVGs" to="ctog:5jVx7S230hl" resolve="Implication" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbXWk" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH5HJ" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwM3" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH5HK" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwM4" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH5HL" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -238,30 +241,30 @@
       <property role="TrG5h" value="Nonsense" />
       <node concept="3cqZAl" id="2dF51l1eboI" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1eboJ" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwMB" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwMC" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwMD" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwME" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH6cb" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH6dR" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH6dS" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH6dT" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbXYd" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbXYe" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbXYf" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH6dU" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH6dV" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH6dW" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbXYg" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbXYh" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH6dX" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH6dY" role="2tJFKM">
                         <ref role="2aWVGs" to="ctog:3l440nVt5$e" resolve="Nonsense" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbY0e" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH6dZ" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwMH" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH6e0" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwMI" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH6e1" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -272,30 +275,30 @@
       <property role="TrG5h" value="Sample" />
       <node concept="3cqZAl" id="2dF51l1ebpH" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebpI" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwNh" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwNi" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwNj" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwNk" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH6Hn" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH6KG" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH6KH" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH6KI" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbY27" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbY28" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbY29" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH6KJ" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH6KK" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH6KL" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbY2a" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbY2b" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH6KM" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH6KN" role="2tJFKM">
                         <ref role="2aWVGs" to="ctog:5A8qZLXfUvB" resolve="Sample" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbY48" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH6KO" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwNn" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH6KP" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwNo" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH6KQ" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -306,30 +309,30 @@
       <property role="TrG5h" value="Tautology" />
       <node concept="3cqZAl" id="2dF51l1ebBX" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebBY" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwNV" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwNW" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwNX" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwNY" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH7fg" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH7i_" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH7iA" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH7iB" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbY_u" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbY_v" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbY_w" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH7iC" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH7iD" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH7iE" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbY_x" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbY_y" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH7iF" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH7iG" role="2tJFKM">
                         <ref role="2aWVGs" to="ctog:3JXBM6C4h$e" resolve="Tautology" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbYBv" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH7iH" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwO1" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH7iI" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwO2" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH7iJ" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -340,30 +343,30 @@
       <property role="TrG5h" value="Test1" />
       <node concept="3cqZAl" id="2dF51l1ebDk" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebDl" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwO_" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwOA" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwOB" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwOC" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH7L9" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH7Ou" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH7Ov" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH7Ow" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbYDo" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbYDp" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbYDq" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH7Ox" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH7Oy" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH7Oz" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbYDr" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbYDs" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH7O$" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH7O_" role="2tJFKM">
                         <ref role="2aWVGs" to="ctog:2AfSc6Jv_cR" resolve="Test1" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbYFp" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH7OA" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwOF" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH7OB" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwOG" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH7OC" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -374,30 +377,30 @@
       <property role="TrG5h" value="Test2" />
       <node concept="3cqZAl" id="2dF51l1ebER" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebES" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwPf" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwPg" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwPh" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwPi" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH8j2" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH8j6" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH8j7" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH8j8" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbYHi" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbYHj" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbYHk" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH8j9" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH8ja" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH8jb" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbYHl" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbYHm" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH8jc" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH8jd" role="2tJFKM">
                         <ref role="2aWVGs" to="ctog:2AfSc6Jw7pl" resolve="Test2" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbYJj" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH8je" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwPl" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH8jf" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwPm" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH8jg" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -408,30 +411,30 @@
       <property role="TrG5h" value="Test3" />
       <node concept="3cqZAl" id="2dF51l1ebGA" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebGB" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwPT" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwPU" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwPV" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwPW" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH8Nl" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH8QE" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH8QF" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH8QG" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbYLc" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbYLd" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbYLe" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH8QH" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH8QI" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH8QJ" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbYLf" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbYLg" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH8QK" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH8QL" role="2tJFKM">
                         <ref role="2aWVGs" to="ctog:2AfSc6JxXEN" resolve="Test3" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbYNd" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH8QM" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwPZ" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH8QN" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwQ0" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH8QO" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -442,30 +445,30 @@
       <property role="TrG5h" value="Test4" />
       <node concept="3cqZAl" id="2dF51l1ebI$" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebI_" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwQz" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwQ$" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwQ_" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwQA" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH9le" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH9oz" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH9o$" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH9o_" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbYP6" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbYP7" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbYP8" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH9oA" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH9oB" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH9oC" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbYP9" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbYPa" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH9oD" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH9oE" role="2tJFKM">
                         <ref role="2aWVGs" to="ctog:3l440nVqpsF" resolve="Test4" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbYR7" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH9oF" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwQD" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH9oG" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwQE" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH9oH" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -476,30 +479,30 @@
       <property role="TrG5h" value="Test5" />
       <node concept="3cqZAl" id="2dF51l1ebKF" role="3clF45" />
       <node concept="3clFbS" id="2dF51l1ebKG" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwRd" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwRe" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwRf" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwRg" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVH9Sw" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVH9S$" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVH9S_" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVH9SA" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbYT0" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbYT1" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbYT2" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVH9SB" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVH9SC" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVH9SD" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbYT3" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbYT4" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVH9SE" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVH9SF" role="2tJFKM">
                         <ref role="2aWVGs" to="ctog:3l440nVrsN1" resolve="Test5" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbYV1" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVH9SG" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="27bTNFfbwRj" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVH9SH" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwRk" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVH9SI" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
index 62ccff5f..05910e79 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
@@ -168,8 +168,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -250,33 +250,33 @@
       <property role="TrG5h" value="DemoSmall" />
       <node concept="3cqZAl" id="1GGmKhcBrSb" role="3clF45" />
       <node concept="3clFbS" id="1GGmKhcBrSc" role="3clF47">
-        <node concept="2Hmddi" id="1GGmKhcBrSd" role="3cqZAp">
-          <node concept="2OqwBi" id="1GGmKhcBrSe" role="2Hmdds">
-            <node concept="2OqwBi" id="1GGmKhcBrSf" role="2Oq$k0">
-              <node concept="2YIFZM" id="1GGmKhcBrSg" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHc4Q" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHc4U" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVHc4V" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVHc4W" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="1GGmKhcBrSh" role="37wK5m">
-                  <node concept="2WthIp" id="1GGmKhcBrSi" role="2Oq$k0" />
-                  <node concept="2XshWL" id="1GGmKhcBrSj" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVHc4X" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVHc4Y" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVHc4Z" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="1GGmKhcBrSk" role="2XxRq1">
-                      <node concept="ZC_QK" id="1GGmKhcBt20" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVHc50" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVHc51" role="2tJFKM">
                         <ref role="2aWVGs" to="ysck:1GGmKhcBn5m" resolve="DemoSmall" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="1GGmKhcBrSm" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVHc52" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="1GGmKhcBrSn" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVHc53" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="1GGmKhcBrSo" role="37wK5m">
-                  <node concept="3clFbS" id="1GGmKhcBrSp" role="1bW5cS">
-                    <node concept="3clFbF" id="1GGmKhcBrSq" role="3cqZAp">
-                      <node concept="2OqwBi" id="1GGmKhcBrSr" role="3clFbG">
-                        <node concept="2WthIp" id="1GGmKhcBrSs" role="2Oq$k0" />
-                        <node concept="2XshWL" id="1GGmKhcBrSt" role="2OqNvi">
+                <node concept="1bVj0M" id="7Aoa2yVHc54" role="37wK5m">
+                  <node concept="3clFbS" id="7Aoa2yVHc55" role="1bW5cS">
+                    <node concept="3clFbF" id="7Aoa2yVHc56" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Aoa2yVHc57" role="3clFbG">
+                        <node concept="2WthIp" id="7Aoa2yVHc58" role="2Oq$k0" />
+                        <node concept="2XshWL" id="7Aoa2yVHc59" role="2OqNvi">
                           <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
                         </node>
                       </node>
@@ -285,7 +285,7 @@
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="1GGmKhcBrSu" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHc5a" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -296,33 +296,33 @@
       <property role="TrG5h" value="Demo" />
       <node concept="3cqZAl" id="5s5QomKHHK2" role="3clF45" />
       <node concept="3clFbS" id="5s5QomKHHK6" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwSx" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwSy" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwSz" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwS$" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHcJn" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHcO5" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVHcO6" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVHcO7" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbVCh" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbVCi" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbVCj" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVHcO8" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVHcO9" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVHcOa" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbVCk" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbVCl" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVHcOb" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVHcOc" role="2tJFKM">
                         <ref role="2aWVGs" to="ysck:4dPZ2m2jNim" resolve="Demo" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbVgO" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVHcOd" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="4ZGicUZkED9" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVHcOe" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="4ZGicUZkEDa" role="37wK5m">
-                  <node concept="3clFbS" id="4ZGicUZkEDb" role="1bW5cS">
-                    <node concept="3clFbF" id="4ZGicUZkEDc" role="3cqZAp">
-                      <node concept="2OqwBi" id="4ZGicUZkEDd" role="3clFbG">
-                        <node concept="2WthIp" id="4ZGicUZkEDe" role="2Oq$k0" />
-                        <node concept="2XshWL" id="4ZGicUZkEDf" role="2OqNvi">
+                <node concept="1bVj0M" id="7Aoa2yVHcOf" role="37wK5m">
+                  <node concept="3clFbS" id="7Aoa2yVHcOg" role="1bW5cS">
+                    <node concept="3clFbF" id="7Aoa2yVHcOh" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Aoa2yVHcOi" role="3clFbG">
+                        <node concept="2WthIp" id="7Aoa2yVHcOj" role="2Oq$k0" />
+                        <node concept="2XshWL" id="7Aoa2yVHcOk" role="2OqNvi">
                           <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
                         </node>
                       </node>
@@ -331,7 +331,7 @@
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwSC" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHcOl" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -342,33 +342,33 @@
       <property role="TrG5h" value="Fix" />
       <node concept="3cqZAl" id="6EwjVjWv74$" role="3clF45" />
       <node concept="3clFbS" id="6EwjVjWv74_" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxw0" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxw1" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbMeC" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbxw2" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHdDr" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHdI9" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVHdIa" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVHdIb" role="2Oq$k0">
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="27bTNFfbVHV" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbVHW" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbVHX" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVHdIc" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVHdId" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVHdIe" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbVHY" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbVHZ" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVHdIf" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVHdIg" role="2tJFKM">
                         <ref role="2aWVGs" to="ysck:G788z3ofcS" resolve="Fix" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbVEe" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVHdIh" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="2BgB$z0LwU_" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVHdIi" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="2BgB$z0LwUA" role="37wK5m">
-                  <node concept="3clFbS" id="2BgB$z0LwUB" role="1bW5cS">
-                    <node concept="3clFbF" id="2BgB$z0LwUC" role="3cqZAp">
-                      <node concept="2OqwBi" id="2BgB$z0LwUD" role="3clFbG">
-                        <node concept="2WthIp" id="2BgB$z0LwUE" role="2Oq$k0" />
-                        <node concept="2XshWL" id="2BgB$z0LwUF" role="2OqNvi">
+                <node concept="1bVj0M" id="7Aoa2yVHdIj" role="37wK5m">
+                  <node concept="3clFbS" id="7Aoa2yVHdIk" role="1bW5cS">
+                    <node concept="3clFbF" id="7Aoa2yVHdIl" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Aoa2yVHdIm" role="3clFbG">
+                        <node concept="2WthIp" id="7Aoa2yVHdIn" role="2Oq$k0" />
+                        <node concept="2XshWL" id="7Aoa2yVHdIo" role="2OqNvi">
                           <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
                         </node>
                       </node>
@@ -377,7 +377,7 @@
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbxw5" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHdIp" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -388,33 +388,33 @@
       <property role="TrG5h" value="Peculiar" />
       <node concept="3cqZAl" id="6EwjVjWv0Y4" role="3clF45" />
       <node concept="3clFbS" id="6EwjVjWv0Y5" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwTb" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwTc" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwTd" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwTe" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHezw" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHe_i" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVHe_j" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVHe_k" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbW4I" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbW4J" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbW4K" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVHe_l" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVHe_m" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVHe_n" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbW4L" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbW4M" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVHe_o" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVHe_p" role="2tJFKM">
                         <ref role="2aWVGs" to="ysck:oyq0R0e9lD" resolve="Peculiar" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbW6J" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVHe_q" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="4ZGicUZkKZL" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVHe_r" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="4ZGicUZkKZM" role="37wK5m">
-                  <node concept="3clFbS" id="4ZGicUZkKZN" role="1bW5cS">
-                    <node concept="3clFbF" id="4ZGicUZkKZO" role="3cqZAp">
-                      <node concept="2OqwBi" id="4ZGicUZkKZP" role="3clFbG">
-                        <node concept="2WthIp" id="4ZGicUZkKZQ" role="2Oq$k0" />
-                        <node concept="2XshWL" id="4ZGicUZkKZR" role="2OqNvi">
+                <node concept="1bVj0M" id="7Aoa2yVHe_s" role="37wK5m">
+                  <node concept="3clFbS" id="7Aoa2yVHe_t" role="1bW5cS">
+                    <node concept="3clFbF" id="7Aoa2yVHe_u" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Aoa2yVHe_v" role="3clFbG">
+                        <node concept="2WthIp" id="7Aoa2yVHe_w" role="2Oq$k0" />
+                        <node concept="2XshWL" id="7Aoa2yVHe_x" role="2OqNvi">
                           <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
                         </node>
                       </node>
@@ -423,7 +423,7 @@
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwTi" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHe_y" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -434,33 +434,33 @@
       <property role="TrG5h" value="SKI" />
       <node concept="3cqZAl" id="6EwjVjWvpYH" role="3clF45" />
       <node concept="3clFbS" id="6EwjVjWvpYI" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwTP" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwTQ" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwTR" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwTS" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHfeF" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHfjp" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVHfjq" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVHfjr" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbW8C" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbW8D" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbW8E" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVHfjs" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVHfjt" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVHfju" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbW8F" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbW8G" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVHfjv" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVHfjw" role="2tJFKM">
                         <ref role="2aWVGs" to="ysck:7Et5j8uqHKT" resolve="SKI" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbWaD" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVHfjx" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="2BgB$z0LEnt" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVHfjy" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="2BgB$z0LEnu" role="37wK5m">
-                  <node concept="3clFbS" id="2BgB$z0LEnv" role="1bW5cS">
-                    <node concept="3clFbF" id="2BgB$z0LEnw" role="3cqZAp">
-                      <node concept="2OqwBi" id="2BgB$z0LEnx" role="3clFbG">
-                        <node concept="2WthIp" id="2BgB$z0LEny" role="2Oq$k0" />
-                        <node concept="2XshWL" id="2BgB$z0LEnz" role="2OqNvi">
+                <node concept="1bVj0M" id="7Aoa2yVHfjz" role="37wK5m">
+                  <node concept="3clFbS" id="7Aoa2yVHfj$" role="1bW5cS">
+                    <node concept="3clFbF" id="7Aoa2yVHfj_" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Aoa2yVHfjA" role="3clFbG">
+                        <node concept="2WthIp" id="7Aoa2yVHfjB" role="2Oq$k0" />
+                        <node concept="2XshWL" id="7Aoa2yVHfjC" role="2OqNvi">
                           <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
                         </node>
                       </node>
@@ -469,7 +469,7 @@
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwTW" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHfjD" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -480,33 +480,33 @@
       <property role="TrG5h" value="Numerals" />
       <node concept="3cqZAl" id="6EwjVjWvvH5" role="3clF45" />
       <node concept="3clFbS" id="6EwjVjWvvH6" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwUv" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwUw" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwUx" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwUy" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHfU$" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHfZi" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVHfZj" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVHfZk" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbWvq" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbWvr" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbWvs" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVHfZl" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVHfZm" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVHfZn" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbWvt" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbWvu" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVHfZo" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVHfZp" role="2tJFKM">
                         <ref role="2aWVGs" to="ysck:7_8aRkgE06U" resolve="Numerals" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbWxr" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVHfZq" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="4ZGicUZkV9_" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVHfZr" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="4ZGicUZkV9A" role="37wK5m">
-                  <node concept="3clFbS" id="4ZGicUZkV9B" role="1bW5cS">
-                    <node concept="3clFbF" id="4ZGicUZkV9C" role="3cqZAp">
-                      <node concept="2OqwBi" id="4ZGicUZkV9D" role="3clFbG">
-                        <node concept="2WthIp" id="4ZGicUZkV9E" role="2Oq$k0" />
-                        <node concept="2XshWL" id="4ZGicUZkV9F" role="2OqNvi">
+                <node concept="1bVj0M" id="7Aoa2yVHfZs" role="37wK5m">
+                  <node concept="3clFbS" id="7Aoa2yVHfZt" role="1bW5cS">
+                    <node concept="3clFbF" id="7Aoa2yVHfZu" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Aoa2yVHfZv" role="3clFbG">
+                        <node concept="2WthIp" id="7Aoa2yVHfZw" role="2Oq$k0" />
+                        <node concept="2XshWL" id="7Aoa2yVHfZx" role="2OqNvi">
                           <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
                         </node>
                       </node>
@@ -515,7 +515,7 @@
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwUA" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHfZy" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -526,33 +526,33 @@
       <property role="TrG5h" value="Omega" />
       <node concept="3cqZAl" id="6EwjVjWvydS" role="3clF45" />
       <node concept="3clFbS" id="6EwjVjWvydT" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwV9" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwVa" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwVb" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwVc" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHgPG" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHgUq" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVHgUr" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVHgUs" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbWzk" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbWzl" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbWzm" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVHgUt" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVHgUu" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVHgUv" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbWzn" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbWzo" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVHgUw" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVHgUx" role="2tJFKM">
                         <ref role="2aWVGs" to="ysck:nOeFRaGxm_" resolve="Omega" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbW_l" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVHgUy" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="2BgB$z0LLkJ" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVHgUz" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="2BgB$z0LLkK" role="37wK5m">
-                  <node concept="3clFbS" id="2BgB$z0LLkL" role="1bW5cS">
-                    <node concept="3clFbF" id="2BgB$z0LLkM" role="3cqZAp">
-                      <node concept="2OqwBi" id="2BgB$z0LLkN" role="3clFbG">
-                        <node concept="2WthIp" id="2BgB$z0LLkO" role="2Oq$k0" />
-                        <node concept="2XshWL" id="2BgB$z0LLkP" role="2OqNvi">
+                <node concept="1bVj0M" id="7Aoa2yVHgU$" role="37wK5m">
+                  <node concept="3clFbS" id="7Aoa2yVHgU_" role="1bW5cS">
+                    <node concept="3clFbF" id="7Aoa2yVHgUA" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Aoa2yVHgUB" role="3clFbG">
+                        <node concept="2WthIp" id="7Aoa2yVHgUC" role="2Oq$k0" />
+                        <node concept="2XshWL" id="7Aoa2yVHgUD" role="2OqNvi">
                           <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
                         </node>
                       </node>
@@ -561,7 +561,7 @@
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwVg" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHgUE" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -572,33 +572,33 @@
       <property role="TrG5h" value="Y_combinator" />
       <node concept="3cqZAl" id="6EwjVjWvyrX" role="3clF45" />
       <node concept="3clFbS" id="6EwjVjWvyrY" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbwVN" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbwVO" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwVP" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwVQ" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHhzU" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHhCC" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVHhCD" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVHhCE" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbWBe" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbWBf" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbWBg" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVHhCF" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVHhCG" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVHhCH" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbWBh" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbWBi" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVHhCI" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVHhCJ" role="2tJFKM">
                         <ref role="2aWVGs" to="ysck:1PL$JmLA85j" resolve="Y_combinator" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbWDf" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVHhCK" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="2BgB$z0LMIC" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVHhCL" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="2BgB$z0LMID" role="37wK5m">
-                  <node concept="3clFbS" id="2BgB$z0LMIE" role="1bW5cS">
-                    <node concept="3clFbF" id="2BgB$z0LMIF" role="3cqZAp">
-                      <node concept="2OqwBi" id="2BgB$z0LMIG" role="3clFbG">
-                        <node concept="2WthIp" id="2BgB$z0LMIH" role="2Oq$k0" />
-                        <node concept="2XshWL" id="2BgB$z0LMII" role="2OqNvi">
+                <node concept="1bVj0M" id="7Aoa2yVHhCM" role="37wK5m">
+                  <node concept="3clFbS" id="7Aoa2yVHhCN" role="1bW5cS">
+                    <node concept="3clFbF" id="7Aoa2yVHhCO" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Aoa2yVHhCP" role="3clFbG">
+                        <node concept="2WthIp" id="7Aoa2yVHhCQ" role="2Oq$k0" />
+                        <node concept="2XshWL" id="7Aoa2yVHhCR" role="2OqNvi">
                           <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
                         </node>
                       </node>
@@ -607,7 +607,7 @@
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbwVU" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHhCS" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -618,33 +618,33 @@
       <property role="TrG5h" value="DemoScopes" />
       <node concept="3cqZAl" id="1IKbs5XIs8H" role="3clF45" />
       <node concept="3clFbS" id="1IKbs5XIs8L" role="3clF47">
-        <node concept="2Hmddi" id="RcyXiSVPlH" role="3cqZAp">
-          <node concept="2OqwBi" id="RcyXiSVPlI" role="2Hmdds">
-            <node concept="2OqwBi" id="RcyXiSVPlJ" role="2Oq$k0">
-              <node concept="2YIFZM" id="RcyXiSVPlK" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHigS" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHilA" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVHilB" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVHilC" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="RcyXiSVPlL" role="37wK5m">
-                  <node concept="2WthIp" id="RcyXiSVPlM" role="2Oq$k0" />
-                  <node concept="2XshWL" id="RcyXiSVPlN" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVHilD" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVHilE" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVHilF" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="RcyXiSVPlO" role="2XxRq1">
-                      <node concept="ZC_QK" id="RcyXiSVPvg" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVHilG" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVHilH" role="2tJFKM">
                         <ref role="2aWVGs" to="ysck:JqEP$8t9fh" resolve="DemoScopes" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="RcyXiSVPlQ" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVHilI" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="73aHugggP6K" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVHilJ" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="73aHugggP6L" role="37wK5m">
-                  <node concept="3clFbS" id="73aHugggP6M" role="1bW5cS">
-                    <node concept="3clFbF" id="73aHugggP6N" role="3cqZAp">
-                      <node concept="2OqwBi" id="73aHugggP6O" role="3clFbG">
-                        <node concept="2WthIp" id="73aHugggP6P" role="2Oq$k0" />
-                        <node concept="2XshWL" id="73aHugggP6Q" role="2OqNvi">
+                <node concept="1bVj0M" id="7Aoa2yVHilK" role="37wK5m">
+                  <node concept="3clFbS" id="7Aoa2yVHilL" role="1bW5cS">
+                    <node concept="3clFbF" id="7Aoa2yVHilM" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Aoa2yVHilN" role="3clFbG">
+                        <node concept="2WthIp" id="7Aoa2yVHilO" role="2Oq$k0" />
+                        <node concept="2XshWL" id="7Aoa2yVHilP" role="2OqNvi">
                           <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
                         </node>
                       </node>
@@ -653,7 +653,7 @@
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="RcyXiSVPlS" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHilQ" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -697,36 +697,36 @@
             </node>
           </node>
         </node>
-        <node concept="1X3_iC" id="6DQTzHynsXa" role="lGtFl">
+        <node concept="1X3_iC" id="7Aoa2yVHk8f" role="lGtFl">
           <property role="3V$3am" value="statement" />
           <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="2Hmddi" id="47tET_Xohmu" role="8Wnug">
-            <node concept="2OqwBi" id="47tET_Xohmv" role="2Hmdds">
-              <node concept="2OqwBi" id="47tET_Xohmw" role="2Oq$k0">
-                <node concept="2YIFZM" id="47tET_Xohmx" role="2Oq$k0">
+          <node concept="3vwNmj" id="7Aoa2yVHjs9" role="8Wnug">
+            <node concept="2OqwBi" id="7Aoa2yVHjxP" role="3vwVQn">
+              <node concept="2OqwBi" id="7Aoa2yVHjxQ" role="2Oq$k0">
+                <node concept="2YIFZM" id="7Aoa2yVHjxR" role="2Oq$k0">
                   <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                   <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                  <node concept="2OqwBi" id="47tET_Xohmy" role="37wK5m">
-                    <node concept="2WthIp" id="47tET_Xohmz" role="2Oq$k0" />
-                    <node concept="2XshWL" id="47tET_Xohm$" role="2OqNvi">
+                  <node concept="2OqwBi" id="7Aoa2yVHjxS" role="37wK5m">
+                    <node concept="2WthIp" id="7Aoa2yVHjxT" role="2Oq$k0" />
+                    <node concept="2XshWL" id="7Aoa2yVHjxU" role="2OqNvi">
                       <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                      <node concept="2tJFMh" id="47tET_Xohm_" role="2XxRq1">
-                        <node concept="ZC_QK" id="47tET_XohUr" role="2tJFKM">
+                      <node concept="2tJFMh" id="7Aoa2yVHjxV" role="2XxRq1">
+                        <node concept="ZC_QK" id="7Aoa2yVHjxW" role="2tJFKM">
                           <ref role="2aWVGs" to="ysck:47tET_WGoBb" resolve="DemoTypeclasses" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="1jxXqW" id="47tET_XohmB" role="37wK5m" />
+                  <node concept="1jxXqW" id="7Aoa2yVHjxX" role="37wK5m" />
                 </node>
-                <node concept="liA8E" id="73aHuggheTU" role="2OqNvi">
+                <node concept="liA8E" id="7Aoa2yVHjxY" role="2OqNvi">
                   <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                  <node concept="1bVj0M" id="73aHuggheTV" role="37wK5m">
-                    <node concept="3clFbS" id="73aHuggheTW" role="1bW5cS">
-                      <node concept="3clFbF" id="73aHuggheTX" role="3cqZAp">
-                        <node concept="2OqwBi" id="73aHuggheTY" role="3clFbG">
-                          <node concept="2WthIp" id="73aHuggheTZ" role="2Oq$k0" />
-                          <node concept="2XshWL" id="73aHuggheU0" role="2OqNvi">
+                  <node concept="1bVj0M" id="7Aoa2yVHjxZ" role="37wK5m">
+                    <node concept="3clFbS" id="7Aoa2yVHjy0" role="1bW5cS">
+                      <node concept="3clFbF" id="7Aoa2yVHjy1" role="3cqZAp">
+                        <node concept="2OqwBi" id="7Aoa2yVHjy2" role="3clFbG">
+                          <node concept="2WthIp" id="7Aoa2yVHjy3" role="2Oq$k0" />
+                          <node concept="2XshWL" id="7Aoa2yVHjy4" role="2OqNvi">
                             <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
                           </node>
                         </node>
@@ -735,7 +735,7 @@
                   </node>
                 </node>
               </node>
-              <node concept="liA8E" id="47tET_XohmD" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVHjy5" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
               </node>
             </node>
@@ -747,33 +747,33 @@
       <property role="TrG5h" value="DemoConstraints" />
       <node concept="3cqZAl" id="47tET_XoiCw" role="3clF45" />
       <node concept="3clFbS" id="47tET_XoiCx" role="3clF47">
-        <node concept="2Hmddi" id="47tET_XoiCy" role="3cqZAp">
-          <node concept="2OqwBi" id="47tET_XoiCz" role="2Hmdds">
-            <node concept="2OqwBi" id="47tET_XoiC$" role="2Oq$k0">
-              <node concept="2YIFZM" id="47tET_XoiC_" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHkyb" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHkAT" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVHkAU" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVHkAV" role="2Oq$k0">
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="47tET_XoiCA" role="37wK5m">
-                  <node concept="2WthIp" id="47tET_XoiCB" role="2Oq$k0" />
-                  <node concept="2XshWL" id="47tET_XoiCC" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVHkAW" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVHkAX" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVHkAY" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="47tET_XoiCD" role="2XxRq1">
-                      <node concept="ZC_QK" id="47tET_Xoj9p" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVHkAZ" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVHkB0" role="2tJFKM">
                         <ref role="2aWVGs" to="ysck:2O9ahh6x9Cb" resolve="DemoConstraints" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="47tET_XoiCF" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVHkB1" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="73aHugghosD" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVHkB2" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="73aHugghosE" role="37wK5m">
-                  <node concept="3clFbS" id="73aHugghosF" role="1bW5cS">
-                    <node concept="3clFbF" id="73aHugghosG" role="3cqZAp">
-                      <node concept="2OqwBi" id="73aHugghosH" role="3clFbG">
-                        <node concept="2WthIp" id="73aHugghosI" role="2Oq$k0" />
-                        <node concept="2XshWL" id="73aHugghosJ" role="2OqNvi">
+                <node concept="1bVj0M" id="7Aoa2yVHkB3" role="37wK5m">
+                  <node concept="3clFbS" id="7Aoa2yVHkB4" role="1bW5cS">
+                    <node concept="3clFbF" id="7Aoa2yVHkB5" role="3cqZAp">
+                      <node concept="2OqwBi" id="7Aoa2yVHkB6" role="3clFbG">
+                        <node concept="2WthIp" id="7Aoa2yVHkB7" role="2Oq$k0" />
+                        <node concept="2XshWL" id="7Aoa2yVHkB8" role="2OqNvi">
                           <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
                         </node>
                       </node>
@@ -782,7 +782,7 @@
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="47tET_XoiCH" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHkB9" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures@tests.mps
index a5fd482b..d2678ef5 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures@tests.mps
@@ -99,8 +99,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -137,25 +137,25 @@
       <property role="TrG5h" value="literals" />
       <node concept="3cqZAl" id="7AyqXCdNg70" role="3clF45" />
       <node concept="3clFbS" id="7AyqXCdNg71" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxgE" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxgF" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxgG" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVG_yX" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVG_z1" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVG_z2" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfc1bY" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc1bZ" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc1c0" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVG_z3" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVG_z4" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVG_z5" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc1c1" role="2XxRq1">
-                    <node concept="ZC_QK" id="4yZzE4kyIno" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVG_z6" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVG_z7" role="2tJFKM">
                       <ref role="2aWVGs" to="anco:zb1Nk79_lP" resolve="ClosureLiterals" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfc1dX" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVG_z8" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxgJ" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVG_z9" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -166,25 +166,25 @@
       <property role="TrG5h" value="conversions" />
       <node concept="3cqZAl" id="4yZzE4kyI3k" role="3clF45" />
       <node concept="3clFbS" id="4yZzE4kyI3l" role="3clF47">
-        <node concept="2Hmddi" id="4yZzE4kyI3m" role="3cqZAp">
-          <node concept="2OqwBi" id="4yZzE4kyI3n" role="2Hmdds">
-            <node concept="2YIFZM" id="4yZzE4kyI3o" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVG_LV" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVG_NO" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVG_NP" role="2Oq$k0">
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="4yZzE4kyI3p" role="37wK5m">
-                <node concept="2WthIp" id="4yZzE4kyI3q" role="2Oq$k0" />
-                <node concept="2XshWL" id="4yZzE4kyI3r" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVG_NQ" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVG_NR" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVG_NS" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="4yZzE4kyI3s" role="2XxRq1">
-                    <node concept="ZC_QK" id="4yZzE4kyI3t" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVG_NT" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVG_NU" role="2tJFKM">
                       <ref role="2aWVGs" to="anco:4E290qQ09_i" resolve="ClosureConversions" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="4yZzE4kyI3u" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVG_NV" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="4yZzE4kyI3v" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVG_NW" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -195,25 +195,25 @@
       <property role="TrG5h" value="invocations" />
       <node concept="3cqZAl" id="4yZzE4kyIfR" role="3clF45" />
       <node concept="3clFbS" id="4yZzE4kyIfS" role="3clF47">
-        <node concept="2Hmddi" id="4yZzE4kyIfT" role="3cqZAp">
-          <node concept="2OqwBi" id="4yZzE4kyIfU" role="2Hmdds">
-            <node concept="2YIFZM" id="4yZzE4kyIfV" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGA0n" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGA2g" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGA2h" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="4yZzE4kyIfW" role="37wK5m">
-                <node concept="2WthIp" id="4yZzE4kyIfX" role="2Oq$k0" />
-                <node concept="2XshWL" id="4yZzE4kyIfY" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGA2i" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGA2j" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGA2k" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="4yZzE4kyIfZ" role="2XxRq1">
-                    <node concept="ZC_QK" id="4yZzE4kyIFO" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGA2l" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGA2m" role="2tJFKM">
                       <ref role="2aWVGs" to="anco:4S1mDSNPBsJ" resolve="ClosureInvocations" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="4yZzE4kyIg1" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGA2n" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="4yZzE4kyIg2" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGA2o" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -224,30 +224,30 @@
       <property role="TrG5h" value="literalsAndRecInvocations" />
       <node concept="3cqZAl" id="5QlJgjTF$RI" role="3clF45" />
       <node concept="3clFbS" id="5QlJgjTF$RJ" role="3clF47">
-        <node concept="2Hmddi" id="5QlJgjTF$RK" role="3cqZAp">
-          <node concept="2OqwBi" id="5QlJgjTF$RL" role="2Hmdds">
-            <node concept="2OqwBi" id="vrUbzkzQFI" role="2Oq$k0">
-              <node concept="2YIFZM" id="5QlJgjTF$RM" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGAgf" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGAj$" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVGAj_" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVGAjA" role="2Oq$k0">
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="5QlJgjTF$RN" role="37wK5m">
-                  <node concept="2WthIp" id="5QlJgjTF$RO" role="2Oq$k0" />
-                  <node concept="2XshWL" id="5QlJgjTF$RP" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVGAjB" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVGAjC" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVGAjD" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="5QlJgjTF$RQ" role="2XxRq1">
-                      <node concept="ZC_QK" id="5QlJgjTF_4C" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVGAjE" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVGAjF" role="2tJFKM">
                         <ref role="2aWVGs" to="anco:4yZzE4kOJc5" resolve="ClosureLiteralsInvoke" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="5QlJgjTF$RS" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVGAjG" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="vrUbzkzR2v" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVGAjH" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
             </node>
-            <node concept="liA8E" id="5QlJgjTF$RT" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGAjI" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -258,25 +258,25 @@
       <property role="TrG5h" value="functionalInterfaces" />
       <node concept="3cqZAl" id="4AYiKM_Sxft" role="3clF45" />
       <node concept="3clFbS" id="4AYiKM_Sxfx" role="3clF47">
-        <node concept="2Hmddi" id="4AYiKM_Sxjs" role="3cqZAp">
-          <node concept="2OqwBi" id="4AYiKM_Sxjt" role="2Hmdds">
-            <node concept="2YIFZM" id="4AYiKM_Sxju" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGA$f" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGAA5" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGAA6" role="2Oq$k0">
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="4AYiKM_Sxjv" role="37wK5m">
-                <node concept="2WthIp" id="4AYiKM_Sxjw" role="2Oq$k0" />
-                <node concept="2XshWL" id="4AYiKM_Sxjx" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGAA7" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGAA8" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGAA9" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="4AYiKM_Sxjy" role="2XxRq1">
-                    <node concept="ZC_QK" id="4AYiKM_Sxql" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGAAa" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGAAb" role="2tJFKM">
                       <ref role="2aWVGs" to="anco:4AYiKM_P$tr" resolve="FunctionalInterfaces" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="4AYiKM_Sxj$" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGAAc" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="4AYiKM_Sxj_" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGAAd" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps
index ace44731..33160b3b 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps
@@ -103,8 +103,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -149,25 +149,25 @@
       <property role="TrG5h" value="closuresAndSequence" />
       <node concept="3cqZAl" id="7u0sJ20Oy8y" role="3clF45" />
       <node concept="3clFbS" id="7u0sJ20Oy8z" role="3clF47">
-        <node concept="2Hmddi" id="7u0sJ20Oy8K" role="3cqZAp">
-          <node concept="2OqwBi" id="7u0sJ20Oy8T" role="2Hmdds">
-            <node concept="2YIFZM" id="7u0sJ20Oy92" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGASn" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGAUg" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGAUh" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="7u0sJ20Oy9g" role="37wK5m">
-                <node concept="2WthIp" id="7u0sJ20Oy9r" role="2Oq$k0" />
-                <node concept="2XshWL" id="7u0sJ20Oy9s" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGAUi" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGAUj" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGAUk" role="2OqNvi">
                   <ref role="2WH_rO" node="7u0sJ20Oy8x" resolve="resolve" />
-                  <node concept="2tJFMh" id="7u0sJ20Oy9A" role="2XxRq1">
-                    <node concept="ZC_QK" id="7u0sJ20OypT" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGAUl" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGAUm" role="2tJFKM">
                       <ref role="2aWVGs" to="kui3:4yZzE4kOzs1" resolve="ClosureSequence" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="7u0sJ20Oy9h" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGAUn" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="7u0sJ20Oy93" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGAUo" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -218,30 +218,30 @@
             </node>
           </node>
         </node>
-        <node concept="2Hmddi" id="5pvXCF9sDdG" role="3cqZAp">
-          <node concept="2OqwBi" id="5pvXCF9sDdH" role="2Hmdds">
-            <node concept="2OqwBi" id="2Qsys8cXsjI" role="2Oq$k0">
-              <node concept="2YIFZM" id="5pvXCF9sDdI" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGB60" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGB9l" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVGB9m" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVGB9n" role="2Oq$k0">
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="5pvXCF9sDdJ" role="37wK5m">
-                  <node concept="2WthIp" id="5pvXCF9sDdK" role="2Oq$k0" />
-                  <node concept="2XshWL" id="5pvXCF9sDdL" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVGB9o" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVGB9p" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVGB9q" role="2OqNvi">
                     <ref role="2WH_rO" node="7u0sJ20Oy8x" resolve="resolve" />
-                    <node concept="2tJFMh" id="5pvXCF9sDdM" role="2XxRq1">
-                      <node concept="ZC_QK" id="5pvXCF9sETl" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVGB9r" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVGB9s" role="2tJFKM">
                         <ref role="2aWVGs" to="kui3:554EtBHyc2K" resolve="ClosureParamInference" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="5pvXCF9sDdO" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVGB9t" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="2Qsys8cXstB" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVGB9u" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
             </node>
-            <node concept="liA8E" id="5pvXCF9sDdP" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGB9v" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.containers@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.containers@tests.mps
index f9b931a5..8efeb58c 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.containers@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.containers@tests.mps
@@ -104,8 +104,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -150,25 +150,25 @@
       <property role="TrG5h" value="creators" />
       <node concept="3cqZAl" id="1oUE7CX3Xkg" role="3clF45" />
       <node concept="3clFbS" id="1oUE7CX3Xkh" role="3clF47">
-        <node concept="2Hmddi" id="1oUE7CX3Xkm" role="3cqZAp">
-          <node concept="2OqwBi" id="1oUE7CX3Xkr" role="2Hmdds">
-            <node concept="2YIFZM" id="1oUE7CX3Xkw" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGBY0" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGBY4" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGBY5" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="1oUE7CX3XkA" role="37wK5m">
-                <node concept="2WthIp" id="1oUE7CX3XkD" role="2Oq$k0" />
-                <node concept="2XshWL" id="1oUE7CX3XkE" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGBY6" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGBY7" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGBY8" role="2OqNvi">
                   <ref role="2WH_rO" node="1oUE7CX3Xkf" resolve="resolve" />
-                  <node concept="2tJFMh" id="1oUE7CX3XkG" role="2XxRq1">
-                    <node concept="ZC_QK" id="1oUE7CX3XWk" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGBY9" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGBYa" role="2tJFKM">
                       <ref role="2aWVGs" to="a4lx:6BFOg89J450" resolve="CollectionCreators" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="1oUE7CX3XkB" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGBYb" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="1oUE7CX3Xkx" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGBYc" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -179,25 +179,25 @@
       <property role="TrG5h" value="conversions" />
       <node concept="3cqZAl" id="1oUE7CX3XYC" role="3clF45" />
       <node concept="3clFbS" id="1oUE7CX3XYD" role="3clF47">
-        <node concept="2Hmddi" id="1oUE7CX3XYE" role="3cqZAp">
-          <node concept="2OqwBi" id="1oUE7CX3XYF" role="2Hmdds">
-            <node concept="2YIFZM" id="1oUE7CX3XYG" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGCfN" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGCfR" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGCfS" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="1oUE7CX3XYH" role="37wK5m">
-                <node concept="2WthIp" id="1oUE7CX3XYI" role="2Oq$k0" />
-                <node concept="2XshWL" id="1oUE7CX3XYJ" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGCfT" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGCfU" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGCfV" role="2OqNvi">
                   <ref role="2WH_rO" node="1oUE7CX3Xkf" resolve="resolve" />
-                  <node concept="2tJFMh" id="1oUE7CX3XYK" role="2XxRq1">
-                    <node concept="ZC_QK" id="1oUE7CX3Y7O" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGCfW" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGCfX" role="2tJFKM">
                       <ref role="2aWVGs" to="a4lx:1oUE7CX3XS4" resolve="CollectionConversions" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="1oUE7CX3XYM" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGCfY" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="1oUE7CX3XYN" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGCfZ" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -208,25 +208,25 @@
       <property role="TrG5h" value="runimeTypes" />
       <node concept="3cqZAl" id="1oUE7CXgDhi" role="3clF45" />
       <node concept="3clFbS" id="1oUE7CXgDhj" role="3clF47">
-        <node concept="2Hmddi" id="1oUE7CXgDhk" role="3cqZAp">
-          <node concept="2OqwBi" id="1oUE7CXgDhl" role="2Hmdds">
-            <node concept="2YIFZM" id="1oUE7CXgDhm" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGCyU" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGC$N" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGC$O" role="2Oq$k0">
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="1oUE7CXgDhn" role="37wK5m">
-                <node concept="2WthIp" id="1oUE7CXgDho" role="2Oq$k0" />
-                <node concept="2XshWL" id="1oUE7CXgDhp" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGC$P" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGC$Q" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGC$R" role="2OqNvi">
                   <ref role="2WH_rO" node="1oUE7CX3Xkf" resolve="resolve" />
-                  <node concept="2tJFMh" id="1oUE7CXgDhq" role="2XxRq1">
-                    <node concept="ZC_QK" id="1oUE7CXgDry" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGC$S" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGC$T" role="2tJFKM">
                       <ref role="2aWVGs" to="a4lx:1oUE7CXdFUn" resolve="CollectionRuntimeTypes" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="1oUE7CXgDhs" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGC$U" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="1oUE7CXgDht" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGC$V" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -277,30 +277,30 @@
             </node>
           </node>
         </node>
-        <node concept="2Hmddi" id="3Z1xyIw63H0" role="3cqZAp">
-          <node concept="2OqwBi" id="3Z1xyIw63H1" role="2Hmdds">
-            <node concept="2OqwBi" id="2Qsys8cXsS3" role="2Oq$k0">
-              <node concept="2YIFZM" id="3Z1xyIw63H2" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGCSz" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGCVS" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVGCVT" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVGCVU" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="3Z1xyIw63H3" role="37wK5m">
-                  <node concept="2WthIp" id="3Z1xyIw63H4" role="2Oq$k0" />
-                  <node concept="2XshWL" id="3Z1xyIw63H5" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVGCVV" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVGCVW" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVGCVX" role="2OqNvi">
                     <ref role="2WH_rO" node="1oUE7CX3Xkf" resolve="resolve" />
-                    <node concept="2tJFMh" id="3Z1xyIw63H6" role="2XxRq1">
-                      <node concept="ZC_QK" id="3Z1xyIw63Vi" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVGCVY" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVGCVZ" role="2tJFKM">
                         <ref role="2aWVGs" to="a4lx:3Z1xyIvNBmG" resolve="SequenceOperations" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="3Z1xyIw63H8" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVGCW0" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="2Qsys8cXt0n" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVGCW1" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
             </node>
-            <node concept="liA8E" id="3Z1xyIw63H9" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGCW2" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -311,25 +311,25 @@
       <property role="TrG5h" value="operationsIterator" />
       <node concept="3cqZAl" id="3Z1xyIwvJIa" role="3clF45" />
       <node concept="3clFbS" id="3Z1xyIwvJIb" role="3clF47">
-        <node concept="2Hmddi" id="3Z1xyIwvJIc" role="3cqZAp">
-          <node concept="2OqwBi" id="3Z1xyIwvJId" role="2Hmdds">
-            <node concept="2YIFZM" id="3Z1xyIwvJIe" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGDgX" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGDiQ" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGDiR" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="3Z1xyIwvJIf" role="37wK5m">
-                <node concept="2WthIp" id="3Z1xyIwvJIg" role="2Oq$k0" />
-                <node concept="2XshWL" id="3Z1xyIwvJIh" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGDiS" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGDiT" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGDiU" role="2OqNvi">
                   <ref role="2WH_rO" node="1oUE7CX3Xkf" resolve="resolve" />
-                  <node concept="2tJFMh" id="3Z1xyIwvJIi" role="2XxRq1">
-                    <node concept="ZC_QK" id="3Z1xyIwvJXM" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGDiV" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGDiW" role="2tJFKM">
                       <ref role="2aWVGs" to="a4lx:3Z1xyIwv_hr" resolve="IteratorOperations" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="3Z1xyIwvJIk" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGDiX" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="3Z1xyIwvJIl" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGDiY" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -340,30 +340,30 @@
       <property role="TrG5h" value="operationsSequenceInternal" />
       <node concept="3cqZAl" id="3Z1xyIwome6" role="3clF45" />
       <node concept="3clFbS" id="3Z1xyIwome7" role="3clF47">
-        <node concept="2Hmddi" id="3Z1xyIwome8" role="3cqZAp">
-          <node concept="2OqwBi" id="3Z1xyIwome9" role="2Hmdds">
-            <node concept="2OqwBi" id="1uV2bz2ALVn" role="2Oq$k0">
-              <node concept="2YIFZM" id="3Z1xyIwomea" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGD_f" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGD_j" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVGD_k" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVGD_l" role="2Oq$k0">
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="3Z1xyIwomeb" role="37wK5m">
-                  <node concept="2WthIp" id="3Z1xyIwomec" role="2Oq$k0" />
-                  <node concept="2XshWL" id="3Z1xyIwomed" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVGD_m" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVGD_n" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVGD_o" role="2OqNvi">
                     <ref role="2WH_rO" node="1oUE7CX3Xkf" resolve="resolve" />
-                    <node concept="2tJFMh" id="3Z1xyIwomee" role="2XxRq1">
-                      <node concept="ZC_QK" id="3Z1xyIwomo6" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVGD_p" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVGD_q" role="2tJFKM">
                         <ref role="2aWVGs" to="a4lx:3Z1xyIwnLzW" resolve="InternalSequenceOperations" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="3Z1xyIwomeg" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVGD_r" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="1uV2bz2ANuK" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVGD_s" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
             </node>
-            <node concept="liA8E" id="3Z1xyIwomeh" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGD_t" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -374,25 +374,25 @@
       <property role="TrG5h" value="operationsMapAndSet" />
       <node concept="3cqZAl" id="3Z1xyIwvJnO" role="3clF45" />
       <node concept="3clFbS" id="3Z1xyIwvJnP" role="3clF47">
-        <node concept="2Hmddi" id="3Z1xyIwvJnQ" role="3cqZAp">
-          <node concept="2OqwBi" id="3Z1xyIwvJnR" role="2Hmdds">
-            <node concept="2YIFZM" id="3Z1xyIwvJnS" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGDW3" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGDXW" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGDXX" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="3Z1xyIwvJnT" role="37wK5m">
-                <node concept="2WthIp" id="3Z1xyIwvJnU" role="2Oq$k0" />
-                <node concept="2XshWL" id="3Z1xyIwvJnV" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGDXY" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGDXZ" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGDY0" role="2OqNvi">
                   <ref role="2WH_rO" node="1oUE7CX3Xkf" resolve="resolve" />
-                  <node concept="2tJFMh" id="3Z1xyIwvJnW" role="2XxRq1">
-                    <node concept="ZC_QK" id="3Z1xyIwvJ_1" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGDY1" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGDY2" role="2tJFKM">
                       <ref role="2aWVGs" to="a4lx:3Z1xyIwoUdh" resolve="MapAndSetOperations" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="3Z1xyIwvJnY" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGDY3" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="3Z1xyIwvJnZ" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGDY4" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -403,25 +403,25 @@
       <property role="TrG5h" value="forEachStatements" />
       <node concept="3cqZAl" id="3Z1xyIwzPls" role="3clF45" />
       <node concept="3clFbS" id="3Z1xyIwzPlt" role="3clF47">
-        <node concept="2Hmddi" id="3Z1xyIwzPlu" role="3cqZAp">
-          <node concept="2OqwBi" id="3Z1xyIwzPlv" role="2Hmdds">
-            <node concept="2YIFZM" id="3Z1xyIwzPlw" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGEd3" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGEeW" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGEeX" role="2Oq$k0">
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="3Z1xyIwzPlx" role="37wK5m">
-                <node concept="2WthIp" id="3Z1xyIwzPly" role="2Oq$k0" />
-                <node concept="2XshWL" id="3Z1xyIwzPlz" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGEeY" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGEeZ" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGEf0" role="2OqNvi">
                   <ref role="2WH_rO" node="1oUE7CX3Xkf" resolve="resolve" />
-                  <node concept="2tJFMh" id="3Z1xyIwzPl$" role="2XxRq1">
-                    <node concept="ZC_QK" id="3Z1xyIwzPz3" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGEf1" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGEf2" role="2tJFKM">
                       <ref role="2aWVGs" to="a4lx:3Z1xyIwzHo9" resolve="ForEachStatements" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="3Z1xyIwzPlA" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGEf3" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="3Z1xyIwzPlB" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGEf4" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -432,25 +432,25 @@
       <property role="TrG5h" value="customContainers" />
       <node concept="3cqZAl" id="1BcUSjg7f5z" role="3clF45" />
       <node concept="3clFbS" id="1BcUSjg7f5$" role="3clF47">
-        <node concept="2Hmddi" id="1BcUSjg7f5_" role="3cqZAp">
-          <node concept="2OqwBi" id="1BcUSjg7f5A" role="2Hmdds">
-            <node concept="2YIFZM" id="1BcUSjg7f5B" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGEvS" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGExL" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGExM" role="2Oq$k0">
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="1BcUSjg7f5C" role="37wK5m">
-                <node concept="2WthIp" id="1BcUSjg7f5D" role="2Oq$k0" />
-                <node concept="2XshWL" id="1BcUSjg7f5E" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGExN" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGExO" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGExP" role="2OqNvi">
                   <ref role="2WH_rO" node="1oUE7CX3Xkf" resolve="resolve" />
-                  <node concept="2tJFMh" id="1BcUSjg7f5F" role="2XxRq1">
-                    <node concept="ZC_QK" id="1BcUSjg7fjQ" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGExQ" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGExR" role="2tJFKM">
                       <ref role="2aWVGs" to="a4lx:1oUE7CXdweh" resolve="CustomContainersBasic" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="1BcUSjg7f5H" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGExS" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="1BcUSjg7f5I" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGExT" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -461,25 +461,25 @@
       <property role="TrG5h" value="customContainerDecls" />
       <node concept="3cqZAl" id="1BcUSjg7fF4" role="3clF45" />
       <node concept="3clFbS" id="1BcUSjg7fF5" role="3clF47">
-        <node concept="2Hmddi" id="1BcUSjg7fF6" role="3cqZAp">
-          <node concept="2OqwBi" id="1BcUSjg7fF7" role="2Hmdds">
-            <node concept="2YIFZM" id="1BcUSjg7fF8" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGEKS" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGENH" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGENI" role="2Oq$k0">
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="1BcUSjg7fF9" role="37wK5m">
-                <node concept="2WthIp" id="1BcUSjg7fFa" role="2Oq$k0" />
-                <node concept="2XshWL" id="1BcUSjg7fFb" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGENJ" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGENK" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGENL" role="2OqNvi">
                   <ref role="2WH_rO" node="1oUE7CX3Xkf" resolve="resolve" />
-                  <node concept="2tJFMh" id="1BcUSjg7fFc" role="2XxRq1">
-                    <node concept="ZC_QK" id="1BcUSjg7fSH" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGENM" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGENN" role="2tJFKM">
                       <ref role="2aWVGs" to="a4lx:1oUE7CXdF0A" resolve="TestCustomContainers" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="1BcUSjg7fFe" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGENO" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="1BcUSjg7fFf" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGENP" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -497,28 +497,28 @@
             </node>
           </node>
         </node>
-        <node concept="1X3_iC" id="1BcUSjg7IDq" role="lGtFl">
+        <node concept="1X3_iC" id="7Aoa2yVGFEn" role="lGtFl">
           <property role="3V$3am" value="statement" />
           <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="2Hmddi" id="1BcUSjg7Iqc" role="8Wnug">
-            <node concept="2OqwBi" id="1BcUSjg7Iqd" role="2Hmdds">
-              <node concept="2YIFZM" id="1BcUSjg7Iqe" role="2Oq$k0">
+          <node concept="3vwNmj" id="7Aoa2yVGFbO" role="8Wnug">
+            <node concept="2OqwBi" id="7Aoa2yVGFdH" role="3vwVQn">
+              <node concept="2YIFZM" id="7Aoa2yVGFdI" role="2Oq$k0">
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="1BcUSjg7Iqf" role="37wK5m">
-                  <node concept="2WthIp" id="1BcUSjg7Iqg" role="2Oq$k0" />
-                  <node concept="2XshWL" id="1BcUSjg7Iqh" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVGFdJ" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVGFdK" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVGFdL" role="2OqNvi">
                     <ref role="2WH_rO" node="1oUE7CX3Xkf" resolve="resolve" />
-                    <node concept="2tJFMh" id="1BcUSjg7Iqi" role="2XxRq1">
-                      <node concept="ZC_QK" id="1BcUSjgjWqc" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVGFdM" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVGFdN" role="2tJFKM">
                         <ref role="2aWVGs" to="a4lx:1BcUSjg7Ap9" resolve="DowncastExpr" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="1BcUSjg7Iqk" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVGFdO" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="1BcUSjg7Iql" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVGFdP" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
               </node>
             </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence@tests.mps
index 67a13d88..e480af41 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence@tests.mps
@@ -98,8 +98,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -136,25 +136,25 @@
       <property role="TrG5h" value="conversions" />
       <node concept="3cqZAl" id="7AyqXCdNg70" role="3clF45" />
       <node concept="3clFbS" id="7AyqXCdNg71" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxgE" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxgF" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxgG" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGG3h" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGG5a" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGG5b" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfc1bY" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc1bZ" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc1c0" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGG5c" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGG5d" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGG5e" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc1c1" role="2XxRq1">
-                    <node concept="ZC_QK" id="3MFPGC513WK" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGG5f" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGG5g" role="2tJFKM">
                       <ref role="2aWVGs" to="ymzf:3MFPGC50Izk" resolve="SequenceConversions" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfc1dX" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGG5h" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxgJ" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGG5i" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.code@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.code@tests.mps
index 55308cee..d5b195f5 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.code@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.code@tests.mps
@@ -107,8 +107,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -144,25 +144,25 @@
       <property role="TrG5h" value="boundsTypes" />
       <node concept="3cqZAl" id="6ZRhjsGgnas" role="3clF45" />
       <node concept="3clFbS" id="6ZRhjsGgnaw" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxgE" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxgF" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxgG" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGGpe" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGGr7" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGGr8" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="6ZRhjsGxPG_" role="37wK5m">
-                <node concept="2WthIp" id="6ZRhjsGxPGC" role="2Oq$k0" />
-                <node concept="2XshWL" id="6ZRhjsGxPGE" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGGr9" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGGra" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGGrb" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc1c1" role="2XxRq1">
-                    <node concept="ZC_QK" id="6ZRhjsGgHyP" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGGrc" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGGrd" role="2tJFKM">
                       <ref role="2aWVGs" to="ly4g:6ZRhjsGychG" resolve="BoundsTypes" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfc1dX" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGGre" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxgJ" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGGrf" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -173,25 +173,25 @@
       <property role="TrG5h" value="superReference" />
       <node concept="3cqZAl" id="6ZRhjsGy3XS" role="3clF45" />
       <node concept="3clFbS" id="6ZRhjsGy3XT" role="3clF47">
-        <node concept="2Hmddi" id="6ZRhjsGy3XU" role="3cqZAp">
-          <node concept="2OqwBi" id="6ZRhjsGy3XV" role="2Hmdds">
-            <node concept="2YIFZM" id="6ZRhjsGy3XW" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGGAf" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGGAj" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGGAk" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="6ZRhjsGy3XX" role="37wK5m">
-                <node concept="2WthIp" id="6ZRhjsGy3XY" role="2Oq$k0" />
-                <node concept="2XshWL" id="6ZRhjsGy3XZ" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGGAl" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGGAm" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGGAn" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="6ZRhjsGy3Y0" role="2XxRq1">
-                    <node concept="ZC_QK" id="6ZRhjsGy3Y1" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGGAo" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGGAp" role="2tJFKM">
                       <ref role="2aWVGs" to="ly4g:6ZRhjsGAf4Y" resolve="SuperReference" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6ZRhjsGy3Y2" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGGAq" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="6ZRhjsGy3Y3" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGGAr" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -202,25 +202,25 @@
       <property role="TrG5h" value="methodReferences" />
       <node concept="3cqZAl" id="6ZRhjsGANfR" role="3clF45" />
       <node concept="3clFbS" id="6ZRhjsGANfS" role="3clF47">
-        <node concept="2Hmddi" id="6ZRhjsGANfT" role="3cqZAp">
-          <node concept="2OqwBi" id="6ZRhjsGANfU" role="2Hmdds">
-            <node concept="2YIFZM" id="6ZRhjsGANfV" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGGMd" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGGO6" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGGO7" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="6ZRhjsGANfW" role="37wK5m">
-                <node concept="2WthIp" id="6ZRhjsGANfX" role="2Oq$k0" />
-                <node concept="2XshWL" id="6ZRhjsGANfY" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGGO8" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGGO9" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGGOa" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="6ZRhjsGANfZ" role="2XxRq1">
-                    <node concept="ZC_QK" id="6ZRhjsGANg0" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGGOb" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGGOc" role="2tJFKM">
                       <ref role="2aWVGs" to="ly4g:6ZRhjsGyfBW" resolve="MethodReferences" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6ZRhjsGANg1" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGGOd" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="6ZRhjsGANg2" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGGOe" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -231,25 +231,25 @@
       <property role="TrG5h" value="variableArity" />
       <node concept="3cqZAl" id="6ZRhjsGAQwq" role="3clF45" />
       <node concept="3clFbS" id="6ZRhjsGAQwr" role="3clF47">
-        <node concept="2Hmddi" id="6ZRhjsGAQws" role="3cqZAp">
-          <node concept="2OqwBi" id="6ZRhjsGAQwt" role="2Hmdds">
-            <node concept="2YIFZM" id="6ZRhjsGAQwu" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGGZe" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGH17" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGH18" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="6ZRhjsGAQwv" role="37wK5m">
-                <node concept="2WthIp" id="6ZRhjsGAQww" role="2Oq$k0" />
-                <node concept="2XshWL" id="6ZRhjsGAQwx" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGH19" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGH1a" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGH1b" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="6ZRhjsGAQwy" role="2XxRq1">
-                    <node concept="ZC_QK" id="6ZRhjsGAQwz" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGH1c" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGH1d" role="2tJFKM">
                       <ref role="2aWVGs" to="ly4g:6ZRhjsGAgSm" resolve="VariableArity" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6ZRhjsGAQw$" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGH1e" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="6ZRhjsGAQw_" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGH1f" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.features@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.features@tests.mps
index 0302adab..56ccf4e6 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.features@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.features@tests.mps
@@ -97,8 +97,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -197,25 +197,25 @@
       <property role="TrG5h" value="methodRefs" />
       <node concept="3cqZAl" id="6ZRhjsGgnas" role="3clF45" />
       <node concept="3clFbS" id="6ZRhjsGgnaw" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxgE" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxgF" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxgG" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGHgj" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGHic" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGHid" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="6ZRhjsGgDXv" role="37wK5m">
-                <node concept="2WthIp" id="6ZRhjsGgDXy" role="2Oq$k0" />
-                <node concept="2XshWL" id="6ZRhjsGgDX$" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGHie" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGHif" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGHig" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc1c1" role="2XxRq1">
-                    <node concept="ZC_QK" id="6ZRhjsGgHyP" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGHih" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGHii" role="2tJFKM">
                       <ref role="2aWVGs" to="6pez:6ZRhjsGbTok" resolve="MethodRefs" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfc1dX" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGHij" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxgJ" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGHik" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps
index 249790f4..0f7dc5e9 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps
@@ -99,8 +99,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -137,25 +137,25 @@
       <property role="TrG5h" value="tuples" />
       <node concept="3cqZAl" id="7AyqXCdNg70" role="3clF45" />
       <node concept="3clFbS" id="7AyqXCdNg71" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxgE" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxgF" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxgG" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGHv8" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGHx1" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGHx2" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfc1bY" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc1bZ" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc1c0" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGHx3" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGHx4" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGHx5" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc1c1" role="2XxRq1">
-                    <node concept="ZC_QK" id="4E290qQ0kDi" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGHx6" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGHx7" role="2tJFKM">
                       <ref role="2aWVGs" to="qwqz:4E290qQ09_i" resolve="DemoIndexedTuples" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfc1dX" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGHx8" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxgJ" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGHx9" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps
index 4ed58ef7..b6340ec5 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps
@@ -103,8 +103,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -263,30 +263,30 @@
             </node>
           </node>
         </node>
-        <node concept="2Hmddi" id="27bTNFfbxdu" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxdv" role="2Hmdds">
-            <node concept="2OqwBi" id="2Qsys8cXtjc" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbxdw" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGIi0" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGIll" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVGIlm" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVGIln" role="2Oq$k0">
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="27bTNFfc0ig" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfc0ih" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfc0ii" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVGIlo" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVGIlp" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVGIlq" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfc0ij" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfc0ik" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVGIlr" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVGIls" role="2tJFKM">
                         <ref role="2aWVGs" to="yg5v:5s5QomKHFub" resolve="IntByteConversion" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfc0kf" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVGIlt" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="2Qsys8cXtrs" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVGIlu" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbxdz" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGIlv" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -337,30 +337,30 @@
             </node>
           </node>
         </node>
-        <node concept="2Hmddi" id="27bTNFfbxe0" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxe1" role="2Hmdds">
-            <node concept="2OqwBi" id="2Qsys8cXt$d" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbxe2" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGINW" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGIRh" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVGIRi" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVGIRj" role="2Oq$k0">
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="27bTNFfc0DT" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfc0DU" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfc0DV" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVGIRk" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVGIRl" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVGIRm" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfc0DW" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfc0DX" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVGIRn" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVGIRo" role="2tJFKM">
                         <ref role="2aWVGs" to="yg5v:3Cu2imBSO5x" resolve="CharConversion" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfc0FS" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVGIRp" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="2Qsys8cXtGE" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVGIRq" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbxe5" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGIRr" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -371,25 +371,25 @@
       <property role="TrG5h" value="stringConversion" />
       <node concept="3cqZAl" id="2i6cuYQbqIT" role="3clF45" />
       <node concept="3clFbS" id="2i6cuYQbqIU" role="3clF47">
-        <node concept="2Hmddi" id="2i6cuYQbqIV" role="3cqZAp">
-          <node concept="2OqwBi" id="2i6cuYQbqIW" role="2Hmdds">
-            <node concept="2YIFZM" id="2i6cuYQbqIX" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGJks" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGJkw" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGJkx" role="2Oq$k0">
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="2i6cuYQbqIY" role="37wK5m">
-                <node concept="2WthIp" id="2i6cuYQbqIZ" role="2Oq$k0" />
-                <node concept="2XshWL" id="2i6cuYQbqJ0" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGJky" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGJkz" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGJk$" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="2i6cuYQbqJ1" role="2XxRq1">
-                    <node concept="ZC_QK" id="2i6cuYQbsm4" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGJk_" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGJkA" role="2tJFKM">
                       <ref role="2aWVGs" to="yg5v:2i6cuYQ8hzP" resolve="StringConversion" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="2i6cuYQbqJ3" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGJkB" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="2i6cuYQbqJ4" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGJkC" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -440,30 +440,30 @@
             </node>
           </node>
         </node>
-        <node concept="2Hmddi" id="27bTNFfbxey" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxez" role="2Hmdds">
-            <node concept="2OqwBi" id="2Qsys8cXtRe" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbxe$" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGJI8" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGJLt" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVGJLu" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVGJLv" role="2Oq$k0">
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="27bTNFfc0HJ" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfc0HK" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfc0HL" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVGJLw" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVGJLx" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVGJLy" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfc0HM" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfc0HN" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVGJLz" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVGJL$" role="2tJFKM">
                         <ref role="2aWVGs" to="yg5v:6EY0p2ylujy" resolve="IntShortConversion" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfc0JI" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVGJL_" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="2Qsys8cXu1T" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVGJLA" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbxeB" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGJLB" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -518,33 +518,33 @@
             </node>
           </node>
         </node>
-        <node concept="1X3_iC" id="1uV2bz44u37" role="lGtFl">
+        <node concept="1X3_iC" id="7Aoa2yVGL4W" role="lGtFl">
           <property role="3V$3am" value="statement" />
           <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="2Hmddi" id="27bTNFfbxf4" role="8Wnug">
-            <node concept="2OqwBi" id="27bTNFfbxf5" role="2Hmdds">
-              <node concept="2OqwBi" id="2hrSdN96b_y" role="2Oq$k0">
-                <node concept="2YIFZM" id="27bTNFfbxf6" role="2Oq$k0">
+          <node concept="3vwNmj" id="7Aoa2yVGKA_" role="8Wnug">
+            <node concept="2OqwBi" id="7Aoa2yVGKDU" role="3vwVQn">
+              <node concept="2OqwBi" id="7Aoa2yVGKDV" role="2Oq$k0">
+                <node concept="2YIFZM" id="7Aoa2yVGKDW" role="2Oq$k0">
                   <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                   <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                  <node concept="2OqwBi" id="27bTNFfc0L_" role="37wK5m">
-                    <node concept="2WthIp" id="27bTNFfc0LA" role="2Oq$k0" />
-                    <node concept="2XshWL" id="27bTNFfc0LB" role="2OqNvi">
+                  <node concept="2OqwBi" id="7Aoa2yVGKDX" role="37wK5m">
+                    <node concept="2WthIp" id="7Aoa2yVGKDY" role="2Oq$k0" />
+                    <node concept="2XshWL" id="7Aoa2yVGKDZ" role="2OqNvi">
                       <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                      <node concept="2tJFMh" id="27bTNFfc0LC" role="2XxRq1">
-                        <node concept="ZC_QK" id="27bTNFfc0LD" role="2tJFKM">
+                      <node concept="2tJFMh" id="7Aoa2yVGKE0" role="2XxRq1">
+                        <node concept="ZC_QK" id="7Aoa2yVGKE1" role="2tJFKM">
                           <ref role="2aWVGs" to="yg5v:2HYHa0WUDvm" resolve="GenericNewExpression" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="1jxXqW" id="27bTNFfc0N$" role="37wK5m" />
+                  <node concept="1jxXqW" id="7Aoa2yVGKE2" role="37wK5m" />
                 </node>
-                <node concept="liA8E" id="2hrSdN96hEW" role="2OqNvi">
+                <node concept="liA8E" id="7Aoa2yVGKE3" role="2OqNvi">
                   <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
                 </node>
               </node>
-              <node concept="liA8E" id="27bTNFfbxf9" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVGKE4" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
               </node>
             </node>
@@ -556,25 +556,25 @@
       <property role="TrG5h" value="instanceMethod" />
       <node concept="3cqZAl" id="6EY0p2x_00k" role="3clF45" />
       <node concept="3clFbS" id="6EY0p2x_00l" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxfA" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxfB" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxfC" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGLro" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGLth" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGLti" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfc0Pr" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc0Ps" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc0Pt" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGLtj" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGLtk" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGLtl" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc0Pu" role="2XxRq1">
-                    <node concept="ZC_QK" id="27bTNFfc0Pv" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGLtm" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGLtn" role="2tJFKM">
                       <ref role="2aWVGs" to="yg5v:6EY0p2wAiyu" resolve="InstanceMethod" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfc0Rq" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGLto" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxfF" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGLtp" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -585,25 +585,25 @@
       <property role="TrG5h" value="staticMethod" />
       <node concept="3cqZAl" id="6EY0p2yyMKp" role="3clF45" />
       <node concept="3clFbS" id="6EY0p2yyMKq" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxg8" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxg9" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxga" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGLOF" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGLQ$" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGLQ_" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfc188" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc189" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc18a" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGLQA" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGLQB" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGLQC" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc18b" role="2XxRq1">
-                    <node concept="ZC_QK" id="27bTNFfc18c" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGLQD" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGLQE" role="2tJFKM">
                       <ref role="2aWVGs" to="yg5v:6EY0p2ymmj_" resolve="StaticMethod" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfc1a7" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGLQF" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxgd" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGLQG" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -614,25 +614,25 @@
       <property role="TrG5h" value="loopAndConditionalStatements" />
       <node concept="3cqZAl" id="6KIXGIaSEhq" role="3clF45" />
       <node concept="3clFbS" id="6KIXGIaSEhr" role="3clF47">
-        <node concept="2Hmddi" id="6KIXGIaSEhs" role="3cqZAp">
-          <node concept="2OqwBi" id="6KIXGIaSEht" role="2Hmdds">
-            <node concept="2YIFZM" id="6KIXGIaSEhu" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGMfT" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGMhM" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGMhN" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="6KIXGIaSEhv" role="37wK5m">
-                <node concept="2WthIp" id="6KIXGIaSEhw" role="2Oq$k0" />
-                <node concept="2XshWL" id="6KIXGIaSEhx" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGMhO" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGMhP" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGMhQ" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="6KIXGIaSEhy" role="2XxRq1">
-                    <node concept="ZC_QK" id="6KIXGIaSEHA" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGMhR" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGMhS" role="2tJFKM">
                       <ref role="2aWVGs" to="yg5v:6KIXGIaNI5i" resolve="LoopAndConditionStatements" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6KIXGIaSEh$" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGMhT" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="6KIXGIaSEh_" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGMhU" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -643,25 +643,25 @@
       <property role="TrG5h" value="alternativeType" />
       <node concept="3cqZAl" id="ZJPHcufCSr" role="3clF45" />
       <node concept="3clFbS" id="ZJPHcufCSs" role="3clF47">
-        <node concept="2Hmddi" id="ZJPHcufCSt" role="3cqZAp">
-          <node concept="2OqwBi" id="ZJPHcufCSu" role="2Hmdds">
-            <node concept="2YIFZM" id="ZJPHcufCSv" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGO9S" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGObL" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGObM" role="2Oq$k0">
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="ZJPHcufCSw" role="37wK5m">
-                <node concept="2WthIp" id="ZJPHcufCSx" role="2Oq$k0" />
-                <node concept="2XshWL" id="ZJPHcufCSy" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGObN" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGObO" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGObP" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="ZJPHcufCSz" role="2XxRq1">
-                    <node concept="ZC_QK" id="ZJPHcufDg9" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGObQ" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGObR" role="2tJFKM">
                       <ref role="2aWVGs" to="yg5v:ZJPHcuc$ch" resolve="AltType" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="ZJPHcufCS_" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGObS" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="ZJPHcufCSA" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGObT" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -672,25 +672,25 @@
       <property role="TrG5h" value="operators" />
       <node concept="3cqZAl" id="2i6cuYQuHi9" role="3clF45" />
       <node concept="3clFbS" id="2i6cuYQuHia" role="3clF47">
-        <node concept="2Hmddi" id="2i6cuYQuHib" role="3cqZAp">
-          <node concept="2OqwBi" id="2i6cuYQuHic" role="2Hmdds">
-            <node concept="2YIFZM" id="2i6cuYQuHid" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGP9$" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGPbt" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGPbu" role="2Oq$k0">
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="2i6cuYQuHie" role="37wK5m">
-                <node concept="2WthIp" id="2i6cuYQuHif" role="2Oq$k0" />
-                <node concept="2XshWL" id="2i6cuYQuHig" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGPbv" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGPbw" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGPbx" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="2i6cuYQuHih" role="2XxRq1">
-                    <node concept="ZC_QK" id="2i6cuYQuHYu" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGPby" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGPbz" role="2tJFKM">
                       <ref role="2aWVGs" to="yg5v:2i6cuYQukZX" resolve="Operators" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="2i6cuYQuHij" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGPb$" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="2i6cuYQuHik" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGPb_" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -741,30 +741,30 @@
             </node>
           </node>
         </node>
-        <node concept="2Hmddi" id="27bTNFfbxgE" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxgF" role="2Hmdds">
-            <node concept="2OqwBi" id="2Qsys8cXub7" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbxgG" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGP$j" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGPBC" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVGPBD" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVGPBE" role="2Oq$k0">
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="27bTNFfc1bY" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfc1bZ" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfc1c0" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVGPBF" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVGPBG" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVGPBH" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfc1c1" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfc1c2" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVGPBI" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVGPBJ" role="2tJFKM">
                         <ref role="2aWVGs" to="yg5v:5XJPBczwaPg" resolve="PrimitiveTypes" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfc1dX" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVGPBK" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="2Qsys8cXujY" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVGPBL" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbxgJ" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGPBM" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -815,30 +815,30 @@
             </node>
           </node>
         </node>
-        <node concept="2Hmddi" id="3XUOzow_cBT" role="3cqZAp">
-          <node concept="2OqwBi" id="3XUOzow_cBU" role="2Hmdds">
-            <node concept="2OqwBi" id="2Qsys8cXuuc" role="2Oq$k0">
-              <node concept="2YIFZM" id="3XUOzow_cBV" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGQ4A" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGQ7V" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVGQ7W" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVGQ7X" role="2Oq$k0">
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="3XUOzow_cBW" role="37wK5m">
-                  <node concept="2WthIp" id="3XUOzow_cBX" role="2Oq$k0" />
-                  <node concept="2XshWL" id="3XUOzow_cBY" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVGQ7Y" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVGQ7Z" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVGQ80" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="3XUOzow_cBZ" role="2XxRq1">
-                      <node concept="ZC_QK" id="3XUOzow_eOE" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVGQ81" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVGQ82" role="2tJFKM">
                         <ref role="2aWVGs" to="yg5v:3XUOzowrzqi" resolve="RawConversions" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="3XUOzow_cC1" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVGQ83" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="2Qsys8cXuDh" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVGQ84" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
             </node>
-            <node concept="liA8E" id="3XUOzow_cC2" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGQ85" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -849,25 +849,25 @@
       <property role="TrG5h" value="arrayTypes" />
       <node concept="3cqZAl" id="Or3zaY2HY" role="3clF45" />
       <node concept="3clFbS" id="Or3zaY2HZ" role="3clF47">
-        <node concept="2Hmddi" id="Or3zaY2I0" role="3cqZAp">
-          <node concept="2OqwBi" id="Or3zaY2I1" role="2Hmdds">
-            <node concept="2YIFZM" id="Or3zaY2I3" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGQNO" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGQPH" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGQPI" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="Or3zaY2I4" role="37wK5m">
-                <node concept="2WthIp" id="Or3zaY2I5" role="2Oq$k0" />
-                <node concept="2XshWL" id="Or3zaY2I6" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGQPJ" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGQPK" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGQPL" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="Or3zaY2I7" role="2XxRq1">
-                    <node concept="ZC_QK" id="Or3zaY35I" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGQPM" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGQPN" role="2tJFKM">
                       <ref role="2aWVGs" to="yg5v:Or3zaY2v0" resolve="ArrayTypes" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="Or3zaY2I9" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGQPO" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="Or3zaY2Ib" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGQPP" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -878,25 +878,25 @@
       <property role="TrG5h" value="arraySubtyping" />
       <node concept="3cqZAl" id="2i6cuYQszS1" role="3clF45" />
       <node concept="3clFbS" id="2i6cuYQszS2" role="3clF47">
-        <node concept="2Hmddi" id="2i6cuYQszS3" role="3cqZAp">
-          <node concept="2OqwBi" id="2i6cuYQszS4" role="2Hmdds">
-            <node concept="2YIFZM" id="2i6cuYQszS5" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGRd7" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGRf0" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGRf1" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="2i6cuYQszS6" role="37wK5m">
-                <node concept="2WthIp" id="2i6cuYQszS7" role="2Oq$k0" />
-                <node concept="2XshWL" id="2i6cuYQszS8" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGRf2" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGRf3" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGRf4" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="2i6cuYQszS9" role="2XxRq1">
-                    <node concept="ZC_QK" id="2i6cuYQs$wm" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGRf5" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGRf6" role="2tJFKM">
                       <ref role="2aWVGs" to="yg5v:2i6cuYQqrTM" resolve="ArraySubtyping" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="2i6cuYQszSb" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGRf7" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="2i6cuYQszSc" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGRf8" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -907,25 +907,25 @@
       <property role="TrG5h" value="varargs" />
       <node concept="3cqZAl" id="1yt2T3T4T6V" role="3clF45" />
       <node concept="3clFbS" id="1yt2T3T4T6Z" role="3clF47">
-        <node concept="2Hmddi" id="1yt2T3T4TB9" role="3cqZAp">
-          <node concept="2OqwBi" id="1yt2T3T4TBa" role="2Hmdds">
-            <node concept="2YIFZM" id="1yt2T3T4TBb" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGRAq" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGRDs" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGRDt" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="1yt2T3T4TBc" role="37wK5m">
-                <node concept="2WthIp" id="1yt2T3T4TBd" role="2Oq$k0" />
-                <node concept="2XshWL" id="1yt2T3T4TBe" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGRDu" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGRDv" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGRDw" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="1yt2T3T4TBf" role="2XxRq1">
-                    <node concept="ZC_QK" id="1yt2T3T4TRz" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGRDx" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGRDy" role="2tJFKM">
                       <ref role="2aWVGs" to="yg5v:1yt2T3T4FOh" resolve="Varargs" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="1yt2T3T4TBh" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGRDz" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="1yt2T3T4TBi" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGRD$" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -936,25 +936,25 @@
       <property role="TrG5h" value="LUB" />
       <node concept="3cqZAl" id="PltxfHwhDD" role="3clF45" />
       <node concept="3clFbS" id="PltxfHwhDH" role="3clF47">
-        <node concept="2Hmddi" id="PltxfHwhRP" role="3cqZAp">
-          <node concept="2OqwBi" id="PltxfHwhRQ" role="2Hmdds">
-            <node concept="2YIFZM" id="PltxfHwhRR" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGS3h" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGS40" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGS41" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="PltxfHwhRS" role="37wK5m">
-                <node concept="2WthIp" id="PltxfHwhRT" role="2Oq$k0" />
-                <node concept="2XshWL" id="PltxfHwhRU" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGS42" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGS43" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGS44" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="PltxfHwhRV" role="2XxRq1">
-                    <node concept="ZC_QK" id="PltxfHwhYE" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGS45" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGS46" role="2tJFKM">
                       <ref role="2aWVGs" to="yg5v:2VOKs1ArylV" resolve="Lub" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="PltxfHwhRX" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGS47" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="PltxfHwhRY" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGS48" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -965,25 +965,25 @@
       <property role="TrG5h" value="enums" />
       <node concept="3cqZAl" id="6EK6UBPqaQ4" role="3clF45" />
       <node concept="3clFbS" id="6EK6UBPqaQ5" role="3clF47">
-        <node concept="2Hmddi" id="6EK6UBPqaQ6" role="3cqZAp">
-          <node concept="2OqwBi" id="6EK6UBPqaQ7" role="2Hmdds">
-            <node concept="2YIFZM" id="6EK6UBPqaQ8" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGSsc" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGStj" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGStk" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="6EK6UBPqaQ9" role="37wK5m">
-                <node concept="2WthIp" id="6EK6UBPqaQa" role="2Oq$k0" />
-                <node concept="2XshWL" id="6EK6UBPqaQb" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGStl" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGStm" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGStn" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="6EK6UBPqaQc" role="2XxRq1">
-                    <node concept="ZC_QK" id="6EK6UBPqbbP" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGSto" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGStp" role="2tJFKM">
                       <ref role="2aWVGs" to="yg5v:6EK6UBPoUUz" resolve="Enums" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6EK6UBPqaQe" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGStq" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="6EK6UBPqaQf" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGStr" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps
index 43d8d1fd..aba141be 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps
@@ -108,8 +108,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -218,25 +218,25 @@
       <property role="TrG5h" value="SimpleGenerics" />
       <node concept="3cqZAl" id="1N_0WA5DT8H" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxhc" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxhd" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxhe" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGTfV" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGThR" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGThS" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfbX4L" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfbX4M" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfbX4N" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGThT" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGThU" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGThV" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfbX4O" role="2XxRq1">
-                    <node concept="ZC_QK" id="27bTNFfbX4P" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGThW" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGThX" role="2tJFKM">
                       <ref role="2aWVGs" to="wqtl:3Qp4N06bAlL" resolve="SimpleGenerics" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfbX6K" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGThY" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxhh" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGThZ" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -250,25 +250,25 @@
       <property role="TrG5h" value="SimpleGenerics2" />
       <node concept="3cqZAl" id="1N_0WA5JFrO" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5JFrP" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxhI" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxhJ" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxhK" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGT_c" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGT_g" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGT_h" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfbX8B" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfbX8C" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfbX8D" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGT_i" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGT_j" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGT_k" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfbX8E" role="2XxRq1">
-                    <node concept="ZC_QK" id="27bTNFfbX8F" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGT_l" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGT_m" role="2tJFKM">
                       <ref role="2aWVGs" to="wqtl:623frvF_qs8" resolve="SimpleGenerics2" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfbXaA" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGT_n" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxhN" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGT_o" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -282,25 +282,25 @@
       <property role="TrG5h" value="NestedGenerics" />
       <node concept="3cqZAl" id="2i6cuYR69K4" role="3clF45" />
       <node concept="3clFbS" id="2i6cuYR69K5" role="3clF47">
-        <node concept="2Hmddi" id="2i6cuYR69K6" role="3cqZAp">
-          <node concept="2OqwBi" id="2i6cuYR69K7" role="2Hmdds">
-            <node concept="2YIFZM" id="2i6cuYR69K8" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGTSE" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGTUA" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGTUB" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="2i6cuYR69K9" role="37wK5m">
-                <node concept="2WthIp" id="2i6cuYR69Ka" role="2Oq$k0" />
-                <node concept="2XshWL" id="2i6cuYR69Kb" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGTUC" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGTUD" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGTUE" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="2i6cuYR69Kc" role="2XxRq1">
-                    <node concept="ZC_QK" id="2i6cuYR6ai2" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGTUF" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGTUG" role="2tJFKM">
                       <ref role="2aWVGs" to="wqtl:2i6cuYR5KJp" resolve="NestedGenerics" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="2i6cuYR69Ke" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGTUH" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="2i6cuYR69Kf" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGTUI" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -354,29 +354,29 @@
             </node>
           </node>
         </node>
-        <node concept="2Hmddi" id="27bTNFfbxig" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxih" role="2Hmdds">
-            <node concept="liA8E" id="27bTNFfbxil" role="2OqNvi">
+        <node concept="3vwNmj" id="7Aoa2yVGUci" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGUfE" role="3vwVQn">
+            <node concept="liA8E" id="7Aoa2yVGUfF" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
-            <node concept="2OqwBi" id="2Qsys8cXvfc" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbxii" role="2Oq$k0">
+            <node concept="2OqwBi" id="7Aoa2yVGUfG" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVGUfH" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfc4Cj" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfc4Ck" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfc4Cl" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVGUfI" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVGUfJ" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVGUfK" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfc4Cm" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfc4Cn" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVGUfL" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVGUfM" role="2tJFKM">
                         <ref role="2aWVGs" to="wqtl:61vfVfpb5w1" resolve="ComplexTypeErasure" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfc4Ei" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVGUfN" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="2Qsys8cXvm6" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVGUfO" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
             </node>
@@ -391,25 +391,25 @@
       <property role="TrG5h" value="GenericSubst" />
       <node concept="3cqZAl" id="1N_0WA5JGiw" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5JGix" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxiM" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxiN" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxiO" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGUAq" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGUAu" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGUAv" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfc4G9" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc4Ga" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc4Gb" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGUAw" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGUAx" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGUAy" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc4Gc" role="2XxRq1">
-                    <node concept="ZC_QK" id="27bTNFfc4Gd" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGUAz" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGUA$" role="2tJFKM">
                       <ref role="2aWVGs" to="wqtl:61vfVfp6EBu" resolve="GenericSubst" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfc4I8" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGUA_" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxiR" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGUAA" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -463,30 +463,30 @@
             </node>
           </node>
         </node>
-        <node concept="2Hmddi" id="2PEDwPSdjJk" role="3cqZAp">
-          <node concept="2OqwBi" id="2PEDwPSdjJl" role="2Hmdds">
-            <node concept="2OqwBi" id="37RykZK7pCQ" role="2Oq$k0">
-              <node concept="2YIFZM" id="2PEDwPSdjJm" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGUVk" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGUVo" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVGUVp" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVGUVq" role="2Oq$k0">
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="2PEDwPSdjJn" role="37wK5m">
-                  <node concept="2WthIp" id="2PEDwPSdjJo" role="2Oq$k0" />
-                  <node concept="2XshWL" id="2PEDwPSdjJp" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVGUVr" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVGUVs" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVGUVt" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="2PEDwPSdjJq" role="2XxRq1">
-                      <node concept="ZC_QK" id="2PEDwPSdkaa" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVGUVu" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVGUVv" role="2tJFKM">
                         <ref role="2aWVGs" to="wqtl:2PEDwPSdaaD" resolve="Containment" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="2PEDwPSdjJs" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVGUVw" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="37RykZK7q_R" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVGUVx" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
             </node>
-            <node concept="liA8E" id="37RykZK7qFK" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGUVy" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -497,25 +497,25 @@
       <property role="TrG5h" value="Variance" />
       <node concept="3cqZAl" id="5DSQNPPS8E9" role="3clF45" />
       <node concept="3clFbS" id="5DSQNPPS8Ea" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxnq" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxnr" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxns" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGVjB" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGVkO" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGVkP" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfc3Qp" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc3Qq" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc3Qr" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGVkQ" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGVkR" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGVkS" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc3Qs" role="2XxRq1">
-                    <node concept="ZC_QK" id="27bTNFfc3Qt" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGVkT" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGVkU" role="2tJFKM">
                       <ref role="2aWVGs" to="wqtl:3yhgKRJ29Qs" resolve="Variance" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfc3So" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGVkV" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxnv" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGVkW" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -529,25 +529,25 @@
       <property role="TrG5h" value="Recursion" />
       <node concept="3cqZAl" id="19nQ_7V2D9V" role="3clF45" />
       <node concept="3clFbS" id="19nQ_7V2D9W" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxnW" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxnX" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxnY" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGVI$" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGVIC" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGVID" role="2Oq$k0">
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="27bTNFfc3Uf" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc3Ug" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc3Uh" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGVIE" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGVIF" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGVIG" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc3Ui" role="2XxRq1">
-                    <node concept="ZC_QK" id="27bTNFfc3Uj" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGVIH" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGVII" role="2tJFKM">
                       <ref role="2aWVGs" to="wqtl:7w387SKGv4P" resolve="Recursion" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfc3We" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGVIJ" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxo1" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGVIK" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -561,25 +561,25 @@
       <property role="TrG5h" value="Bounds" />
       <node concept="3cqZAl" id="1TH_SRmLuzj" role="3clF45" />
       <node concept="3clFbS" id="1TH_SRmLuzk" role="3clF47">
-        <node concept="2Hmddi" id="1TH_SRmLuzl" role="3cqZAp">
-          <node concept="2OqwBi" id="1TH_SRmLuzm" role="2Hmdds">
-            <node concept="2YIFZM" id="1TH_SRmLuzn" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGW6I" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGW6M" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGW6N" role="2Oq$k0">
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="1TH_SRmLuzo" role="37wK5m">
-                <node concept="2WthIp" id="1TH_SRmLuzp" role="2Oq$k0" />
-                <node concept="2XshWL" id="1TH_SRmLuzq" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGW6O" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGW6P" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGW6Q" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="1TH_SRmLuzr" role="2XxRq1">
-                    <node concept="ZC_QK" id="1TH_SRmLvZX" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGW6R" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGW6S" role="2tJFKM">
                       <ref role="2aWVGs" to="wqtl:1TH_SRmEWFy" resolve="Bounds" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="1TH_SRmLuzt" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGW6T" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="1TH_SRmLuzu" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGW6U" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -593,25 +593,25 @@
       <property role="TrG5h" value="Capture" />
       <node concept="3cqZAl" id="3fECE2uRocw" role="3clF45" />
       <node concept="3clFbS" id="3fECE2uRocx" role="3clF47">
-        <node concept="2Hmddi" id="3fECE2uRocy" role="3cqZAp">
-          <node concept="2OqwBi" id="3fECE2uRocz" role="2Hmdds">
-            <node concept="2YIFZM" id="3fECE2uRoc$" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGWsy" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGWuu" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGWuv" role="2Oq$k0">
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="3fECE2uRoc_" role="37wK5m">
-                <node concept="2WthIp" id="3fECE2uRocA" role="2Oq$k0" />
-                <node concept="2XshWL" id="3fECE2uRocB" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGWuw" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGWux" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGWuy" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="3fECE2uRocC" role="2XxRq1">
-                    <node concept="ZC_QK" id="3fECE2uRoD3" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGWuz" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGWu$" role="2tJFKM">
                       <ref role="2aWVGs" to="wqtl:3fECE2uQCW6" resolve="Capture" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="3fECE2uRocE" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGWu_" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="3fECE2uRocF" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGWuA" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -625,25 +625,25 @@
       <property role="TrG5h" value="ReturnTypeVariance" />
       <node concept="3cqZAl" id="771syFLhdnF" role="3clF45" />
       <node concept="3clFbS" id="771syFLhdnG" role="3clF47">
-        <node concept="2Hmddi" id="771syFLhdnH" role="3cqZAp">
-          <node concept="2OqwBi" id="771syFLhdnI" role="2Hmdds">
-            <node concept="2YIFZM" id="771syFLhdnJ" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGWL6" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGWN2" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGWN3" role="2Oq$k0">
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="771syFLhdnK" role="37wK5m">
-                <node concept="2WthIp" id="771syFLhdnL" role="2Oq$k0" />
-                <node concept="2XshWL" id="771syFLhdnM" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGWN4" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGWN5" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGWN6" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="771syFLhdnN" role="2XxRq1">
-                    <node concept="ZC_QK" id="771syFLhdGD" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGWN7" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGWN8" role="2tJFKM">
                       <ref role="2aWVGs" to="wqtl:7lCg3YbuczX" resolve="RetTyVariance" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="771syFLhdnP" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGWN9" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="771syFLhdnQ" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGWNa" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -657,25 +657,25 @@
       <property role="TrG5h" value="OverridingAndErasure" />
       <node concept="3cqZAl" id="6_5E9TNFq_Z" role="3clF45" />
       <node concept="3clFbS" id="6_5E9TNFqA0" role="3clF47">
-        <node concept="2Hmddi" id="6_5E9TNFqA1" role="3cqZAp">
-          <node concept="2OqwBi" id="6_5E9TNFqA2" role="2Hmdds">
-            <node concept="2YIFZM" id="6_5E9TNFqA3" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGX5E" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGX5I" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGX5J" role="2Oq$k0">
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="6_5E9TNFqA4" role="37wK5m">
-                <node concept="2WthIp" id="6_5E9TNFqA5" role="2Oq$k0" />
-                <node concept="2XshWL" id="6_5E9TNFqA6" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGX5K" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGX5L" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGX5M" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="6_5E9TNFqA7" role="2XxRq1">
-                    <node concept="ZC_QK" id="6_5E9TNFtnf" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGX5N" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGX5O" role="2tJFKM">
                       <ref role="2aWVGs" to="wqtl:6_5E9TNDqeq" resolve="MethodOverridingAndErasure" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6_5E9TNFqA9" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGX5P" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="6_5E9TNFqAa" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGX5Q" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.staging@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.staging@tests.mps
index b05b9941..a6725966 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.staging@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.staging@tests.mps
@@ -104,8 +104,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -205,25 +205,25 @@
       <property role="TrG5h" value="StaticMethodInference" />
       <node concept="3cqZAl" id="1N_0WA5DT8H" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxhc" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxhd" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxhe" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGXtf" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGXtj" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGXtk" role="2Oq$k0">
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-              <node concept="2OqwBi" id="27bTNFfbX4L" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfbX4M" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfbX4N" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGXtl" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGXtm" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGXtn" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfbX4O" role="2XxRq1">
-                    <node concept="ZC_QK" id="68TJRU2gQT8" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGXto" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGXtp" role="2tJFKM">
                       <ref role="2aWVGs" to="uku4:5XJPBczunKj" resolve="StaticMethodInference" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfbX6K" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGXtq" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxhh" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGXtr" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.thinlet@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.thinlet@tests.mps
index 5e4054c2..1c60c405 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.thinlet@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.thinlet@tests.mps
@@ -127,8 +127,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
@@ -253,28 +253,28 @@
                 <property role="Xl_RC" value="*** Test is temporarily disabled as it's taking too long to complete ***" />
               </node>
             </node>
-            <node concept="1X3_iC" id="ssyHzE_YvH" role="lGtFl">
+            <node concept="1X3_iC" id="7Aoa2yVGYfM" role="lGtFl">
               <property role="3V$3am" value="statement" />
               <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-              <node concept="2Hmddi" id="27bTNFfbxko" role="8Wnug">
-                <node concept="2OqwBi" id="27bTNFfbxkp" role="2Hmdds">
-                  <node concept="2YIFZM" id="27bTNFfbxkq" role="2Oq$k0">
+              <node concept="3vwNmj" id="7Aoa2yVGXIK" role="8Wnug">
+                <node concept="2OqwBi" id="7Aoa2yVGXIO" role="3vwVQn">
+                  <node concept="2YIFZM" id="7Aoa2yVGXIP" role="2Oq$k0">
                     <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                     <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                    <node concept="2OqwBi" id="27bTNFfc4bs" role="37wK5m">
-                      <node concept="2WthIp" id="27bTNFfc4bt" role="2Oq$k0" />
-                      <node concept="2XshWL" id="27bTNFfc4bu" role="2OqNvi">
+                    <node concept="2OqwBi" id="7Aoa2yVGXIQ" role="37wK5m">
+                      <node concept="2WthIp" id="7Aoa2yVGXIR" role="2Oq$k0" />
+                      <node concept="2XshWL" id="7Aoa2yVGXIS" role="2OqNvi">
                         <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                        <node concept="2tJFMh" id="27bTNFfc4bv" role="2XxRq1">
-                          <node concept="ZC_QK" id="27bTNFfc4bw" role="2tJFKM">
+                        <node concept="2tJFMh" id="7Aoa2yVGXIT" role="2XxRq1">
+                          <node concept="ZC_QK" id="7Aoa2yVGXIU" role="2tJFKM">
                             <ref role="2aWVGs" to="bm3g:3489cc5$luO" resolve="Thinlet" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="1jxXqW" id="27bTNFfc4ds" role="37wK5m" />
+                    <node concept="1jxXqW" id="7Aoa2yVGXIV" role="37wK5m" />
                   </node>
-                  <node concept="liA8E" id="27bTNFfbxkt" role="2OqNvi">
+                  <node concept="liA8E" id="7Aoa2yVGXIW" role="2OqNvi">
                     <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
                   </node>
                 </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code@tests.mps b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code@tests.mps
index 4dbcda13..c282298d 100644
--- a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code@tests.mps
@@ -103,8 +103,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -204,25 +204,25 @@
       <property role="TrG5h" value="conversions" />
       <node concept="3cqZAl" id="3bgqfmmMXF1" role="3clF45" />
       <node concept="3clFbS" id="3bgqfmmMXF5" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxdu" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxdv" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxdw" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGZ86" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGZ9Z" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGZa0" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfc0ig" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc0ih" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc0ii" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGZa1" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGZa2" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGZa3" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="3bgqfmmN1aO" role="2XxRq1">
-                    <node concept="ZC_QK" id="3bgqfmmN1bK" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGZa4" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGZa5" role="2tJFKM">
                       <ref role="2aWVGs" to="ar5v:3bgqfmmMWJj" resolve="Conversions" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfc0kf" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGZa6" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxdz" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGZa7" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -233,25 +233,25 @@
       <property role="TrG5h" value="streams" />
       <node concept="3cqZAl" id="72yxqve1rRM" role="3clF45" />
       <node concept="3clFbS" id="72yxqve1rRN" role="3clF47">
-        <node concept="2Hmddi" id="72yxqve1rRO" role="3cqZAp">
-          <node concept="2OqwBi" id="72yxqve1rRP" role="2Hmdds">
-            <node concept="2YIFZM" id="72yxqve1rRQ" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGZmK" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGZoD" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGZoE" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="72yxqve1rRR" role="37wK5m">
-                <node concept="2WthIp" id="72yxqve1rRS" role="2Oq$k0" />
-                <node concept="2XshWL" id="72yxqve1rRT" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGZoF" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGZoG" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGZoH" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="72yxqve1rRU" role="2XxRq1">
-                    <node concept="ZC_QK" id="72yxqve1rT9" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGZoI" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGZoJ" role="2tJFKM">
                       <ref role="2aWVGs" to="ar5v:7hlgk9K_dCC" resolve="Streams" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="72yxqve1rRW" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGZoK" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="72yxqve1rRX" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGZoL" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -262,25 +262,25 @@
       <property role="TrG5h" value="misc" />
       <node concept="3cqZAl" id="vp2bUKkYuf" role="3clF45" />
       <node concept="3clFbS" id="vp2bUKkYug" role="3clF47">
-        <node concept="2Hmddi" id="vp2bUKkYuh" role="3cqZAp">
-          <node concept="2OqwBi" id="vp2bUKkYui" role="2Hmdds">
-            <node concept="2YIFZM" id="vp2bUKkYuj" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGZzL" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGZ_E" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGZ_F" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="vp2bUKkYuk" role="37wK5m">
-                <node concept="2WthIp" id="vp2bUKkYul" role="2Oq$k0" />
-                <node concept="2XshWL" id="vp2bUKkYum" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGZ_G" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGZ_H" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGZ_I" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="vp2bUKkYun" role="2XxRq1">
-                    <node concept="ZC_QK" id="vp2bUKkYuo" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGZ_J" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGZ_K" role="2tJFKM">
                       <ref role="2aWVGs" to="ar5v:6EJsc2LuFkC" resolve="Misc" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="vp2bUKkYup" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGZ_L" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="vp2bUKkYuq" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGZ_M" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -291,25 +291,25 @@
       <property role="TrG5h" value="intersection" />
       <node concept="3cqZAl" id="vp2bUKkZIY" role="3clF45" />
       <node concept="3clFbS" id="vp2bUKkZIZ" role="3clF47">
-        <node concept="2Hmddi" id="vp2bUKkZJ0" role="3cqZAp">
-          <node concept="2OqwBi" id="vp2bUKkZJ1" role="2Hmdds">
-            <node concept="2YIFZM" id="vp2bUKkZJ2" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVGZKM" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVGZKQ" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVGZKR" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="vp2bUKkZJ3" role="37wK5m">
-                <node concept="2WthIp" id="vp2bUKkZJ4" role="2Oq$k0" />
-                <node concept="2XshWL" id="vp2bUKkZJ5" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVGZKS" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVGZKT" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVGZKU" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="vp2bUKkZJ6" role="2XxRq1">
-                    <node concept="ZC_QK" id="vp2bUKkZJ7" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVGZKV" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVGZKW" role="2tJFKM">
                       <ref role="2aWVGs" to="ar5v:vp2bUKkYnm" resolve="Intersection" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="vp2bUKkZJ8" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVGZKX" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="vp2bUKkZJ9" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVGZKY" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps
index 13c1ca57..be81639a 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps
@@ -108,8 +108,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -210,25 +210,25 @@
       <property role="TrG5h" value="Sample" />
       <node concept="3cqZAl" id="1N_0WA5DT8H" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxmm" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxmn" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxmo" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHlMa" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHlMe" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVHlMf" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfc3IH" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc3II" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc3IJ" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVHlMg" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVHlMh" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVHlMi" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc3IK" role="2XxRq1">
-                    <node concept="ZC_QK" id="27bTNFfc3IL" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVHlMj" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVHlMk" role="2tJFKM">
                       <ref role="2aWVGs" to="f6t6:5s497Vrh6EY" resolve="Sample" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfc3KG" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVHlMl" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxmr" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHlMm" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -242,25 +242,25 @@
       <property role="TrG5h" value="Sample2" />
       <node concept="3cqZAl" id="1N_0WA5J$AE" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5J$AF" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxmS" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxmT" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxmU" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHmgE" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHmiQ" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVHmiR" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfc3Mz" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc3M$" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc3M_" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVHmiS" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVHmiT" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVHmiU" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc3MA" role="2XxRq1">
-                    <node concept="ZC_QK" id="27bTNFfc3MB" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVHmiV" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVHmiW" role="2tJFKM">
                       <ref role="2aWVGs" to="f6t6:2U6QFnZujaA" resolve="Sample2" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfc3Oy" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVHmiX" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxmX" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHmiY" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -274,25 +274,25 @@
       <property role="TrG5h" value="Variance" />
       <node concept="3cqZAl" id="1TH_SRmNb8$" role="3clF45" />
       <node concept="3clFbS" id="1TH_SRmNb8_" role="3clF47">
-        <node concept="2Hmddi" id="1TH_SRmNb8A" role="3cqZAp">
-          <node concept="2OqwBi" id="1TH_SRmNb8B" role="2Hmdds">
-            <node concept="2YIFZM" id="1TH_SRmNb8C" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHn2c" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHn4o" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVHn4p" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="1TH_SRmNb8D" role="37wK5m">
-                <node concept="2WthIp" id="1TH_SRmNb8E" role="2Oq$k0" />
-                <node concept="2XshWL" id="1TH_SRmNb8F" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVHn4q" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVHn4r" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVHn4s" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="1TH_SRmNb8G" role="2XxRq1">
-                    <node concept="ZC_QK" id="1TH_SRmNcwm" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVHn4t" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVHn4u" role="2tJFKM">
                       <ref role="2aWVGs" to="f6t6:3yhgKRJ29Qs" resolve="Variance" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="1TH_SRmNb8I" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVHn4v" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="1TH_SRmNb8J" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHn4w" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
index a23126f8..f6a337f9 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
@@ -108,8 +108,8 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
+      <concept id="1171981022339" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertTrue" flags="nn" index="3vwNmj">
+        <child id="1171981057159" name="condition" index="3vwVQn" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -258,30 +258,30 @@
             </node>
           </node>
         </node>
-        <node concept="2Hmddi" id="27bTNFfbxkQ" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxkR" role="2Hmdds">
-            <node concept="2OqwBi" id="2Qsys8cXvBo" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbxkS" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHnNl" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHnQH" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVHnQI" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVHnQJ" role="2Oq$k0">
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="27bTNFfc5Qu" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfc5Qx" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfc5Qz" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVHnQK" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVHnQL" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVHnQM" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfc5Se" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfc5Sf" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVHnQN" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVHnQO" role="2tJFKM">
                         <ref role="2aWVGs" to="bs09:3Qp4N06bAlL" resolve="HelloWorld" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="27bTNFfc4fk" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVHnQP" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="2Qsys8cXvGe" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVHnQQ" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
             </node>
-            <node concept="liA8E" id="27bTNFfbxkV" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHnQR" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -295,25 +295,25 @@
       <property role="TrG5h" value="TestInheritance" />
       <node concept="3cqZAl" id="7$Xw2YtL_l1" role="3clF45" />
       <node concept="3clFbS" id="7$Xw2YtL_l2" role="3clF47">
-        <node concept="2Hmddi" id="27bTNFfbxlk" role="3cqZAp">
-          <node concept="2OqwBi" id="27bTNFfbxll" role="2Hmdds">
-            <node concept="2YIFZM" id="27bTNFfbxlm" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHo7u" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHo7y" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVHo7z" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="27bTNFfc6bq" role="37wK5m">
-                <node concept="2WthIp" id="27bTNFfc6bt" role="2Oq$k0" />
-                <node concept="2XshWL" id="27bTNFfc6bv" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVHo7$" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVHo7_" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVHo7A" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="27bTNFfc6da" role="2XxRq1">
-                    <node concept="ZC_QK" id="27bTNFfc6db" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVHo7B" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVHo7C" role="2tJFKM">
                       <ref role="2aWVGs" to="bs09:4$OyT8IR$52" resolve="TestInheritance" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="27bTNFfc4oU" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVHo7D" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="27bTNFfbxlp" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHo7E" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -367,30 +367,30 @@
             </node>
           </node>
         </node>
-        <node concept="2Hmddi" id="1TH_SRmNfU9" role="3cqZAp">
-          <node concept="2OqwBi" id="1TH_SRmNfUa" role="2Hmdds">
-            <node concept="2OqwBi" id="4s_lMmHvDAu" role="2Oq$k0">
-              <node concept="2YIFZM" id="1TH_SRmNfUb" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHomp" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHomt" role="3vwVQn">
+            <node concept="2OqwBi" id="7Aoa2yVHomu" role="2Oq$k0">
+              <node concept="2YIFZM" id="7Aoa2yVHomv" role="2Oq$k0">
                 <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
                 <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="1TH_SRmNfUc" role="37wK5m">
-                  <node concept="2WthIp" id="1TH_SRmNfUd" role="2Oq$k0" />
-                  <node concept="2XshWL" id="1TH_SRmNfUe" role="2OqNvi">
+                <node concept="2OqwBi" id="7Aoa2yVHomw" role="37wK5m">
+                  <node concept="2WthIp" id="7Aoa2yVHomx" role="2Oq$k0" />
+                  <node concept="2XshWL" id="7Aoa2yVHomy" role="2OqNvi">
                     <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="1TH_SRmNfUf" role="2XxRq1">
-                      <node concept="ZC_QK" id="1TH_SRmNgAr" role="2tJFKM">
+                    <node concept="2tJFMh" id="7Aoa2yVHomz" role="2XxRq1">
+                      <node concept="ZC_QK" id="7Aoa2yVHom$" role="2tJFKM">
                         <ref role="2aWVGs" to="bs09:4M5CNSfDyo1" resolve="Subclassing" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1jxXqW" id="1TH_SRmNfUh" role="37wK5m" />
+                <node concept="1jxXqW" id="7Aoa2yVHom_" role="37wK5m" />
               </node>
-              <node concept="liA8E" id="4s_lMmHvDLH" role="2OqNvi">
+              <node concept="liA8E" id="7Aoa2yVHomA" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:2hrSdN96927" resolve="ignoreErrorTypes" />
               </node>
             </node>
-            <node concept="liA8E" id="4s_lMmHvDQ7" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHomB" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>
@@ -404,25 +404,25 @@
       <property role="TrG5h" value="TestScopes" />
       <node concept="3cqZAl" id="1TH_SRmNgFw" role="3clF45" />
       <node concept="3clFbS" id="1TH_SRmNgFx" role="3clF47">
-        <node concept="2Hmddi" id="1TH_SRmNgFy" role="3cqZAp">
-          <node concept="2OqwBi" id="1TH_SRmNgFz" role="2Hmdds">
-            <node concept="2YIFZM" id="1TH_SRmNgF$" role="2Oq$k0">
+        <node concept="3vwNmj" id="7Aoa2yVHoPL" role="3cqZAp">
+          <node concept="2OqwBi" id="7Aoa2yVHoPP" role="3vwVQn">
+            <node concept="2YIFZM" id="7Aoa2yVHoPQ" role="2Oq$k0">
               <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-              <node concept="2OqwBi" id="1TH_SRmNgF_" role="37wK5m">
-                <node concept="2WthIp" id="1TH_SRmNgFA" role="2Oq$k0" />
-                <node concept="2XshWL" id="1TH_SRmNgFB" role="2OqNvi">
+              <node concept="2OqwBi" id="7Aoa2yVHoPR" role="37wK5m">
+                <node concept="2WthIp" id="7Aoa2yVHoPS" role="2Oq$k0" />
+                <node concept="2XshWL" id="7Aoa2yVHoPT" role="2OqNvi">
                   <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                  <node concept="2tJFMh" id="1TH_SRmNgFC" role="2XxRq1">
-                    <node concept="ZC_QK" id="1TH_SRmNhoG" role="2tJFKM">
+                  <node concept="2tJFMh" id="7Aoa2yVHoPU" role="2XxRq1">
+                    <node concept="ZC_QK" id="7Aoa2yVHoPV" role="2tJFKM">
                       <ref role="2aWVGs" to="bs09:4pwDyRBUfJN" resolve="Scopes" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="1TH_SRmNgFE" role="37wK5m" />
+              <node concept="1jxXqW" id="7Aoa2yVHoPW" role="37wK5m" />
             </node>
-            <node concept="liA8E" id="1TH_SRmNgFF" role="2OqNvi">
+            <node concept="liA8E" id="7Aoa2yVHoPX" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
             </node>
           </node>