From e7054ed12401d163a3354153268980698c20de04 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Mon, 9 May 2022 13:32:14 +0200
Subject: [PATCH] Drop usages of invalidatedFeedbackKeys, minor fixes

---
 ...ains.mps.coderules.testhelper.testutil.mps |   72 -
 ...ins.mps.coderules.typechecking.service.mps | 1280 +++++------------
 .../models/service.mps                        |  249 ----
 3 files changed, 361 insertions(+), 1240 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 fa94501e..aa4bfff7 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
@@ -1984,14 +1984,6 @@
             <node concept="37vLTw" id="WJTIIoZhGL" role="37wK5m">
               <ref role="3cqZAo" node="WJTIIoYvBn" resolve="invalidNodes" />
             </node>
-            <node concept="2OqwBi" id="WJTIIoYxSj" role="37wK5m">
-              <node concept="liA8E" id="WJTIIoYyhH" role="2OqNvi">
-                <ref role="37wK5l" to="w7la:~EvaluationResult.invalidFeedbackKeys()" resolve="invalidFeedbackKeys" />
-              </node>
-              <node concept="37vLTw" id="4J__M6YPmD" role="2Oq$k0">
-                <ref role="3cqZAo" node="4J__M6YPm_" resolve="evaluationResult" />
-              </node>
-            </node>
             <node concept="37vLTw" id="6DQTzHyeOco" role="37wK5m">
               <ref role="3cqZAo" node="6DQTzHye_9o" resolve="invalidatedRuleIds" />
             </node>
@@ -2392,14 +2384,6 @@
           <node concept="2sp9CU" id="1CI$Npxp20K" role="3O5elw" />
         </node>
       </node>
-      <node concept="37vLTG" id="WJTIIoZtCI" role="3clF46">
-        <property role="TrG5h" value="invalidatedFeedbackKeys" />
-        <node concept="3vKaQO" id="1CI$Npxp20L" role="1tU5fm">
-          <node concept="3uibUv" id="1CI$Npxp20M" role="3O5elw">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
       <node concept="37vLTG" id="6DQTzHxKaj7" role="3clF46">
         <property role="TrG5h" value="invalidatedBasis" />
         <node concept="3vKaQO" id="6DQTzHyec6$" role="1tU5fm">
@@ -5217,14 +5201,6 @@
           <node concept="2sp9CU" id="1CI$Npxp20$" role="3O5elw" />
         </node>
       </node>
-      <node concept="37vLTG" id="WJTIIoZDir" role="3clF46">
-        <property role="TrG5h" value="invalidatedFeedbackKeys" />
-        <node concept="3vKaQO" id="1CI$Npxp20_" role="1tU5fm">
-          <node concept="3uibUv" id="1CI$Npxp20A" role="3O5elw">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
       <node concept="37vLTG" id="6DQTzHxLJ9_" role="3clF46">
         <property role="TrG5h" value="invalidatedBasis" />
         <node concept="3vKaQO" id="6DQTzHyem0g" role="1tU5fm">
@@ -5536,26 +5512,6 @@
         </node>
         <node concept="1DcWWT" id="1z4$59jegXA" role="3cqZAp">
           <node concept="3clFbS" id="1z4$59jegXB" role="2LFqv$">
-            <node concept="3clFbJ" id="1z4$59jeLmn" role="3cqZAp">
-              <node concept="3clFbS" id="1z4$59jeLmp" role="3clFbx">
-                <node concept="3N13vt" id="362mGRZM5LS" role="3cqZAp" />
-              </node>
-              <node concept="2OqwBi" id="362mGRZLKCM" role="3clFbw">
-                <node concept="37vLTw" id="362mGRZLKCN" role="2Oq$k0">
-                  <ref role="3cqZAo" node="WJTIIoZGPL" resolve="invalidatedFeedbackKeys" />
-                </node>
-                <node concept="3JPx81" id="362mGRZLKCO" role="2OqNvi">
-                  <node concept="2OqwBi" id="362mGRZLKCP" role="25WWJ7">
-                    <node concept="37vLTw" id="362mGRZLKCQ" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1z4$59jegXF" resolve="it" />
-                    </node>
-                    <node concept="liA8E" id="362mGRZLKCR" role="2OqNvi">
-                      <ref role="37wK5l" to="tj24:5b5WPl4QD9T" resolve="getFeedbackKey" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
             <node concept="3clFbJ" id="6DQTzHxKV9F" role="3cqZAp">
               <node concept="3clFbS" id="6DQTzHxKV9H" role="3clFbx">
                 <node concept="3N13vt" id="6DQTzHxLs1C" role="3cqZAp" />
@@ -5708,26 +5664,6 @@
         </node>
         <node concept="1DcWWT" id="362mGRZM0tb" role="3cqZAp">
           <node concept="3clFbS" id="362mGRZM0tc" role="2LFqv$">
-            <node concept="3clFbJ" id="362mGRZM0td" role="3cqZAp">
-              <node concept="3clFbS" id="362mGRZM0te" role="3clFbx">
-                <node concept="3N13vt" id="362mGRZM6wV" role="3cqZAp" />
-              </node>
-              <node concept="2OqwBi" id="362mGRZM0tl" role="3clFbw">
-                <node concept="37vLTw" id="362mGRZM0tm" role="2Oq$k0">
-                  <ref role="3cqZAo" node="WJTIIoZGPL" resolve="invalidatedFeedbackKeys" />
-                </node>
-                <node concept="3JPx81" id="362mGRZM0tn" role="2OqNvi">
-                  <node concept="2OqwBi" id="362mGRZM0to" role="25WWJ7">
-                    <node concept="37vLTw" id="362mGRZM0tp" role="2Oq$k0">
-                      <ref role="3cqZAo" node="362mGRZM0tr" resolve="it" />
-                    </node>
-                    <node concept="liA8E" id="362mGRZM0tq" role="2OqNvi">
-                      <ref role="37wK5l" to="tj24:5b5WPl4QD9T" resolve="getFeedbackKey" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
             <node concept="3clFbF" id="362mGRZM0tf" role="3cqZAp">
               <node concept="2OqwBi" id="362mGRZM0tg" role="3clFbG">
                 <node concept="liA8E" id="362mGRZM0th" role="2OqNvi">
@@ -5781,14 +5717,6 @@
           <node concept="2sp9CU" id="1CI$Npxp20E" role="3O5elw" />
         </node>
       </node>
-      <node concept="37vLTG" id="WJTIIoZGPL" role="3clF46">
-        <property role="TrG5h" value="invalidatedFeedbackKeys" />
-        <node concept="3vKaQO" id="1CI$Npxp20F" role="1tU5fm">
-          <node concept="3uibUv" id="1CI$Npxp20G" role="3O5elw">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
       <node concept="37vLTG" id="6DQTzHxKJH2" role="3clF46">
         <property role="TrG5h" value="invalidatedBasis" />
         <node concept="3vKaQO" id="6DQTzHyepJt" role="1tU5fm">
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 e573ab9e..1f50bdfc 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
@@ -423,6 +423,7 @@
       <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
       <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="3648723375513868532" name="jetbrains.mps.lang.smodel.structure.NodePointer_ResolveOperation" flags="ng" index="Vyspw" />
+      <concept id="1227264722563" name="jetbrains.mps.lang.smodel.structure.EqualsStructurallyExpression" flags="nn" index="2YFouu" />
       <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
       <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
         <reference id="1154546997487" name="concept" index="3gnhBz" />
@@ -436,6 +437,9 @@
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
+      <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
+        <child id="1180636770616" name="createdType" index="3zrR0E" />
+      </concept>
       <concept id="6407023681583036853" name="jetbrains.mps.lang.smodel.structure.NodeAttributeQualifier" flags="ng" index="3CFYIy">
         <reference id="6407023681583036854" name="attributeConcept" index="3CFYIx" />
       </concept>
@@ -445,6 +449,9 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
+      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
+        <reference id="1138056395725" name="property" index="3TsBF5" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -2950,14 +2957,6 @@
             <node concept="3Tqbb2" id="3Pxu0s8qK9x" role="3O5elw" />
           </node>
         </node>
-        <node concept="37vLTG" id="3Pxu0s8qK9y" role="3clF46">
-          <property role="TrG5h" value="feedbackKeys" />
-          <node concept="3vKaQO" id="3Pxu0s8qK9z" role="1tU5fm">
-            <node concept="3uibUv" id="3Pxu0s8qK9$" role="3O5elw">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-        </node>
         <node concept="3cqZAl" id="3Pxu0s8qa6L" role="3clF45" />
         <node concept="3Tm1VV" id="3Pxu0s8qa6M" role="1B3o_S" />
         <node concept="3clFbS" id="3Pxu0s8qa6N" role="3clF47">
@@ -2971,9 +2970,6 @@
                 <node concept="37vLTw" id="3Pxu0s8qZJj" role="37wK5m">
                   <ref role="3cqZAo" node="3Pxu0s8qK9v" resolve="origins" />
                 </node>
-                <node concept="37vLTw" id="55xYlrm2yBI" role="37wK5m">
-                  <ref role="3cqZAo" node="3Pxu0s8qK9y" resolve="feedbackKeys" />
-                </node>
               </node>
             </node>
           </node>
@@ -3900,14 +3896,6 @@
           <node concept="3Tqbb2" id="3Pxu0s8oQ7M" role="3O5elw" />
         </node>
       </node>
-      <node concept="37vLTG" id="3Pxu0s8oQFQ" role="3clF46">
-        <property role="TrG5h" value="feedbackKeys" />
-        <node concept="3vKaQO" id="3Pxu0s8oVZC" role="1tU5fm">
-          <node concept="3uibUv" id="3Pxu0s8oW_D" role="3O5elw">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
       <node concept="3cqZAl" id="3Pxu0s8oq7i" role="3clF45" />
       <node concept="3Tmbuc" id="3Pxu0s8ow0S" role="1B3o_S" />
       <node concept="3clFbS" id="3Pxu0s8oq7k" role="3clF47">
@@ -3963,138 +3951,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="3Pxu0s8sXK1" role="3cqZAp">
-          <node concept="3clFbS" id="3Pxu0s8sXK3" role="3clFbx">
-            <node concept="1DcWWT" id="1RYTbd8z07s" role="3cqZAp">
-              <node concept="3clFbS" id="1RYTbd8z07t" role="2LFqv$">
-                <node concept="3clFbF" id="1RYTbd8z07u" role="3cqZAp">
-                  <node concept="2OqwBi" id="1RYTbd8z07v" role="3clFbG">
-                    <node concept="37vLTw" id="1RYTbd8zwtf" role="2Oq$k0">
-                      <ref role="3cqZAo" node="5Qx6_659JRp" resolve="tcReportItems" />
-                    </node>
-                    <node concept="kI3uX" id="1RYTbd8z07x" role="2OqNvi">
-                      <node concept="37vLTw" id="1RYTbd8z07y" role="kIiFs">
-                        <ref role="3cqZAo" node="1RYTbd8z07z" resolve="key" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWsn" id="1RYTbd8z07z" role="1Duv9x">
-                <property role="TrG5h" value="key" />
-                <node concept="3uibUv" id="1RYTbd8zMwY" role="1tU5fm">
-                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="3Pxu0s8p59x" role="1DdaDG">
-                <ref role="3cqZAo" node="3Pxu0s8oQFQ" resolve="feedbackKeys" />
-              </node>
-            </node>
-            <node concept="3SKdUt" id="3Pxu0s8$n4s" role="3cqZAp">
-              <node concept="1PaTwC" id="3Pxu0s8$n4t" role="1aUNEU">
-                <node concept="3oM_SD" id="3Pxu0s8$s37" role="1PaTwD">
-                  <property role="3oM_SC" value="TODO:" />
-                </node>
-                <node concept="3oM_SD" id="3Pxu0s8$s39" role="1PaTwD">
-                  <property role="3oM_SC" value="review" />
-                </node>
-                <node concept="3oM_SD" id="3Pxu0s8$s3c" role="1PaTwD">
-                  <property role="3oM_SC" value="this" />
-                </node>
-                <node concept="3oM_SD" id="3Pxu0s8$s3g" role="1PaTwD">
-                  <property role="3oM_SC" value="code" />
-                </node>
-              </node>
-            </node>
-            <node concept="3SKdUt" id="19fWAfyd_vQ" role="3cqZAp">
-              <node concept="1PaTwC" id="19fWAfyd_vR" role="1aUNEU">
-                <node concept="3oM_SD" id="19fWAfyd_vS" role="1PaTwD">
-                  <property role="3oM_SC" value="reset" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_vT" role="1PaTwD">
-                  <property role="3oM_SC" value="keys" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_vU" role="1PaTwD">
-                  <property role="3oM_SC" value="from" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_vV" role="1PaTwD">
-                  <property role="3oM_SC" value="previous" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_vW" role="1PaTwD">
-                  <property role="3oM_SC" value="session" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_vX" role="1PaTwD">
-                  <property role="3oM_SC" value="to" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_vY" role="1PaTwD">
-                  <property role="3oM_SC" value="current" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_vZ" role="1PaTwD">
-                  <property role="3oM_SC" value="ones." />
-                </node>
-              </node>
-            </node>
-            <node concept="3SKdUt" id="19fWAfyd_w0" role="3cqZAp">
-              <node concept="1PaTwC" id="19fWAfyd_w1" role="1aUNEU">
-                <node concept="3oM_SD" id="19fWAfyd_w2" role="1PaTwD">
-                  <property role="3oM_SC" value="current" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_w3" role="1PaTwD">
-                  <property role="3oM_SC" value="invalid" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_w4" role="1PaTwD">
-                  <property role="3oM_SC" value="keys" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_w5" role="1PaTwD">
-                  <property role="3oM_SC" value="are" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_w6" role="1PaTwD">
-                  <property role="3oM_SC" value="needed" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_w7" role="1PaTwD">
-                  <property role="3oM_SC" value="for" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_w8" role="1PaTwD">
-                  <property role="3oM_SC" value="filtering" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_w9" role="1PaTwD">
-                  <property role="3oM_SC" value="out" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_wa" role="1PaTwD">
-                  <property role="3oM_SC" value="certain" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_wb" role="1PaTwD">
-                  <property role="3oM_SC" value="feedback" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_wc" role="1PaTwD">
-                  <property role="3oM_SC" value="items" />
-                </node>
-                <node concept="3oM_SD" id="19fWAfyd_wd" role="1PaTwD">
-                  <property role="3oM_SC" value="later." />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="19fWAfydoCe" role="3cqZAp">
-              <node concept="37vLTI" id="19fWAfydqiT" role="3clFbG">
-                <node concept="2OqwBi" id="19fWAfydoNq" role="37vLTJ">
-                  <node concept="Xjq3P" id="19fWAfydoCc" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="19fWAfydp3g" role="2OqNvi">
-                    <ref role="2Oxat5" node="1DIG_2lNsYk" resolve="invalidFeedbackKeys" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="3Pxu0s8pegY" role="37vLTx">
-                  <ref role="3cqZAo" node="3Pxu0s8oQFQ" resolve="feedbackKeys" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3y3z36" id="3Pxu0s8t6Os" role="3clFbw">
-            <node concept="10Nm6u" id="3Pxu0s8tb$2" role="3uHU7w" />
-            <node concept="37vLTw" id="3Pxu0s8t1cA" role="3uHU7B">
-              <ref role="3cqZAo" node="3Pxu0s8oQFQ" resolve="feedbackKeys" />
-            </node>
-          </node>
-        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="55xYlrm1Q7d" role="jymVt" />
@@ -4403,22 +4259,6 @@
               </node>
               <node concept="9aQIb" id="55xYlrm0rG6" role="9aQIa">
                 <node concept="3clFbS" id="55xYlrm0rG7" role="9aQI4">
-                  <node concept="3clFbJ" id="1DIG_2lN_uL" role="3cqZAp">
-                    <node concept="3clFbS" id="1DIG_2lN_uN" role="3clFbx">
-                      <node concept="3cpWs6" id="1DIG_2lNBMp" role="3cqZAp" />
-                    </node>
-                    <node concept="2OqwBi" id="1DIG_2lNAAK" role="3clFbw">
-                      <node concept="37vLTw" id="1DIG_2lN_F9" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1DIG_2lNsYk" resolve="invalidFeedbackKeys" />
-                      </node>
-                      <node concept="3JPx81" id="1DIG_2lNBqV" role="2OqNvi">
-                        <node concept="37vLTw" id="1DIG_2lNBzL" role="25WWJ7">
-                          <ref role="3cqZAo" node="1XMs8FbYgun" resolve="key" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="1XMs8FbYTTi" role="3cqZAp" />
                   <node concept="3clFbJ" id="5Qx6_659XRn" role="3cqZAp">
                     <node concept="3clFbS" id="5Qx6_659XRM" role="3clFbx">
                       <node concept="3clFbF" id="5Qx6_659YjZ" role="3cqZAp">
@@ -8292,25 +8132,169 @@
           <node concept="2sp9CU" id="5MNibENhE5W" role="1tU5fm" />
         </node>
         <node concept="37vLTG" id="5MNibENhE5T" role="3clF46">
-          <property role="TrG5h" value="type" />
+          <property role="TrG5h" value="newType" />
           <node concept="3Tqbb2" id="5MNibENhE5V" role="1tU5fm" />
         </node>
         <node concept="3clFbS" id="5MNibENhE5X" role="3clF47">
-          <node concept="3clFbF" id="5MNibENhHzK" role="3cqZAp">
-            <node concept="37vLTI" id="5MNibENhI$E" role="3clFbG">
-              <node concept="37vLTw" id="5MNibENhISE" role="37vLTx">
-                <ref role="3cqZAo" node="5MNibENhE5T" resolve="type" />
-              </node>
-              <node concept="3EllGN" id="5MNibENhIaW" role="37vLTJ">
-                <node concept="37vLTw" id="5MNibENhIrs" role="3ElVtu">
+          <node concept="3cpWs8" id="1VeWL_dDrtl" role="3cqZAp">
+            <node concept="3cpWsn" id="1VeWL_dDrtm" role="3cpWs9">
+              <property role="TrG5h" value="oldType" />
+              <node concept="3Tqbb2" id="1VeWL_dDqQq" role="1tU5fm" />
+              <node concept="3EllGN" id="1VeWL_dDrtn" role="33vP2m">
+                <node concept="37vLTw" id="1VeWL_dDrto" role="3ElVtu">
                   <ref role="3cqZAo" node="5MNibENhE5R" resolve="loc" />
                 </node>
-                <node concept="37vLTw" id="5MNibENhHzJ" role="3ElQJh">
+                <node concept="37vLTw" id="1VeWL_dDrtp" role="3ElQJh">
                   <ref role="3cqZAo" node="5MNibENhABM" resolve="node2type" />
                 </node>
               </node>
             </node>
           </node>
+          <node concept="3clFbJ" id="1VeWL_dDzGu" role="3cqZAp">
+            <node concept="3clFbS" id="1VeWL_dDzGw" role="3clFbx">
+              <node concept="3clFbF" id="5MNibENhHzK" role="3cqZAp">
+                <node concept="37vLTI" id="5MNibENhI$E" role="3clFbG">
+                  <node concept="37vLTw" id="5MNibENhISE" role="37vLTx">
+                    <ref role="3cqZAo" node="5MNibENhE5T" resolve="newType" />
+                  </node>
+                  <node concept="3EllGN" id="5MNibENhIaW" role="37vLTJ">
+                    <node concept="37vLTw" id="5MNibENhIrs" role="3ElVtu">
+                      <ref role="3cqZAo" node="5MNibENhE5R" resolve="loc" />
+                    </node>
+                    <node concept="37vLTw" id="5MNibENhHzJ" role="3ElQJh">
+                      <ref role="3cqZAo" node="5MNibENhABM" resolve="node2type" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="1VeWL_dE1Hs" role="3cqZAp" />
+            </node>
+            <node concept="22lmx$" id="1VeWL_dEe91" role="3clFbw">
+              <node concept="3clFbC" id="1VeWL_dEgRU" role="3uHU7B">
+                <node concept="10Nm6u" id="1VeWL_dEhUY" role="3uHU7w" />
+                <node concept="37vLTw" id="1VeWL_dEfK9" role="3uHU7B">
+                  <ref role="3cqZAo" node="1VeWL_dDrtm" resolve="oldType" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="1VeWL_dDFhM" role="3uHU7w">
+                <node concept="37vLTw" id="1VeWL_dDEaO" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1VeWL_dDrtm" resolve="oldType" />
+                </node>
+                <node concept="1mIQ4w" id="1VeWL_dDGrw" role="2OqNvi">
+                  <node concept="chp4Y" id="1VeWL_dDHvA" role="cj9EA">
+                    <ref role="cht4Q" to="tpd4:hfSilrT" resolve="RuntimeErrorType" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3eNFk2" id="1VeWL_dDUca" role="3eNLev">
+              <node concept="1Wc70l" id="1VeWL_e0o6g" role="3eO9$A">
+                <node concept="3fqX7Q" id="1VeWL_e0pez" role="3uHU7w">
+                  <node concept="1eOMI4" id="1VeWL_e0pe_" role="3fr31v">
+                    <node concept="2YFouu" id="1VeWL_e0s9F" role="1eOMHV">
+                      <node concept="37vLTw" id="1VeWL_e0tK4" role="3uHU7w">
+                        <ref role="3cqZAo" node="5MNibENhE5T" resolve="newType" />
+                      </node>
+                      <node concept="37vLTw" id="1VeWL_e0qZs" role="3uHU7B">
+                        <ref role="3cqZAo" node="1VeWL_dDrtm" resolve="oldType" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3fqX7Q" id="1VeWL_dEpvi" role="3uHU7B">
+                  <node concept="2OqwBi" id="1VeWL_dEpvk" role="3fr31v">
+                    <node concept="37vLTw" id="1VeWL_dEpvl" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5MNibENhE5T" resolve="newType" />
+                    </node>
+                    <node concept="1mIQ4w" id="1VeWL_dEpvm" role="2OqNvi">
+                      <node concept="chp4Y" id="1VeWL_dEpvn" role="cj9EA">
+                        <ref role="cht4Q" to="tpd4:hfSilrT" resolve="RuntimeErrorType" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbS" id="1VeWL_dDUcc" role="3eOfB_">
+                <node concept="3SKdUt" id="1VeWL_dEcr7" role="3cqZAp">
+                  <node concept="1PaTwC" id="1VeWL_dEcr8" role="1aUNEU">
+                    <node concept="3oM_SD" id="1VeWL_dEdBA" role="1PaTwD">
+                      <property role="3oM_SC" value="conflict" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs8" id="1VeWL_dEUil" role="3cqZAp">
+                  <node concept="3cpWsn" id="1VeWL_dEUim" role="3cpWs9">
+                    <property role="TrG5h" value="err" />
+                    <node concept="3Tqbb2" id="1VeWL_dETE2" role="1tU5fm">
+                      <ref role="ehGHo" to="tpd4:hfSilrT" resolve="RuntimeErrorType" />
+                    </node>
+                    <node concept="2ShNRf" id="1VeWL_dEUin" role="33vP2m">
+                      <node concept="3zrR0B" id="1VeWL_dEUio" role="2ShVmc">
+                        <node concept="3Tqbb2" id="1VeWL_dEUip" role="3zrR0E">
+                          <ref role="ehGHo" to="tpd4:hfSilrT" resolve="RuntimeErrorType" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="1VeWL_dEXZQ" role="3cqZAp">
+                  <node concept="37vLTI" id="1VeWL_dF2hb" role="3clFbG">
+                    <node concept="3cpWs3" id="1VeWL_dFl1D" role="37vLTx">
+                      <node concept="3cpWs3" id="1VeWL_dFiCX" role="3uHU7B">
+                        <node concept="3cpWs3" id="1VeWL_dFgtb" role="3uHU7B">
+                          <node concept="3cpWs3" id="1VeWL_dFaXU" role="3uHU7B">
+                            <node concept="Xl_RD" id="1VeWL_dF3dp" role="3uHU7B">
+                              <property role="Xl_RC" value="type conflict: both " />
+                            </node>
+                            <node concept="2OqwBi" id="1VeWL_dFdlT" role="3uHU7w">
+                              <node concept="37vLTw" id="1VeWL_dFc8z" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1VeWL_dDrtm" resolve="oldType" />
+                              </node>
+                              <node concept="2qgKlT" id="1VeWL_dFeZP" role="2OqNvi">
+                                <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="Xl_RD" id="1VeWL_dFgut" role="3uHU7w">
+                            <property role="Xl_RC" value=" and " />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="1VeWL_dFjNy" role="3uHU7w">
+                          <ref role="3cqZAo" node="5MNibENhE5T" resolve="newType" />
+                        </node>
+                      </node>
+                      <node concept="Xl_RD" id="1VeWL_dFnfT" role="3uHU7w">
+                        <property role="Xl_RC" value=" are valid" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="1VeWL_dEZ6o" role="37vLTJ">
+                      <node concept="37vLTw" id="1VeWL_dEXZO" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1VeWL_dEUim" resolve="err" />
+                      </node>
+                      <node concept="3TrcHB" id="1VeWL_dF0qY" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpd4:hfSilrU" resolve="errorText" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="1VeWL_dEzjS" role="3cqZAp">
+                  <node concept="37vLTI" id="1VeWL_dEBB3" role="3clFbG">
+                    <node concept="3EllGN" id="1VeWL_dE$Uu" role="37vLTJ">
+                      <node concept="37vLTw" id="1VeWL_dEAvL" role="3ElVtu">
+                        <ref role="3cqZAo" node="5MNibENhE5R" resolve="loc" />
+                      </node>
+                      <node concept="37vLTw" id="1VeWL_dEzjQ" role="3ElQJh">
+                        <ref role="3cqZAo" node="5MNibENhABM" resolve="node2type" />
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="1VeWL_dEUiq" role="37vLTx">
+                      <ref role="3cqZAo" node="1VeWL_dEUim" resolve="node" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
         </node>
         <node concept="2AHcQZ" id="5MNibENhE5Y" role="2AJF6D">
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
@@ -12864,6 +12848,7 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbH" id="1VeWL_dBJNn" role="3cqZAp" />
           <node concept="3cpWs8" id="q1hCiycet8" role="3cqZAp">
             <node concept="3cpWsn" id="q1hCiycetb" role="3cpWs9">
               <property role="TrG5h" value="allReportItems" />
@@ -12972,51 +12957,60 @@
                 </node>
                 <node concept="1bVj0M" id="5iJsa3_j6h6" role="37wK5m">
                   <node concept="3clFbS" id="5iJsa3_j6h7" role="1bW5cS">
-                    <node concept="3cpWs8" id="4tC1JBnbLb$" role="3cqZAp">
-                      <node concept="3cpWsn" id="4tC1JBnbLb_" role="3cpWs9">
-                        <property role="TrG5h" value="tmplTrace" />
-                        <node concept="3uibUv" id="4tC1JBnbLbA" role="1tU5fm">
-                          <ref role="3uigEE" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
-                        </node>
-                        <node concept="2OqwBi" id="4tC1JBnbMiJ" role="33vP2m">
-                          <node concept="37vLTw" id="4tC1JBnbLFm" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5Qx6_65qv$R" resolve="effect" />
-                          </node>
-                          <node concept="liA8E" id="4tC1JBnbMT$" role="2OqNvi">
-                            <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
-                            <node concept="10M0yZ" id="4tC1JBnbNzA" role="37wK5m">
-                              <ref role="3cqZAo" to="1yqb:39eNUjlXwas" resolve="TRACE_TMPL" />
-                              <ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
+                    <node concept="3clFbJ" id="1VeWL_dB0Y0" role="3cqZAp">
+                      <node concept="3clFbS" id="1VeWL_dB0Y2" role="3clFbx">
+                        <node concept="3cpWs8" id="4tC1JBnbLb$" role="3cqZAp">
+                          <node concept="3cpWsn" id="4tC1JBnbLb_" role="3cpWs9">
+                            <property role="TrG5h" value="tmplTrace" />
+                            <node concept="3uibUv" id="4tC1JBnbLbA" role="1tU5fm">
+                              <ref role="3uigEE" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
+                            </node>
+                            <node concept="2OqwBi" id="4tC1JBnbMiJ" role="33vP2m">
+                              <node concept="37vLTw" id="4tC1JBnbLFm" role="2Oq$k0">
+                                <ref role="3cqZAo" node="5Qx6_65qv$R" resolve="effect" />
+                              </node>
+                              <node concept="liA8E" id="4tC1JBnbMT$" role="2OqNvi">
+                                <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                                <node concept="10M0yZ" id="4tC1JBnbNzA" role="37wK5m">
+                                  <ref role="3cqZAo" to="1yqb:39eNUjlXwas" resolve="TRACE_TMPL" />
+                                  <ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="5Qx6_65qARC" role="3cqZAp">
-                      <node concept="2OqwBi" id="61G6TdCoUlf" role="3clFbG">
-                        <node concept="37vLTw" id="61G6TdCoWZA" role="2Oq$k0">
-                          <ref role="3cqZAo" node="61G6TdCj0F7" resolve="request" />
-                        </node>
-                        <node concept="liA8E" id="61G6TdCoUli" role="2OqNvi">
-                          <ref role="37wK5l" node="1z4$59iuh0T" resolve="addTrace" />
-                          <node concept="2ShNRf" id="4tC1JBnbT90" role="37wK5m">
-                            <node concept="1pGfFk" id="4tC1JBnc78J" role="2ShVmc">
-                              <ref role="37wK5l" to="1yqb:4tC1JBnbbB$" resolve="TraceReport" />
-                              <node concept="37vLTw" id="4tC1JBnc7U1" role="37wK5m">
-                                <ref role="3cqZAo" node="4tC1JBnbLb_" resolve="tmplTrace" />
-                              </node>
-                              <node concept="37vLTw" id="4tC1JBnc8Dr" role="37wK5m">
-                                <ref role="3cqZAo" node="5iJsa3_j6he" resolve="traceEvents" />
-                              </node>
-                              <node concept="37vLTw" id="4tC1JBnc8XG" role="37wK5m">
-                                <ref role="3cqZAo" node="q1hCiycetb" resolve="allReportItems" />
+                        <node concept="3clFbF" id="5Qx6_65qARC" role="3cqZAp">
+                          <node concept="2OqwBi" id="61G6TdCoUlf" role="3clFbG">
+                            <node concept="37vLTw" id="61G6TdCoWZA" role="2Oq$k0">
+                              <ref role="3cqZAo" node="61G6TdCj0F7" resolve="request" />
+                            </node>
+                            <node concept="liA8E" id="61G6TdCoUli" role="2OqNvi">
+                              <ref role="37wK5l" node="1z4$59iuh0T" resolve="addTrace" />
+                              <node concept="2ShNRf" id="4tC1JBnbT90" role="37wK5m">
+                                <node concept="1pGfFk" id="4tC1JBnc78J" role="2ShVmc">
+                                  <ref role="37wK5l" to="1yqb:4tC1JBnbbB$" resolve="TraceReport" />
+                                  <node concept="37vLTw" id="4tC1JBnc7U1" role="37wK5m">
+                                    <ref role="3cqZAo" node="4tC1JBnbLb_" resolve="tmplTrace" />
+                                  </node>
+                                  <node concept="37vLTw" id="4tC1JBnc8Dr" role="37wK5m">
+                                    <ref role="3cqZAo" node="5iJsa3_j6he" resolve="traceEvents" />
+                                  </node>
+                                  <node concept="37vLTw" id="4tC1JBnc8XG" role="37wK5m">
+                                    <ref role="3cqZAo" node="q1hCiycetb" resolve="allReportItems" />
+                                  </node>
+                                </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
+                      <node concept="3y3z36" id="1VeWL_dBddI" role="3clFbw">
+                        <node concept="10Nm6u" id="1VeWL_dBjWo" role="3uHU7w" />
+                        <node concept="37vLTw" id="1VeWL_dB7MQ" role="3uHU7B">
+                          <ref role="3cqZAo" node="5iJsa3_j6he" resolve="traceEvents" />
+                        </node>
+                      </node>
                     </node>
-                    <node concept="3clFbH" id="5HVB6JRkh9Q" role="3cqZAp" />
                   </node>
                   <node concept="37vLTG" id="5iJsa3_j6he" role="1bW2Oz">
                     <property role="TrG5h" value="traceEvents" />
@@ -14097,6 +14091,34 @@
               </node>
             </node>
           </node>
+          <node concept="3SKdUt" id="1VeWL_d_csI" role="3cqZAp">
+            <node concept="1PaTwC" id="1VeWL_d_csJ" role="1aUNEU">
+              <node concept="3oM_SD" id="1VeWL_d_fQz" role="1PaTwD">
+                <property role="3oM_SC" value="FIXME" />
+              </node>
+              <node concept="3oM_SD" id="1VeWL_d_fQ_" role="1PaTwD">
+                <property role="3oM_SC" value="stop" />
+              </node>
+              <node concept="3oM_SD" id="1VeWL_d_gH6" role="1PaTwD">
+                <property role="3oM_SC" value="sharing" />
+              </node>
+              <node concept="3oM_SD" id="1VeWL_d_gNq" role="1PaTwD">
+                <property role="3oM_SC" value="type" />
+              </node>
+              <node concept="3oM_SD" id="1VeWL_d_gTN" role="1PaTwD">
+                <property role="3oM_SC" value="collector" />
+              </node>
+              <node concept="3oM_SD" id="1VeWL_d_h0h" role="1PaTwD">
+                <property role="3oM_SC" value="object" />
+              </node>
+              <node concept="3oM_SD" id="1VeWL_d_h6O" role="1PaTwD">
+                <property role="3oM_SC" value="b/w" />
+              </node>
+              <node concept="3oM_SD" id="1VeWL_d_hac" role="1PaTwD">
+                <property role="3oM_SC" value="sessions" />
+              </node>
+            </node>
+          </node>
           <node concept="3clFbF" id="1RYTbd8g$RV" role="3cqZAp">
             <node concept="37vLTI" id="1RYTbd8g$RW" role="3clFbG">
               <node concept="2ShNRf" id="1RYTbd8g$RX" role="37vLTx">
@@ -14115,6 +14137,7 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbH" id="1VeWL_cLkRG" role="3cqZAp" />
           <node concept="3clFbF" id="1RYTbd8g$S4" role="3cqZAp">
             <node concept="2OqwBi" id="1RYTbd8g$S5" role="3clFbG">
               <node concept="2OqwBi" id="1RYTbd8g$S6" role="2Oq$k0">
@@ -14161,56 +14184,44 @@
         <ref role="3uigEE" node="7i3KM7gIg9K" resolve="TypecheckingStrategy.Default" />
       </node>
     </node>
-    <node concept="2tJIrI" id="3OUB6BBo1gE" role="jymVt" />
-    <node concept="312cEu" id="5Qx6_65Rzkz" role="jymVt">
+    <node concept="2tJIrI" id="1VeWL_cPG9a" role="jymVt" />
+    <node concept="312cEu" id="7i3KM7gOydS" role="jymVt">
       <property role="TrG5h" value="Watching" />
-      <node concept="2tJIrI" id="5Qx6_65RQ_5" role="jymVt" />
-      <node concept="3clFbW" id="5Qx6_65RS$L" role="jymVt">
-        <node concept="37vLTG" id="61G6TdCjBIQ" role="3clF46">
+      <node concept="2tJIrI" id="7i3KM7gOydT" role="jymVt" />
+      <node concept="3clFbW" id="7i3KM7gOYIP" role="jymVt">
+        <node concept="37vLTG" id="61G6TdCjH75" role="3clF46">
           <property role="TrG5h" value="request" />
-          <node concept="3uibUv" id="1z4$59iAufN" role="1tU5fm">
+          <node concept="3uibUv" id="1z4$59iACTZ" role="1tU5fm">
             <ref role="3uigEE" node="1z4$59iohfJ" resolve="TypecheckingService.Request" />
-            <node concept="3qUE_q" id="6v6oK24CSCX" role="11_B2D">
-              <node concept="3uibUv" id="6v6oK24CTFi" role="3qUE_r">
+            <node concept="3qUE_q" id="6v6oK24CWIw" role="11_B2D">
+              <node concept="3uibUv" id="6v6oK24CX_N" role="3qUE_r">
                 <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
               </node>
             </node>
-            <node concept="3qTvmN" id="1z4$59iAvYM" role="11_B2D" />
+            <node concept="3qTvmN" id="1z4$59iAEAT" role="11_B2D" />
           </node>
         </node>
-        <node concept="37vLTG" id="5Qx6_65S0mc" role="3clF46">
+        <node concept="37vLTG" id="6nFpYlvou9q" role="3clF46">
           <property role="TrG5h" value="model" />
-          <node concept="H_c77" id="5Qx6_65S0md" role="1tU5fm" />
+          <node concept="H_c77" id="6nFpYlvouY5" role="1tU5fm" />
         </node>
-        <node concept="37vLTG" id="5Qx6_65S0me" role="3clF46">
+        <node concept="37vLTG" id="7i3KM7gP11E" role="3clF46">
           <property role="TrG5h" value="unit" />
-          <node concept="3Tqbb2" id="5Qx6_65S0mf" role="1tU5fm" />
+          <node concept="3Tqbb2" id="6nFpYlvosKe" role="1tU5fm" />
         </node>
-        <node concept="37vLTG" id="5Qx6_65S0mg" role="3clF46">
-          <property role="TrG5h" value="typeCollector" />
-          <node concept="3uibUv" id="5Qx6_65S0mh" role="1tU5fm">
-            <ref role="3uigEE" node="5MNibENhpkH" resolve="TypecheckingState.TypeCollector" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="5Qx6_65S0mi" role="3clF46">
-          <property role="TrG5h" value="cacheHolder" />
-          <node concept="3uibUv" id="1RYTbd8vk89" role="1tU5fm">
-            <ref role="3uigEE" node="4Z$O9mrQJw7" resolve="CacheHolder" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="5Qx6_65RS$N" role="3clF45" />
-        <node concept="3Tmbuc" id="5Qx6_65RS$O" role="1B3o_S" />
-        <node concept="3clFbS" id="5Qx6_65RS$P" role="3clF47">
+        <node concept="3cqZAl" id="7i3KM7gOYIR" role="3clF45" />
+        <node concept="3Tmbuc" id="7i3KM7gOYIS" role="1B3o_S" />
+        <node concept="3clFbS" id="7i3KM7gOYIT" role="3clF47">
           <node concept="XkiVB" id="5Qx6_65RV6h" role="3cqZAp">
-            <ref role="37wK5l" node="5Qx6_65F4Qp" resolve="TypecheckingStrategy.Caching" />
+            <ref role="37wK5l" node="5Qx6_65F4Qp" resolve="Caching" />
             <node concept="37vLTw" id="61G6TdCjGsG" role="37wK5m">
-              <ref role="3cqZAo" node="61G6TdCjBIQ" resolve="request" />
+              <ref role="3cqZAo" node="61G6TdCjH75" resolve="request" />
             </node>
             <node concept="37vLTw" id="5Qx6_65S2va" role="37wK5m">
-              <ref role="3cqZAo" node="5Qx6_65S0mg" resolve="typeCollector" />
+              <ref role="3cqZAo" node="5Qx6_65ttJc" resolve="typeCollector" />
             </node>
             <node concept="37vLTw" id="5Qx6_65S2vb" role="37wK5m">
-              <ref role="3cqZAo" node="5Qx6_65S0mi" resolve="cacheHolder" />
+              <ref role="3cqZAo" node="5Qx6_65tWEQ" resolve="cacheHolder" />
             </node>
           </node>
           <node concept="3clFbF" id="6nFpYlvovYU" role="3cqZAp">
@@ -14222,7 +14233,7 @@
                 </node>
               </node>
               <node concept="37vLTw" id="5Qx6_65SCh4" role="37vLTx">
-                <ref role="3cqZAo" node="5Qx6_65S0mc" resolve="model" />
+                <ref role="3cqZAo" node="6nFpYlvou9q" resolve="model" />
               </node>
             </node>
           </node>
@@ -14235,13 +14246,25 @@
                 </node>
               </node>
               <node concept="37vLTw" id="5Qx6_65SCkD" role="37vLTx">
-                <ref role="3cqZAo" node="5Qx6_65S0me" resolve="unit" />
+                <ref role="3cqZAo" node="7i3KM7gP11E" resolve="unit" />
               </node>
             </node>
           </node>
         </node>
+        <node concept="37vLTG" id="5Qx6_65ttJc" role="3clF46">
+          <property role="TrG5h" value="typeCollector" />
+          <node concept="3uibUv" id="5Qx6_65tu4x" role="1tU5fm">
+            <ref role="3uigEE" node="5MNibENhpkH" resolve="TypecheckingState.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>
+        </node>
       </node>
-      <node concept="2tJIrI" id="5Qx6_65RQ_a" role="jymVt" />
+      <node concept="2tJIrI" id="7i3KM7gP0QO" role="jymVt" />
       <node concept="3clFb_" id="6nFpYlusyqd" role="jymVt">
         <property role="TrG5h" value="applyTemplatesStep" />
         <node concept="37vLTG" id="6nFpYlusyqe" role="3clF46">
@@ -14494,82 +14517,6 @@
         </node>
       </node>
       <node concept="2tJIrI" id="6nFpYlusCEl" role="jymVt" />
-      <node concept="312cEg" id="7i3KM7gP3A_" role="jymVt">
-        <property role="TrG5h" value="unit" />
-        <node concept="3Tmbuc" id="5Qx6_65SX5Y" role="1B3o_S" />
-        <node concept="3Tqbb2" id="6nFpYlvopJ5" role="1tU5fm" />
-      </node>
-      <node concept="312cEg" id="6nFpYlvovYQ" role="jymVt">
-        <property role="TrG5h" value="model" />
-        <node concept="3Tmbuc" id="5Qx6_65SYdA" role="1B3o_S" />
-        <node concept="H_c77" id="6nFpYlvovYT" role="1tU5fm" />
-      </node>
-      <node concept="3Tmbuc" id="5Qx6_65RCqr" role="1B3o_S" />
-      <node concept="3uibUv" id="3OUB6BBnPD$" role="1zkMxy">
-        <ref role="3uigEE" node="5Qx6_65Eucp" resolve="TypecheckingStrategy.Caching" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="61G6TdCsywa" role="jymVt" />
-    <node concept="312cEu" id="7i3KM7gOydS" role="jymVt">
-      <property role="TrG5h" value="WatchingIncremental" />
-      <node concept="2tJIrI" id="7i3KM7gOydT" role="jymVt" />
-      <node concept="3clFbW" id="7i3KM7gOYIP" role="jymVt">
-        <node concept="37vLTG" id="61G6TdCjH75" role="3clF46">
-          <property role="TrG5h" value="request" />
-          <node concept="3uibUv" id="1z4$59iACTZ" role="1tU5fm">
-            <ref role="3uigEE" node="1z4$59iohfJ" resolve="TypecheckingService.Request" />
-            <node concept="3qUE_q" id="6v6oK24CWIw" role="11_B2D">
-              <node concept="3uibUv" id="6v6oK24CX_N" role="3qUE_r">
-                <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
-              </node>
-            </node>
-            <node concept="3qTvmN" id="1z4$59iAEAT" role="11_B2D" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="6nFpYlvou9q" role="3clF46">
-          <property role="TrG5h" value="model" />
-          <node concept="H_c77" id="6nFpYlvouY5" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="7i3KM7gP11E" role="3clF46">
-          <property role="TrG5h" value="unit" />
-          <node concept="3Tqbb2" id="6nFpYlvosKe" role="1tU5fm" />
-        </node>
-        <node concept="3cqZAl" id="7i3KM7gOYIR" role="3clF45" />
-        <node concept="3Tmbuc" id="7i3KM7gOYIS" role="1B3o_S" />
-        <node concept="3clFbS" id="7i3KM7gOYIT" role="3clF47">
-          <node concept="XkiVB" id="5Qx6_65B1gc" role="3cqZAp">
-            <ref role="37wK5l" node="5Qx6_65RS$L" resolve="TypecheckingStrategy.Watching" />
-            <node concept="37vLTw" id="61G6TdCjM4n" role="37wK5m">
-              <ref role="3cqZAo" node="61G6TdCjH75" resolve="request" />
-            </node>
-            <node concept="37vLTw" id="5Qx6_65TdIL" role="37wK5m">
-              <ref role="3cqZAo" node="6nFpYlvou9q" resolve="model" />
-            </node>
-            <node concept="37vLTw" id="5Qx6_65TdzC" role="37wK5m">
-              <ref role="3cqZAo" node="7i3KM7gP11E" resolve="unit" />
-            </node>
-            <node concept="37vLTw" id="5Qx6_65C38v" role="37wK5m">
-              <ref role="3cqZAo" node="5Qx6_65ttJc" resolve="typeCollector" />
-            </node>
-            <node concept="37vLTw" id="5Qx6_65B4QZ" role="37wK5m">
-              <ref role="3cqZAo" node="5Qx6_65tWEQ" resolve="cacheHolder" />
-            </node>
-          </node>
-        </node>
-        <node concept="37vLTG" id="5Qx6_65ttJc" role="3clF46">
-          <property role="TrG5h" value="typeCollector" />
-          <node concept="3uibUv" id="5Qx6_65tu4x" role="1tU5fm">
-            <ref role="3uigEE" node="5MNibENhpkH" resolve="TypecheckingState.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>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="7i3KM7gP0QO" role="jymVt" />
       <node concept="3clFb_" id="5Qx6_65s9rp" role="jymVt">
         <property role="TrG5h" value="processEffect" />
         <node concept="37vLTG" id="5Qx6_65s9rq" role="3clF46">
@@ -14588,182 +14535,6 @@
         <node concept="3cqZAl" id="5Qx6_65s9ru" role="3clF45" />
         <node concept="3Tmbuc" id="5Qx6_65s9rv" role="1B3o_S" />
         <node concept="3clFbS" id="5Qx6_65s9sb" role="3clF47">
-          <node concept="3SKdUt" id="5Qx6_65sjK5" role="3cqZAp">
-            <node concept="1PaTwC" id="5Qx6_65sjK6" role="1aUNEU">
-              <node concept="3oM_SD" id="5Qx6_65sjK7" role="1PaTwD">
-                <property role="3oM_SC" value="FIXME" />
-              </node>
-              <node concept="3oM_SD" id="5Qx6_65sjK8" role="1PaTwD">
-                <property role="3oM_SC" value="hacky" />
-              </node>
-              <node concept="3oM_SD" id="5Qx6_65sjK9" role="1PaTwD">
-                <property role="3oM_SC" value="stuff" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="5iJsa3_dzQC" role="3cqZAp">
-            <node concept="2OqwBi" id="5iJsa3_dANk" role="3clFbG">
-              <node concept="37vLTw" id="5iJsa3_dzQA" role="2Oq$k0">
-                <ref role="3cqZAo" node="5Qx6_65s9rs" resolve="effect" />
-              </node>
-              <node concept="liA8E" id="5iJsa3_dDVE" role="2OqNvi">
-                <ref role="37wK5l" to="1yqb:5iJsa3_8EKs" resolve="applyIfHasValue" />
-                <node concept="10M0yZ" id="5iJsa3_dDYC" role="37wK5m">
-                  <ref role="3cqZAo" to="1yqb:2daneBP_Jiy" resolve="SESSION_TOKEN" />
-                  <ref role="1PxDUh" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
-                </node>
-                <node concept="1bVj0M" id="5iJsa3_dEjP" role="37wK5m">
-                  <node concept="3clFbS" id="5iJsa3_dEjR" role="1bW5cS">
-                    <node concept="3clFbJ" id="5Qx6_65sjKv" role="3cqZAp">
-                      <node concept="3clFbS" id="5Qx6_65sjKw" role="3clFbx">
-                        <node concept="3clFbF" id="5Qx6_65sjKx" role="3cqZAp">
-                          <node concept="2OqwBi" id="5Qx6_65sjKy" role="3clFbG">
-                            <node concept="1rXfSq" id="3OUB6BByPxo" role="2Oq$k0">
-                              <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getAspectCachedData" />
-                              <node concept="37vLTw" id="3OUB6BByPxp" role="37wK5m">
-                                <ref role="3cqZAo" node="5Qx6_65s9rq" resolve="aspectClique" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="5Qx6_65sjK$" role="2OqNvi">
-                              <ref role="37wK5l" node="7i3KM7g1LPQ" resolve="set" />
-                              <node concept="10M0yZ" id="61G6TdCq_H2" role="37wK5m">
-                                <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-                                <ref role="3cqZAo" node="7i3KM7g3FBB" resolve="SESSION_TOKEN" />
-                              </node>
-                              <node concept="37vLTw" id="5iJsa3_dOzt" role="37wK5m">
-                                <ref role="3cqZAo" node="5iJsa3_dIbV" resolve="sessionToken" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3y3z36" id="5Qx6_65sjKA" role="3clFbw">
-                        <node concept="10Nm6u" id="5Qx6_65sjKB" role="3uHU7w" />
-                        <node concept="37vLTw" id="5iJsa3_dOna" role="3uHU7B">
-                          <ref role="3cqZAo" node="5iJsa3_dIbV" resolve="sessionToken" />
-                        </node>
-                      </node>
-                      <node concept="9aQIb" id="5Qx6_65sjKD" role="9aQIa">
-                        <node concept="3clFbS" id="5Qx6_65sjKE" role="9aQI4">
-                          <node concept="3clFbF" id="5Qx6_65sjKF" role="3cqZAp">
-                            <node concept="2OqwBi" id="5Qx6_65sjKG" role="3clFbG">
-                              <node concept="1rXfSq" id="3OUB6BByQj9" role="2Oq$k0">
-                                <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getAspectCachedData" />
-                                <node concept="37vLTw" id="3OUB6BByQja" role="37wK5m">
-                                  <ref role="3cqZAo" node="5Qx6_65s9rq" resolve="aspectClique" />
-                                </node>
-                              </node>
-                              <node concept="liA8E" id="5Qx6_65sjKI" role="2OqNvi">
-                                <ref role="37wK5l" node="7i3KM7g2ZSX" resolve="clear" />
-                                <node concept="10M0yZ" id="61G6TdCq_KV" role="37wK5m">
-                                  <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-                                  <ref role="3cqZAo" node="7i3KM7g3FBB" resolve="SESSION_TOKEN" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3clFbH" id="17DrR$SPG86" role="3cqZAp" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="37vLTG" id="5iJsa3_dIbV" role="1bW2Oz">
-                    <property role="TrG5h" value="sessionToken" />
-                    <node concept="3uibUv" id="5iJsa3_dIDJ" role="1tU5fm">
-                      <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="5iJsa3_bDXg" role="3cqZAp">
-            <node concept="2OqwBi" id="5iJsa3_bH_d" role="3clFbG">
-              <node concept="37vLTw" id="5iJsa3_bDXe" role="2Oq$k0">
-                <ref role="3cqZAo" node="5Qx6_65s9rs" resolve="effect" />
-              </node>
-              <node concept="liA8E" id="5iJsa3_bKFZ" role="2OqNvi">
-                <ref role="37wK5l" to="1yqb:5iJsa3_8EKs" resolve="applyIfHasValue" />
-                <node concept="10M0yZ" id="2EG5v$dH9T0" role="37wK5m">
-                  <ref role="3cqZAo" to="1yqb:2EG5v$dFgce" resolve="INVALIDATED_ORIGINS" />
-                  <ref role="1PxDUh" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
-                </node>
-                <node concept="1bVj0M" id="5iJsa3_bLzH" role="37wK5m">
-                  <node concept="3clFbS" id="5iJsa3_bLzJ" role="1bW5cS">
-                    <node concept="3clFbF" id="5Qx6_65sjPY" role="3cqZAp">
-                      <node concept="2OqwBi" id="5Qx6_65sjPZ" role="3clFbG">
-                        <node concept="37vLTw" id="5Qx6_65sYbT" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5Qx6_65sCpg" resolve="invalidatedSet" />
-                        </node>
-                        <node concept="X8dFx" id="5Qx6_65sjQ1" role="2OqNvi">
-                          <node concept="10QFUN" id="5Qx6_65sjQ2" role="25WWJ7">
-                            <node concept="37vLTw" id="5iJsa3_c4mh" role="10QFUP">
-                              <ref role="3cqZAo" node="5iJsa3_bLAX" resolve="invalidated" />
-                            </node>
-                            <node concept="3vKaQO" id="5Qx6_65sjQ7" role="10QFUM">
-                              <node concept="3Tqbb2" id="3Pxu0s8lyQ0" role="3O5elw" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="5iJsa3_bV5z" role="3cqZAp" />
-                  </node>
-                  <node concept="37vLTG" id="5iJsa3_bLAX" role="1bW2Oz">
-                    <property role="TrG5h" value="invalidated" />
-                    <node concept="3uibUv" id="5iJsa3_bRP3" role="1tU5fm">
-                      <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="5iJsa3_cedc" role="3cqZAp">
-            <node concept="2OqwBi" id="5iJsa3_ciaW" role="3clFbG">
-              <node concept="37vLTw" id="5iJsa3_ceda" role="2Oq$k0">
-                <ref role="3cqZAo" node="5Qx6_65s9rs" resolve="effect" />
-              </node>
-              <node concept="liA8E" id="5iJsa3_cjX7" role="2OqNvi">
-                <ref role="37wK5l" to="1yqb:5iJsa3_8EKs" resolve="applyIfHasValue" />
-                <node concept="10M0yZ" id="5iJsa3_cl5P" role="37wK5m">
-                  <ref role="3cqZAo" to="1yqb:2yEnwsh8n5F" resolve="INVALIDATED_FEEDBACK_KEYS" />
-                  <ref role="1PxDUh" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
-                </node>
-                <node concept="1bVj0M" id="5iJsa3_clXm" role="37wK5m">
-                  <node concept="37vLTG" id="5iJsa3_cprx" role="1bW2Oz">
-                    <property role="TrG5h" value="keys" />
-                    <node concept="3uibUv" id="5iJsa3_cpvz" role="1tU5fm">
-                      <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-                    </node>
-                  </node>
-                  <node concept="3clFbS" id="5iJsa3_clXo" role="1bW5cS">
-                    <node concept="3clFbF" id="6NlBtKd2X9B" role="3cqZAp">
-                      <node concept="2OqwBi" id="6NlBtKd2X9C" role="3clFbG">
-                        <node concept="37vLTw" id="6NlBtKd39_n" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6NlBtKd2D$W" resolve="invalidatedFeedbackKeys" />
-                        </node>
-                        <node concept="X8dFx" id="6NlBtKd2X9E" role="2OqNvi">
-                          <node concept="10QFUN" id="6NlBtKd2X9F" role="25WWJ7">
-                            <node concept="37vLTw" id="5iJsa3_cE0q" role="10QFUP">
-                              <ref role="3cqZAo" node="5iJsa3_cprx" resolve="keys" />
-                            </node>
-                            <node concept="3vKaQO" id="6NlBtKd2X9K" role="10QFUM">
-                              <node concept="3uibUv" id="6NlBtKd3aRs" role="3O5elw">
-                                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="2EG5v$dD_2P" role="3cqZAp" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="17DrR$SNuZQ" role="3cqZAp" />
           <node concept="3clFbF" id="17DrR$SNv4p" role="3cqZAp">
             <node concept="2OqwBi" id="17DrR$SNv4q" role="3clFbG">
               <node concept="37vLTw" id="17DrR$SNv4r" role="2Oq$k0">
@@ -14793,96 +14564,75 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbJ" id="55xYlrmr7Sc" role="3cqZAp">
-                      <node concept="3clFbS" id="55xYlrmr7Se" role="3clFbx">
-                        <node concept="3clFbF" id="55xYlrmrp5a" role="3cqZAp">
-                          <node concept="37vLTI" id="55xYlrmryum" role="3clFbG">
-                            <node concept="3clFbT" id="55xYlrmrA3n" role="37vLTx">
-                              <property role="3clFbU" value="true" />
+                    <node concept="3clFbJ" id="55xYlrmFmSx" role="3cqZAp">
+                      <node concept="3clFbS" id="55xYlrmFmSz" role="3clFbx">
+                        <node concept="3cpWs8" id="55xYlrmFZsy" role="3cqZAp">
+                          <node concept="3cpWsn" id="55xYlrmFZsz" role="3cpWs9">
+                            <property role="TrG5h" value="rulesPlan" />
+                            <node concept="3uibUv" id="55xYlrmFYAp" role="1tU5fm">
+                              <ref role="3uigEE" to="ksgm:1XKnVPsWNc" resolve="RulesPlan" />
                             </node>
-                            <node concept="37vLTw" id="55xYlrmrtlK" role="37vLTJ">
-                              <ref role="3cqZAo" node="17DrR$SMHcm" resolve="evaluatedProgram" />
+                            <node concept="2OqwBi" id="55xYlrmFZs$" role="33vP2m">
+                              <node concept="1eOMI4" id="55xYlrmFZs_" role="2Oq$k0">
+                                <node concept="10QFUN" id="55xYlrmFZsA" role="1eOMHV">
+                                  <node concept="3uibUv" id="55xYlrmFZsB" role="10QFUM">
+                                    <ref role="3uigEE" to="ksgm:7eGEHDlcEJ0" resolve="CodeRulesProgram" />
+                                  </node>
+                                  <node concept="37vLTw" id="55xYlrmFZsC" role="10QFUP">
+                                    <ref role="3cqZAo" node="55xYlrmqVe7" resolve="program" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="55xYlrmFZsD" role="2OqNvi">
+                                <ref role="37wK5l" to="ksgm:55xYlrmEqJq" resolve="rulesPlan" />
+                              </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbJ" id="55xYlrmFmSx" role="3cqZAp">
-                          <node concept="3clFbS" id="55xYlrmFmSz" role="3clFbx">
-                            <node concept="3cpWs8" id="55xYlrmFZsy" role="3cqZAp">
-                              <node concept="3cpWsn" id="55xYlrmFZsz" role="3cpWs9">
-                                <property role="TrG5h" value="rulesPlan" />
-                                <node concept="3uibUv" id="55xYlrmFYAp" role="1tU5fm">
-                                  <ref role="3uigEE" to="ksgm:1XKnVPsWNc" resolve="RulesPlan" />
-                                </node>
-                                <node concept="2OqwBi" id="55xYlrmFZs$" role="33vP2m">
-                                  <node concept="1eOMI4" id="55xYlrmFZs_" role="2Oq$k0">
-                                    <node concept="10QFUN" id="55xYlrmFZsA" role="1eOMHV">
-                                      <node concept="3uibUv" id="55xYlrmFZsB" role="10QFUM">
-                                        <ref role="3uigEE" to="ksgm:7eGEHDlcEJ0" resolve="CodeRulesProgram" />
-                                      </node>
-                                      <node concept="37vLTw" id="55xYlrmFZsC" role="10QFUP">
-                                        <ref role="3cqZAo" node="55xYlrmqVe7" resolve="program" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="liA8E" id="55xYlrmFZsD" role="2OqNvi">
-                                    <ref role="37wK5l" to="ksgm:55xYlrmEqJq" resolve="rulesPlan" />
-                                  </node>
-                                </node>
-                              </node>
+                        <node concept="3clFbF" id="55xYlrmtn2T" role="3cqZAp">
+                          <node concept="2OqwBi" id="55xYlrmtt5c" role="3clFbG">
+                            <node concept="37vLTw" id="55xYlrmtn2R" role="2Oq$k0">
+                              <ref role="3cqZAo" node="55xYlrmpLFZ" resolve="invalidatedFeedbackBasis" />
                             </node>
-                            <node concept="3clFbF" id="55xYlrmtn2T" role="3cqZAp">
-                              <node concept="2OqwBi" id="55xYlrmtt5c" role="3clFbG">
-                                <node concept="37vLTw" id="55xYlrmtn2R" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="55xYlrmpLFZ" resolve="invalidatedFeedbackBasis" />
+                            <node concept="X8dFx" id="55xYlrmtyQr" role="2OqNvi">
+                              <node concept="2OqwBi" id="55xYlrmGmxW" role="25WWJ7">
+                                <node concept="37vLTw" id="55xYlrmGjTk" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="55xYlrmFZsz" resolve="rulesPlan" />
                                 </node>
-                                <node concept="X8dFx" id="55xYlrmtyQr" role="2OqNvi">
-                                  <node concept="2OqwBi" id="55xYlrmGmxW" role="25WWJ7">
-                                    <node concept="37vLTw" id="55xYlrmGjTk" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="55xYlrmFZsz" resolve="rulesPlan" />
-                                    </node>
-                                    <node concept="liA8E" id="55xYlrmHv6q" role="2OqNvi">
-                                      <ref role="37wK5l" to="ksgm:55xYlrmGsza" resolve="invalidatedRuleIds" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3clFbF" id="55xYlrmJRC0" role="3cqZAp">
-                              <node concept="2OqwBi" id="55xYlrmJRC1" role="3clFbG">
-                                <node concept="37vLTw" id="6DQTzHy721_" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6DQTzHy6_yw" resolve="validatedFeedbackBasis" />
-                                </node>
-                                <node concept="X8dFx" id="55xYlrmJRC3" role="2OqNvi">
-                                  <node concept="2OqwBi" id="55xYlrmJRC4" role="25WWJ7">
-                                    <node concept="37vLTw" id="55xYlrmJRC5" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="55xYlrmFZsz" resolve="rulesPlan" />
-                                    </node>
-                                    <node concept="liA8E" id="55xYlrmJXLy" role="2OqNvi">
-                                      <ref role="37wK5l" to="ksgm:55xYlrmIHsb" resolve="validatedRuleIds" />
-                                    </node>
-                                  </node>
+                                <node concept="liA8E" id="55xYlrmHv6q" role="2OqNvi">
+                                  <ref role="37wK5l" to="ksgm:55xYlrmGsza" resolve="invalidatedRuleIds" />
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="2ZW3vV" id="55xYlrmFws7" role="3clFbw">
-                            <node concept="3uibUv" id="55xYlrmF_u3" role="2ZW6by">
-                              <ref role="3uigEE" to="ksgm:7eGEHDlcEJ0" resolve="CodeRulesProgram" />
+                        </node>
+                        <node concept="3clFbF" id="55xYlrmJRC0" role="3cqZAp">
+                          <node concept="2OqwBi" id="55xYlrmJRC1" role="3clFbG">
+                            <node concept="37vLTw" id="6DQTzHy721_" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6DQTzHy6_yw" resolve="validatedFeedbackBasis" />
                             </node>
-                            <node concept="37vLTw" id="55xYlrmFrIc" role="2ZW6bz">
-                              <ref role="3cqZAo" node="55xYlrmqVe7" resolve="program" />
+                            <node concept="X8dFx" id="55xYlrmJRC3" role="2OqNvi">
+                              <node concept="2OqwBi" id="55xYlrmJRC4" role="25WWJ7">
+                                <node concept="37vLTw" id="55xYlrmJRC5" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="55xYlrmFZsz" resolve="rulesPlan" />
+                                </node>
+                                <node concept="liA8E" id="55xYlrmJXLy" role="2OqNvi">
+                                  <ref role="37wK5l" to="ksgm:55xYlrmIHsb" resolve="validatedRuleIds" />
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="3y3z36" id="55xYlrmrfU1" role="3clFbw">
-                        <node concept="10Nm6u" id="55xYlrmrkx_" role="3uHU7w" />
-                        <node concept="37vLTw" id="55xYlrmrbHF" role="3uHU7B">
+                      <node concept="2ZW3vV" id="55xYlrmFws7" role="3clFbw">
+                        <node concept="3uibUv" id="55xYlrmF_u3" role="2ZW6by">
+                          <ref role="3uigEE" to="ksgm:7eGEHDlcEJ0" resolve="CodeRulesProgram" />
+                        </node>
+                        <node concept="37vLTw" id="55xYlrmFrIc" role="2ZW6bz">
                           <ref role="3cqZAo" node="55xYlrmqVe7" resolve="program" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbH" id="17DrR$SNv4D" role="3cqZAp" />
                   </node>
                   <node concept="37vLTG" id="17DrR$SNv4E" role="1bW2Oz">
                     <property role="TrG5h" value="pp" />
@@ -14895,20 +14645,6 @@
             </node>
           </node>
           <node concept="3clFbH" id="55xYlrl0F41" role="3cqZAp" />
-          <node concept="3cpWs8" id="55xYlrl0F9e" role="3cqZAp">
-            <node concept="3cpWsn" id="55xYlrl0F9f" role="3cpWs9">
-              <property role="TrG5h" value="cachedSessionData" />
-              <node concept="3uibUv" id="55xYlrl0F9g" role="1tU5fm">
-                <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
-              </node>
-              <node concept="1rXfSq" id="55xYlrl0F9h" role="33vP2m">
-                <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getAspectCachedData" />
-                <node concept="37vLTw" id="55xYlrl0F9i" role="37wK5m">
-                  <ref role="3cqZAo" node="5Qx6_65s9rq" resolve="aspectClique" />
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="3cpWs8" id="55xYlrl0K5R" role="3cqZAp">
             <node concept="3cpWsn" id="55xYlrl0K5S" role="3cpWs9">
               <property role="TrG5h" value="updatesRecorder" />
@@ -14916,8 +14652,11 @@
                 <ref role="3uigEE" to="ksgm:6nFpYlu02jD" resolve="UpdatesRecorder" />
               </node>
               <node concept="2OqwBi" id="55xYlrl0K5U" role="33vP2m">
-                <node concept="37vLTw" id="55xYlrl0K5V" role="2Oq$k0">
-                  <ref role="3cqZAo" node="55xYlrl0F9f" resolve="cachedSessionData" />
+                <node concept="1rXfSq" id="1VeWL_dCRa_" role="2Oq$k0">
+                  <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getAspectCachedData" />
+                  <node concept="37vLTw" id="1VeWL_dCRaA" role="37wK5m">
+                    <ref role="3cqZAo" node="5Qx6_65s9rq" resolve="aspectClique" />
+                  </node>
                 </node>
                 <node concept="liA8E" id="55xYlrl0K5W" role="2OqNvi">
                   <ref role="37wK5l" node="7i3KM7g1KV4" resolve="get" />
@@ -14956,188 +14695,15 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="5Qx6_65sjSJ" role="3cqZAp" />
-          <node concept="3cpWs8" id="q1hCiybRQn" role="3cqZAp">
-            <node concept="3cpWsn" id="q1hCiybRQq" role="3cpWs9">
-              <property role="TrG5h" value="allReportItems" />
-              <node concept="_YKpA" id="q1hCiybRQj" role="1tU5fm">
-                <node concept="3uibUv" id="q1hCiybTvl" role="_ZDj9">
-                  <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-                </node>
+          <node concept="3clFbF" id="1VeWL_dBRtC" role="3cqZAp">
+            <node concept="3nyPlj" id="1VeWL_dBRtA" role="3clFbG">
+              <ref role="37wK5l" node="3OUB6BB8G5o" resolve="processEffect" />
+              <node concept="37vLTw" id="1VeWL_dC7ha" role="37wK5m">
+                <ref role="3cqZAo" node="5Qx6_65s9rq" resolve="aspectClique" />
               </node>
-              <node concept="2ShNRf" id="q1hCiybUbE" role="33vP2m">
-                <node concept="Tc6Ow" id="q1hCiybU7W" role="2ShVmc">
-                  <node concept="3uibUv" id="q1hCiybU7X" role="HW$YZ">
-                    <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="5iJsa3_aUY$" role="3cqZAp">
-            <node concept="2OqwBi" id="5iJsa3_aWI6" role="3clFbG">
-              <node concept="37vLTw" id="5iJsa3_aUYy" role="2Oq$k0">
+              <node concept="37vLTw" id="1VeWL_dCfq3" role="37wK5m">
                 <ref role="3cqZAo" node="5Qx6_65s9rs" resolve="effect" />
               </node>
-              <node concept="liA8E" id="5iJsa3_aZv1" role="2OqNvi">
-                <ref role="37wK5l" to="1yqb:5iJsa3_8EKs" resolve="applyIfHasValue" />
-                <node concept="10M0yZ" id="5iJsa3_b05j" role="37wK5m">
-                  <ref role="3cqZAo" node="2daneBP_Jiy" resolve="REPORT_ITEMS" />
-                  <ref role="1PxDUh" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                </node>
-                <node concept="1bVj0M" id="5iJsa3_b1i$" role="37wK5m">
-                  <node concept="37vLTG" id="5iJsa3_b1mj" role="1bW2Oz">
-                    <property role="TrG5h" value="items" />
-                    <node concept="_YKpA" id="5iJsa3_b1Jb" role="1tU5fm">
-                      <node concept="3uibUv" id="5iJsa3_b1Jc" role="_ZDj9">
-                        <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbS" id="5iJsa3_b1iA" role="1bW5cS">
-                    <node concept="3clFbF" id="5iJsa3_b6u8" role="3cqZAp">
-                      <node concept="2OqwBi" id="5iJsa3_b7jS" role="3clFbG">
-                        <node concept="X8dFx" id="5iJsa3_b83G" role="2OqNvi">
-                          <node concept="37vLTw" id="5iJsa3_b8L$" role="25WWJ7">
-                            <ref role="3cqZAo" node="5iJsa3_b1mj" resolve="items" />
-                          </node>
-                        </node>
-                        <node concept="37vLTw" id="scOg5x_f2W" role="2Oq$k0">
-                          <ref role="3cqZAo" node="q1hCiybRQq" resolve="allReportItems" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="5iJsa3_ds5a" role="3cqZAp">
-            <node concept="2OqwBi" id="5iJsa3_ds5b" role="3clFbG">
-              <node concept="37vLTw" id="5iJsa3_ds5c" role="2Oq$k0">
-                <ref role="3cqZAo" node="5Qx6_65s9rs" resolve="effect" />
-              </node>
-              <node concept="liA8E" id="5iJsa3_ds5d" role="2OqNvi">
-                <ref role="37wK5l" to="1yqb:5iJsa3_8EKs" resolve="applyIfHasValue" />
-                <node concept="10M0yZ" id="5iJsa3_dvnx" role="37wK5m">
-                  <ref role="3cqZAo" to="1yqb:5iJsa3_dp$f" resolve="REPORT_ITEMS" />
-                  <ref role="1PxDUh" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-                </node>
-                <node concept="1bVj0M" id="5iJsa3_ds5f" role="37wK5m">
-                  <node concept="37vLTG" id="5iJsa3_ds5g" role="1bW2Oz">
-                    <property role="TrG5h" value="items" />
-                    <node concept="_YKpA" id="5iJsa3_ds5h" role="1tU5fm">
-                      <node concept="3uibUv" id="5iJsa3_ds5i" role="_ZDj9">
-                        <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbS" id="5iJsa3_ds5j" role="1bW5cS">
-                    <node concept="3clFbF" id="5iJsa3_ds5k" role="3cqZAp">
-                      <node concept="2OqwBi" id="5iJsa3_ds5l" role="3clFbG">
-                        <node concept="X8dFx" id="5iJsa3_ds5n" role="2OqNvi">
-                          <node concept="37vLTw" id="5iJsa3_ds5o" role="25WWJ7">
-                            <ref role="3cqZAo" node="5iJsa3_ds5g" resolve="items" />
-                          </node>
-                        </node>
-                        <node concept="37vLTw" id="scOg5x_fl_" role="2Oq$k0">
-                          <ref role="3cqZAo" node="q1hCiybRQq" resolve="allReportItems" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="5iJsa3_bgMf" role="3cqZAp">
-            <node concept="2OqwBi" id="5iJsa3_biwi" role="3clFbG">
-              <node concept="37vLTw" id="5iJsa3_bgMd" role="2Oq$k0">
-                <ref role="3cqZAo" node="5Qx6_65s9rs" resolve="effect" />
-              </node>
-              <node concept="liA8E" id="5iJsa3_bktL" role="2OqNvi">
-                <ref role="37wK5l" to="1yqb:5iJsa3_8EKs" resolve="applyIfHasValue" />
-                <node concept="10M0yZ" id="5iJsa3_bl_r" role="37wK5m">
-                  <ref role="1PxDUh" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                  <ref role="3cqZAo" node="1G9Y_Qv7rZx" resolve="TRACE_EVENTS" />
-                </node>
-                <node concept="1bVj0M" id="5iJsa3_bmCq" role="37wK5m">
-                  <node concept="37vLTG" id="5iJsa3_bmFG" role="1bW2Oz">
-                    <property role="TrG5h" value="traceEvents" />
-                    <node concept="3uibUv" id="5iJsa3_bmXA" role="1tU5fm">
-                      <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEvents" />
-                    </node>
-                  </node>
-                  <node concept="3clFbS" id="5iJsa3_bmCs" role="1bW5cS">
-                    <node concept="3clFbJ" id="5Qx6_65sjVN" role="3cqZAp">
-                      <node concept="3clFbS" id="5Qx6_65sjVO" role="3clFbx">
-                        <node concept="3cpWs8" id="4tC1JBnccGG" role="3cqZAp">
-                          <node concept="3cpWsn" id="4tC1JBnccGH" role="3cpWs9">
-                            <property role="TrG5h" value="tmplTrace" />
-                            <node concept="3uibUv" id="4tC1JBnccGI" role="1tU5fm">
-                              <ref role="3uigEE" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
-                            </node>
-                            <node concept="2OqwBi" id="4tC1JBnccGJ" role="33vP2m">
-                              <node concept="37vLTw" id="4tC1JBnccGK" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5Qx6_65s9rs" resolve="effect" />
-                              </node>
-                              <node concept="liA8E" id="4tC1JBnccGL" role="2OqNvi">
-                                <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
-                                <node concept="10M0yZ" id="4tC1JBnccGM" role="37wK5m">
-                                  <ref role="3cqZAo" to="1yqb:39eNUjlXwas" resolve="TRACE_TMPL" />
-                                  <ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="5Qx6_65sjVP" role="3cqZAp">
-                          <node concept="2OqwBi" id="61G6TdCqb3z" role="3clFbG">
-                            <node concept="37vLTw" id="61G6TdCqdN_" role="2Oq$k0">
-                              <ref role="3cqZAo" node="61G6TdCj0F7" resolve="request" />
-                            </node>
-                            <node concept="liA8E" id="61G6TdCqb3A" role="2OqNvi">
-                              <ref role="37wK5l" node="1z4$59iuh0T" resolve="addTrace" />
-                              <node concept="2ShNRf" id="4tC1JBnccHl" role="37wK5m">
-                                <node concept="1pGfFk" id="4tC1JBnccHm" role="2ShVmc">
-                                  <ref role="37wK5l" to="1yqb:4tC1JBnbbB$" resolve="TraceReport" />
-                                  <node concept="37vLTw" id="4tC1JBnccHn" role="37wK5m">
-                                    <ref role="3cqZAo" node="4tC1JBnccGH" resolve="tmplTrace" />
-                                  </node>
-                                  <node concept="37vLTw" id="4tC1JBnccHo" role="37wK5m">
-                                    <ref role="3cqZAo" node="5iJsa3_bmFG" resolve="traceEvents" />
-                                  </node>
-                                  <node concept="37vLTw" id="4tC1JBnccHp" role="37wK5m">
-                                    <ref role="3cqZAo" node="q1hCiybRQq" resolve="allReportItems" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3y3z36" id="5Qx6_65sjVT" role="3clFbw">
-                        <node concept="10Nm6u" id="5Qx6_65sjVU" role="3uHU7w" />
-                        <node concept="37vLTw" id="5iJsa3_bwE6" role="3uHU7B">
-                          <ref role="3cqZAo" node="5iJsa3_bmFG" resolve="traceEvents" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="q1hCiyc53T" role="3cqZAp">
-            <node concept="2OqwBi" id="q1hCiyc89V" role="3clFbG">
-              <node concept="37vLTw" id="q1hCiyc53R" role="2Oq$k0">
-                <ref role="3cqZAo" node="5Qx6_65qW78" resolve="collectedReportItems" />
-              </node>
-              <node concept="X8dFx" id="q1hCiycbxk" role="2OqNvi">
-                <node concept="37vLTw" id="q1hCiyccVP" role="25WWJ7">
-                  <ref role="3cqZAo" node="q1hCiybRQq" resolve="allReportItems" />
-                </node>
-              </node>
             </node>
           </node>
         </node>
@@ -15172,86 +14738,29 @@
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
         <node concept="3clFbS" id="1RYTbd8gD25" role="3clF47">
-          <node concept="3cpWs8" id="1RYTbd8gNIl" role="3cqZAp">
-            <node concept="3cpWsn" id="1RYTbd8gNIm" role="3cpWs9">
-              <property role="TrG5h" value="node2type" />
-              <node concept="3rvAFt" id="1RYTbd8gNIn" role="1tU5fm">
-                <node concept="2sp9CU" id="1RYTbd8gNIo" role="3rvQeY" />
-                <node concept="3Tqbb2" id="1RYTbd8gNIp" role="3rvSg0" />
-              </node>
-              <node concept="2OqwBi" id="1RYTbd8gNIq" role="33vP2m">
-                <node concept="37vLTw" id="1RYTbd8gNIr" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5Qx6_65twII" resolve="typeCollector" />
-                </node>
-                <node concept="2OwXpG" id="1RYTbd8gNIs" role="2OqNvi">
-                  <ref role="2Oxat5" node="5MNibENhABM" resolve="node2type" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="1RYTbd8gNIt" role="3cqZAp">
-            <node concept="37vLTI" id="1RYTbd8gNIu" role="3clFbG">
-              <node concept="2ShNRf" id="1RYTbd8gNIv" role="37vLTx">
-                <node concept="3rGOSV" id="1RYTbd8gNIw" role="2ShVmc">
-                  <node concept="2sp9CU" id="1RYTbd8gNIx" role="3rHrn6" />
-                  <node concept="3Tqbb2" id="1RYTbd8gNIy" role="3rHtpV" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="1RYTbd8gNIz" role="37vLTJ">
-                <node concept="37vLTw" id="1RYTbd8gNI$" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5Qx6_65twII" resolve="typeCollector" />
-                </node>
-                <node concept="2OwXpG" id="1RYTbd8gNI_" role="2OqNvi">
-                  <ref role="2Oxat5" node="5MNibENhABM" resolve="node2type" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="1RYTbd8hdl5" role="3cqZAp" />
-          <node concept="3clFbF" id="1RYTbd8gNIA" role="3cqZAp">
-            <node concept="2OqwBi" id="1RYTbd8gNIB" role="3clFbG">
-              <node concept="2OqwBi" id="1RYTbd8gNIC" role="2Oq$k0">
-                <node concept="2OqwBi" id="55xYlrmuhis" role="2Oq$k0">
-                  <node concept="2OqwBi" id="1RYTbd8gR0a" role="2Oq$k0">
-                    <node concept="2OqwBi" id="1RYTbd8gPBp" role="2Oq$k0">
-                      <node concept="37vLTw" id="1RYTbd8gNID" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1RYTbd8gD1y" resolve="response" />
-                      </node>
-                      <node concept="liA8E" id="1RYTbd8gQeT" role="2OqNvi">
-                        <ref role="37wK5l" node="1RYTbd8duYG" resolve="withInvalidatedOrigins" />
-                        <node concept="37vLTw" id="1RYTbd8gQuv" role="37wK5m">
-                          <ref role="3cqZAo" node="5Qx6_65sCpg" resolve="invalidatedSet" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="1RYTbd8gRU3" role="2OqNvi">
-                      <ref role="37wK5l" node="1RYTbd8cOQG" resolve="withInvalidatedFeedbackKeys" />
-                      <node concept="37vLTw" id="1RYTbd8gSdL" role="37wK5m">
-                        <ref role="3cqZAo" node="6NlBtKd2D$W" resolve="invalidatedFeedbackKeys" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="55xYlrmum1X" role="2OqNvi">
-                    <ref role="37wK5l" node="55xYlrlXgo6" resolve="withFeedbackBasis" />
-                    <node concept="37vLTw" id="55xYlrmuqsy" role="37wK5m">
-                      <ref role="3cqZAo" node="55xYlrmpLFZ" resolve="invalidatedFeedbackBasis" />
-                    </node>
-                    <node concept="37vLTw" id="6DQTzHy6W36" role="37wK5m">
-                      <ref role="3cqZAo" node="6DQTzHy6_yw" resolve="validatedFeedbackBasis" />
-                    </node>
+          <node concept="3clFbF" id="1VeWL_cM703" role="3cqZAp">
+            <node concept="2OqwBi" id="1VeWL_cM706" role="3clFbG">
+              <node concept="2OqwBi" id="1VeWL_cM708" role="2Oq$k0">
+                <node concept="liA8E" id="1VeWL_cM70a" role="2OqNvi">
+                  <ref role="37wK5l" node="1RYTbd8duYG" resolve="withInvalidatedOrigins" />
+                  <node concept="37vLTw" id="1VeWL_cM70b" role="37wK5m">
+                    <ref role="3cqZAo" node="5Qx6_65sCpg" resolve="invalidatedSet" />
                   </node>
                 </node>
-                <node concept="liA8E" id="1RYTbd8gNIE" role="2OqNvi">
-                  <ref role="37wK5l" node="1RYTbd8deMs" resolve="withTypes" />
-                  <node concept="37vLTw" id="1RYTbd8gNIF" role="37wK5m">
-                    <ref role="3cqZAo" node="1RYTbd8gNIm" resolve="node2type" />
+                <node concept="3nyPlj" id="1VeWL_cMOv7" role="2Oq$k0">
+                  <ref role="37wK5l" node="1RYTbd8gjGw" resolve="populateResponse" />
+                  <node concept="37vLTw" id="1VeWL_cMOv8" role="37wK5m">
+                    <ref role="3cqZAo" node="1RYTbd8gD1y" resolve="response" />
                   </node>
                 </node>
               </node>
-              <node concept="liA8E" id="1RYTbd8gNIG" role="2OqNvi">
-                <ref role="37wK5l" node="1RYTbd8cgqO" resolve="withReportItems" />
-                <node concept="37vLTw" id="1RYTbd8gNIH" role="37wK5m">
-                  <ref role="3cqZAo" node="5Qx6_65qW78" resolve="collectedReportItems" />
+              <node concept="liA8E" id="1VeWL_cM70e" role="2OqNvi">
+                <ref role="37wK5l" node="55xYlrlXgo6" resolve="withFeedbackBasis" />
+                <node concept="37vLTw" id="1VeWL_cM70f" role="37wK5m">
+                  <ref role="3cqZAo" node="55xYlrmpLFZ" resolve="invalidatedFeedbackBasis" />
+                </node>
+                <node concept="37vLTw" id="1VeWL_cM70g" role="37wK5m">
+                  <ref role="3cqZAo" node="6DQTzHy6_yw" resolve="validatedFeedbackBasis" />
                 </node>
               </node>
             </node>
@@ -15259,6 +14768,16 @@
         </node>
       </node>
       <node concept="2tJIrI" id="1RYTbd8gICh" role="jymVt" />
+      <node concept="312cEg" id="7i3KM7gP3A_" role="jymVt">
+        <property role="TrG5h" value="unit" />
+        <node concept="3Tmbuc" id="5Qx6_65SX5Y" role="1B3o_S" />
+        <node concept="3Tqbb2" id="6nFpYlvopJ5" role="1tU5fm" />
+      </node>
+      <node concept="312cEg" id="6nFpYlvovYQ" role="jymVt">
+        <property role="TrG5h" value="model" />
+        <node concept="3Tmbuc" id="5Qx6_65SYdA" role="1B3o_S" />
+        <node concept="H_c77" id="6nFpYlvovYT" role="1tU5fm" />
+      </node>
       <node concept="312cEg" id="5Qx6_65sCpg" role="jymVt">
         <property role="TrG5h" value="invalidatedSet" />
         <node concept="3Tm6S6" id="5Qx6_65sCph" role="1B3o_S" />
@@ -15271,22 +14790,6 @@
           </node>
         </node>
       </node>
-      <node concept="312cEg" id="6NlBtKd2D$W" role="jymVt">
-        <property role="TrG5h" value="invalidatedFeedbackKeys" />
-        <node concept="3Tm6S6" id="6NlBtKd2D$X" role="1B3o_S" />
-        <node concept="2hMVRd" id="6NlBtKd2D$Y" role="1tU5fm">
-          <node concept="3uibUv" id="6NlBtKd2K1K" role="2hN53Y">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-        <node concept="2ShNRf" id="6NlBtKd2D_0" role="33vP2m">
-          <node concept="2i4dXS" id="6NlBtKd2D_1" role="2ShVmc">
-            <node concept="3uibUv" id="6NlBtKd2T69" role="HW$YZ">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="312cEg" id="55xYlrmpLFZ" role="jymVt">
         <property role="TrG5h" value="invalidatedFeedbackBasis" />
         <node concept="3Tm6S6" id="55xYlrmpLG0" role="1B3o_S" />
@@ -15319,8 +14822,8 @@
           </node>
         </node>
       </node>
-      <node concept="3uibUv" id="5Qx6_65T3yy" role="1zkMxy">
-        <ref role="3uigEE" node="5Qx6_65Rzkz" resolve="TypecheckingStrategy.Watching" />
+      <node concept="3uibUv" id="1VeWL_cO$qE" role="1zkMxy">
+        <ref role="3uigEE" node="5Qx6_65Eucp" resolve="Caching" />
       </node>
     </node>
     <node concept="2tJIrI" id="61G6TdCstnA" role="jymVt" />
@@ -17700,43 +17203,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="1RYTbd8jIZ1" role="jymVt" />
-    <node concept="3clFb_" id="1RYTbd8cOQG" role="jymVt">
-      <property role="TrG5h" value="withInvalidatedFeedbackKeys" />
-      <node concept="37vLTG" id="1RYTbd8cYjG" role="3clF46">
-        <property role="TrG5h" value="invalidatedFeedbackKeys" />
-        <node concept="2hMVRd" id="1RYTbd8dlRP" role="1tU5fm">
-          <node concept="3uibUv" id="1RYTbd8d$RM" role="2hN53Y">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="1RYTbd8cQwg" role="3clF45">
-        <ref role="3uigEE" node="1RYTbd8bNK8" resolve="TypecheckingService.Response" />
-        <node concept="16syzq" id="1RYTbd8g0qA" role="11_B2D">
-          <ref role="16sUi3" node="1RYTbd8cAxn" resolve="T" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1RYTbd8cOQJ" role="1B3o_S" />
-      <node concept="3clFbS" id="1RYTbd8cOQK" role="3clF47">
-        <node concept="3clFbF" id="1RYTbd8dCTT" role="3cqZAp">
-          <node concept="37vLTI" id="1RYTbd8dCTV" role="3clFbG">
-            <node concept="2OqwBi" id="1RYTbd8dHSt" role="37vLTJ">
-              <node concept="Xjq3P" id="1RYTbd8dHYm" role="2Oq$k0" />
-              <node concept="2OwXpG" id="1RYTbd8dHSw" role="2OqNvi">
-                <ref role="2Oxat5" node="1RYTbd8dCTO" resolve="invalidatedFeedbackKeys" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="1RYTbd8dCTZ" role="37vLTx">
-              <ref role="3cqZAo" node="1RYTbd8cYjG" resolve="invalidatedFeedbackKeys" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1RYTbd8dpsy" role="3cqZAp">
-          <node concept="Xjq3P" id="1RYTbd8dpsw" role="3clFbG" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1RYTbd8duYV" role="jymVt" />
     <node concept="3clFb_" id="1RYTbd8duYG" role="jymVt">
       <property role="TrG5h" value="withInvalidatedOrigins" />
       <node concept="37vLTG" id="1RYTbd8duYH" role="3clF46">
@@ -17940,14 +17406,6 @@
         <node concept="3Tqbb2" id="3Pxu0s8mb9_" role="2hN53Y" />
       </node>
     </node>
-    <node concept="312cEg" id="1RYTbd8dCTO" role="jymVt">
-      <property role="TrG5h" value="invalidatedFeedbackKeys" />
-      <node concept="2hMVRd" id="1RYTbd8dCTR" role="1tU5fm">
-        <node concept="3uibUv" id="1RYTbd8dCTS" role="2hN53Y">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-    </node>
     <node concept="312cEg" id="55xYlrlX9c4" role="jymVt">
       <property role="TrG5h" value="invalidatedFeedbackBasis" />
       <node concept="3vKaQO" id="55xYlrm7Acu" role="1tU5fm">
@@ -18133,14 +17591,6 @@
                                         <ref role="2Oxat5" node="1RYTbd8dm$e" resolve="invalidatedOrigins" />
                                       </node>
                                     </node>
-                                    <node concept="2OqwBi" id="3Pxu0s8sbz9" role="37wK5m">
-                                      <node concept="37vLTw" id="3Pxu0s8sbza" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1RYTbd8sGIe" resolve="response" />
-                                      </node>
-                                      <node concept="2OwXpG" id="3Pxu0s8sbzb" role="2OqNvi">
-                                        <ref role="2Oxat5" node="1RYTbd8dCTO" resolve="invalidatedFeedbackKeys" />
-                                      </node>
-                                    </node>
                                   </node>
                                 </node>
                               </node>
@@ -18556,14 +18006,6 @@
                                         <ref role="2Oxat5" node="1RYTbd8dm$e" resolve="invalidatedOrigins" />
                                       </node>
                                     </node>
-                                    <node concept="2OqwBi" id="55xYlrmwLMM" role="37wK5m">
-                                      <node concept="37vLTw" id="55xYlrmwLMN" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1RYTbd8qEOb" resolve="response" />
-                                      </node>
-                                      <node concept="2OwXpG" id="55xYlrmwLMO" role="2OqNvi">
-                                        <ref role="2Oxat5" node="1RYTbd8dCTO" resolve="invalidatedFeedbackKeys" />
-                                      </node>
-                                    </node>
                                   </node>
                                 </node>
                               </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 4af66cd2..5cc8ec48 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -279,7 +279,6 @@
       <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
-      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
         <child id="1201186121363" name="typeParameter" index="2Ghqu4" />
@@ -398,10 +397,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
-        <child id="1226511765987" name="elementType" index="2hN53Y" />
-      </concept>
-      <concept id="1226516258405" name="jetbrains.mps.baseLanguage.collections.structure.HashSetCreator" flags="nn" index="2i4dXS" />
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
@@ -409,14 +404,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
-        <child id="1153944400369" name="variable" index="2Gsz3X" />
-        <child id="1153944424730" name="inputSequence" index="2GsD0m" />
-      </concept>
-      <concept id="1153944193378" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariable" flags="nr" index="2GrKxI" />
-      <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
-        <reference id="1153944258490" name="variable" index="2Gs0qQ" />
-      </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
@@ -433,7 +420,6 @@
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
-      <concept id="31378964227347002" name="jetbrains.mps.baseLanguage.collections.structure.SelectNotNullOperation" flags="ng" index="1KnU$U" />
       <concept id="1522217801069396578" name="jetbrains.mps.baseLanguage.collections.structure.FoldLeftOperation" flags="nn" index="1MD8d$">
         <child id="1522217801069421796" name="seed" index="1MDeny" />
       </concept>
@@ -1684,40 +1670,6 @@
         </node>
       </node>
     </node>
-    <node concept="Wx3nA" id="2yEnwsh8n5F" role="jymVt">
-      <property role="TrG5h" value="INVALIDATED_FEEDBACK_KEYS" />
-      <node concept="3Tm1VV" id="2yEnwsh8n5G" role="1B3o_S" />
-      <node concept="2YIFZM" id="2yEnwsh8n5H" role="33vP2m">
-        <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
-        <ref role="37wK5l" node="6BMBBPD1Gnj" resolve="valueKey" />
-        <node concept="3VsKOn" id="3yEb0I3V6lp" role="37wK5m">
-          <ref role="3VsUkX" to="33ny:~Collection" resolve="Collection" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="2yEnwsh8n5I" role="1tU5fm">
-        <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKey" />
-        <node concept="3uibUv" id="3yEb0I3V1Oh" role="11_B2D">
-          <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-        </node>
-      </node>
-    </node>
-    <node concept="Wx3nA" id="2EG5v$dFgce" role="jymVt">
-      <property role="TrG5h" value="INVALIDATED_ORIGINS" />
-      <node concept="3Tm1VV" id="2EG5v$dFgcf" role="1B3o_S" />
-      <node concept="2YIFZM" id="2EG5v$dFgcg" role="33vP2m">
-        <ref role="37wK5l" node="6BMBBPD1Gnj" resolve="valueKey" />
-        <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
-        <node concept="3VsKOn" id="2EG5v$dFgch" role="37wK5m">
-          <ref role="3VsUkX" to="33ny:~Collection" resolve="Collection" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="2EG5v$dFgci" role="1tU5fm">
-        <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKey" />
-        <node concept="3uibUv" id="2EG5v$dFgcj" role="11_B2D">
-          <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="5gVsyvEPHRE" role="jymVt" />
     <node concept="3clFbW" id="1pPth$lHpLU" role="jymVt">
       <node concept="3cqZAl" id="1pPth$lHpLW" role="3clF45" />
@@ -2331,53 +2283,6 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="3cpWs8" id="3VwM5b5$IhH" role="3cqZAp">
-                            <node concept="3cpWsn" id="3VwM5b5$IhI" role="3cpWs9">
-                              <property role="TrG5h" value="invalidFeedbackKeys" />
-                              <node concept="3uibUv" id="3VwM5b5$IhJ" role="1tU5fm">
-                                <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-                                <node concept="3uibUv" id="3VwM5b5$IhK" role="11_B2D">
-                                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="3VwM5b5$IhL" role="33vP2m">
-                                <node concept="37vLTw" id="3VwM5b5$IhM" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4J__M6Mw24" resolve="evaluationResult" />
-                                </node>
-                                <node concept="liA8E" id="3VwM5b5$IhN" role="2OqNvi">
-                                  <ref role="37wK5l" to="w7la:~EvaluationResult.invalidFeedbackKeys()" resolve="invalidFeedbackKeys" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3cpWs8" id="2EG5v$dFmTU" role="3cqZAp">
-                            <node concept="3cpWsn" id="2EG5v$dFmTX" role="3cpWs9">
-                              <property role="TrG5h" value="invalidatedOrigins" />
-                              <node concept="3vKaQO" id="2EG5v$dFmTR" role="1tU5fm">
-                                <node concept="3Tqbb2" id="3Pxu0s8k8tA" role="3O5elw" />
-                              </node>
-                              <node concept="1rXfSq" id="2EG5v$dG07H" role="33vP2m">
-                                <ref role="37wK5l" node="2EG5v$dDKbh" resolve="collectInvalidatedOrigins" />
-                                <node concept="2OqwBi" id="6KCGZaSxuGM" role="37wK5m">
-                                  <node concept="37vLTw" id="6KCGZaSxtQH" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4J__M6Mw24" resolve="evaluationResult" />
-                                  </node>
-                                  <node concept="liA8E" id="6KCGZaSxvsw" role="2OqNvi">
-                                    <ref role="37wK5l" to="w7la:~EvaluationResult.invalidRules()" resolve="invalidRules" />
-                                  </node>
-                                </node>
-                                <node concept="2OqwBi" id="2EG5v$dGHtc" role="37wK5m">
-                                  <node concept="37vLTw" id="2EG5v$dGGeL" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7WKNeR9AoxI" resolve="programProducer" />
-                                  </node>
-                                  <node concept="liA8E" id="2EG5v$dGIwD" role="2OqNvi">
-                                    <ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3clFbH" id="51a$_pPMPYj" role="3cqZAp" />
                           <node concept="3clFbF" id="q1hCixUYFm" role="3cqZAp">
                             <node concept="37vLTI" id="q1hCixUYFn" role="3clFbG">
                               <node concept="2YIFZM" id="q1hCixUYFs" role="37vLTx">
@@ -2405,28 +2310,6 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="2OqwBi" id="q1hCixUYFz" role="37wK5m">
-                                  <node concept="37vLTw" id="51ek2rQHN6Z" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2yEnwsh8n5F" resolve="INVALIDATED_FEEDBACK_KEYS" />
-                                  </node>
-                                  <node concept="liA8E" id="q1hCixUYF_" role="2OqNvi">
-                                    <ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
-                                    <node concept="37vLTw" id="3VwM5b5$LeE" role="37wK5m">
-                                      <ref role="3cqZAo" node="3VwM5b5$IhI" resolve="invalidFeedbackKeys" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="2OqwBi" id="2EG5v$dFjOp" role="37wK5m">
-                                  <node concept="37vLTw" id="2EG5v$dFior" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2EG5v$dFgce" resolve="INVALIDATED_ORIGINS" />
-                                  </node>
-                                  <node concept="liA8E" id="2EG5v$dFkOS" role="2OqNvi">
-                                    <ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
-                                    <node concept="37vLTw" id="2EG5v$dGPCg" role="37wK5m">
-                                      <ref role="3cqZAo" node="2EG5v$dFmTX" resolve="invalidatedOrigins" />
-                                    </node>
-                                  </node>
-                                </node>
                               </node>
                               <node concept="37vLTw" id="q1hCixUYFB" role="37vLTJ">
                                 <ref role="3cqZAo" node="19OC8ZSz1h" resolve="outEff" />
@@ -2507,138 +2390,6 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="2EG5v$dDC27" role="jymVt" />
-    <node concept="3clFb_" id="2EG5v$dDKbh" role="jymVt">
-      <property role="TrG5h" value="collectInvalidatedOrigins" />
-      <node concept="3clFbS" id="2EG5v$dDKbk" role="3clF47">
-        <node concept="3cpWs8" id="2EG5v$dFx$H" role="3cqZAp">
-          <node concept="3cpWsn" id="2EG5v$dFx$K" role="3cpWs9">
-            <property role="TrG5h" value="invalidOrigins" />
-            <node concept="2ShNRf" id="2EG5v$dF$cN" role="33vP2m">
-              <node concept="2i4dXS" id="2EG5v$dFBP6" role="2ShVmc">
-                <node concept="3Tqbb2" id="3Pxu0s8k6b7" role="HW$YZ" />
-              </node>
-            </node>
-            <node concept="2hMVRd" id="2EG5v$dFB68" role="1tU5fm">
-              <node concept="3Tqbb2" id="3Pxu0s8k4Xz" role="2hN53Y" />
-            </node>
-          </node>
-        </node>
-        <node concept="2Gpval" id="2EG5v$dED9n" role="3cqZAp">
-          <node concept="2GrKxI" id="2EG5v$dED9p" role="2Gsz3X">
-            <property role="TrG5h" value="rule" />
-          </node>
-          <node concept="2OqwBi" id="2EG5v$dEHwK" role="2GsD0m">
-            <node concept="37vLTw" id="2EG5v$dEHmm" role="2Oq$k0">
-              <ref role="3cqZAo" node="2EG5v$dE$K8" resolve="program" />
-            </node>
-            <node concept="liA8E" id="2EG5v$dEHHc" role="2OqNvi">
-              <ref role="37wK5l" to="av0y:~Program.rules()" resolve="rules" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="2EG5v$dED9t" role="2LFqv$">
-            <node concept="3clFbJ" id="2EG5v$dEHY9" role="3cqZAp">
-              <node concept="3clFbS" id="2EG5v$dEHYb" role="3clFbx">
-                <node concept="3cpWs8" id="2EG5v$dFHhG" role="3cqZAp">
-                  <node concept="3cpWsn" id="2EG5v$dFHhH" role="3cpWs9">
-                    <property role="TrG5h" value="ruleEx" />
-                    <node concept="3uibUv" id="2EG5v$dFHhI" role="1tU5fm">
-                      <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
-                    </node>
-                    <node concept="10QFUN" id="2EG5v$dFHMF" role="33vP2m">
-                      <node concept="2GrUjf" id="2EG5v$dFHME" role="10QFUP">
-                        <ref role="2Gs0qQ" node="2EG5v$dED9p" resolve="rule" />
-                      </node>
-                      <node concept="3uibUv" id="2EG5v$dFHMD" role="10QFUM">
-                        <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="2EG5v$dFCk1" role="3cqZAp">
-                  <node concept="2OqwBi" id="2EG5v$dFD08" role="3clFbG">
-                    <node concept="37vLTw" id="2EG5v$dFCk0" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2EG5v$dFx$K" resolve="invalidOrigins" />
-                    </node>
-                    <node concept="TSZUe" id="2EG5v$dFDzJ" role="2OqNvi">
-                      <node concept="2OqwBi" id="2EG5v$dFICT" role="25WWJ7">
-                        <node concept="37vLTw" id="2EG5v$dFI3s" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2EG5v$dFHhH" resolve="ruleEx" />
-                        </node>
-                        <node concept="liA8E" id="3Pxu0s8k3w3" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1Wc70l" id="5TVnHpN_U$" role="3clFbw">
-                <node concept="2OqwBi" id="5TVnHpNB7E" role="3uHU7w">
-                  <node concept="37vLTw" id="5TVnHpNCrt" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2EG5v$dDN7X" resolve="invalidRules" />
-                  </node>
-                  <node concept="3JPx81" id="5TVnHpNC5K" role="2OqNvi">
-                    <node concept="2OqwBi" id="5TVnHpNDgj" role="25WWJ7">
-                      <node concept="2GrUjf" id="5TVnHpNCUM" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="2EG5v$dED9p" resolve="rule" />
-                      </node>
-                      <node concept="liA8E" id="5TVnHpND$q" role="2OqNvi">
-                        <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2ZW3vV" id="5TVnHpN$Rh" role="3uHU7B">
-                  <node concept="3uibUv" id="5TVnHpN_i6" role="2ZW6by">
-                    <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
-                  </node>
-                  <node concept="2GrUjf" id="5TVnHpN$jE" role="2ZW6bz">
-                    <ref role="2Gs0qQ" node="2EG5v$dED9p" resolve="rule" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="2EG5v$dE0Ey" role="3cqZAp">
-          <node concept="2OqwBi" id="2EG5v$dGi5x" role="3cqZAk">
-            <node concept="2OqwBi" id="2EG5v$dGe0Z" role="2Oq$k0">
-              <node concept="37vLTw" id="2EG5v$dFNJn" role="2Oq$k0">
-                <ref role="3cqZAo" node="2EG5v$dFx$K" resolve="invalidOrigins" />
-              </node>
-              <node concept="1KnU$U" id="2EG5v$dGfNn" role="2OqNvi" />
-            </node>
-            <node concept="ANE8D" id="2EG5v$dGjOE" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="2EG5v$dDFcp" role="1B3o_S" />
-      <node concept="37vLTG" id="2EG5v$dDN7X" role="3clF46">
-        <property role="TrG5h" value="invalidRules" />
-        <node concept="3vKaQO" id="2EG5v$dGM5K" role="1tU5fm">
-          <node concept="3uibUv" id="2EG5v$dGNwF" role="3O5elw">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="2EG5v$dE$K8" role="3clF46">
-        <property role="TrG5h" value="program" />
-        <node concept="3uibUv" id="2EG5v$dECdR" role="1tU5fm">
-          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
-        </node>
-      </node>
-      <node concept="3vKaQO" id="2EG5v$dFtoQ" role="3clF45">
-        <node concept="3Tqbb2" id="3Pxu0s8k16z" role="3O5elw" />
-      </node>
-      <node concept="P$JXv" id="2EG5v$dFT$I" role="lGtFl">
-        <node concept="TZ5HA" id="2EG5v$dFT$J" role="TZ5H$">
-          <node concept="1dT_AC" id="2EG5v$dFT$K" role="1dT_Ay">
-            <property role="1dT_AB" value="The logic is following: If any rule for this origins has invalidated matches, then origin is invalidated" />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="q1hCixUG9z" role="jymVt" />
     <node concept="3clFb_" id="6kREIVky9Kx" role="jymVt">
       <property role="TrG5h" value="timeout" />