From 1d620cdd632cd41eb0300515594536decdcc3af7 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Sun, 16 May 2021 11:58:11 +0200
Subject: [PATCH] Drop obsolete unused features, cleanup the code

---
 .../jetbrains.mps.lang.coderules.program.mps  |  620 +-------
 ...ains.mps.coderules.testhelper.testutil.mps |   38 +-
 ...s.mps.coderules.typechecking.ui.plugin.mps |    2 +-
 ...ins.mps.coderules.typechecking.service.mps |    7 +-
 .../models/service.mps                        |   75 -
 .../models/plugin.mps                         |    2 +-
 .../jetbrains.mps.lang.coderules.template.mps | 1256 +----------------
 7 files changed, 54 insertions(+), 1946 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index cd644465..a7e6d09e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -3424,17 +3424,12 @@
                               <property role="Xl_RC" value="' (" />
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="7ElRE1BM$IN" role="3uHU7w">
-                            <node concept="2OqwBi" id="3OUB6BCcAbv" role="2Oq$k0">
-                              <node concept="37vLTw" id="3OUB6BCcAbY" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3OUB6BCcAbW" resolve="rule" />
-                              </node>
-                              <node concept="liA8E" id="7ElRE1BM$tJ" role="2OqNvi">
-                                <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
-                              </node>
+                          <node concept="2OqwBi" id="3OUB6BCcAbv" role="3uHU7w">
+                            <node concept="37vLTw" id="3OUB6BCcAbY" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3OUB6BCcAbW" resolve="rule" />
                             </node>
-                            <node concept="liA8E" id="7ElRE1BM_4g" role="2OqNvi">
-                              <ref role="37wK5l" to="av0y:~Rule$Tag.name()" resolve="name" />
+                            <node concept="liA8E" id="7ElRE1BM$tJ" role="2OqNvi">
+                              <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
                             </node>
                           </node>
                         </node>
@@ -3442,27 +3437,22 @@
                           <property role="Xl_RC" value=" and " />
                         </node>
                       </node>
-                      <node concept="2OqwBi" id="7ElRE1BM_s0" role="3uHU7w">
-                        <node concept="2OqwBi" id="3OUB6BCcAbz" role="2Oq$k0">
-                          <node concept="3EllGN" id="3OUB6BCcAb$" role="2Oq$k0">
-                            <node concept="2OqwBi" id="3OUB6BCcAb_" role="3ElVtu">
-                              <node concept="37vLTw" id="3OUB6BCcAc1" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3OUB6BCcAbW" resolve="rule" />
-                              </node>
-                              <node concept="liA8E" id="3OUB6BCcAbB" role="2OqNvi">
-                                <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
-                              </node>
+                      <node concept="2OqwBi" id="3OUB6BCcAbz" role="3uHU7w">
+                        <node concept="3EllGN" id="3OUB6BCcAb$" role="2Oq$k0">
+                          <node concept="2OqwBi" id="3OUB6BCcAb_" role="3ElVtu">
+                            <node concept="37vLTw" id="3OUB6BCcAc1" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3OUB6BCcAbW" resolve="rule" />
                             </node>
-                            <node concept="37vLTw" id="3OUB6BCcAbC" role="3ElQJh">
-                              <ref role="3cqZAo" node="1N8$BG_2NH_" resolve="tag2rule" />
+                            <node concept="liA8E" id="3OUB6BCcAbB" role="2OqNvi">
+                              <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
                             </node>
                           </node>
-                          <node concept="liA8E" id="7ElRE1BM_9K" role="2OqNvi">
-                            <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
+                          <node concept="37vLTw" id="3OUB6BCcAbC" role="3ElQJh">
+                            <ref role="3cqZAo" node="1N8$BG_2NH_" resolve="tag2rule" />
                           </node>
                         </node>
-                        <node concept="liA8E" id="7ElRE1BM_PU" role="2OqNvi">
-                          <ref role="37wK5l" to="av0y:~Rule$Tag.name()" resolve="name" />
+                        <node concept="liA8E" id="7ElRE1BM_9K" role="2OqNvi">
+                          <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
                         </node>
                       </node>
                     </node>
@@ -4693,12 +4683,6 @@
           <property role="TrG5h" value="node" />
           <node concept="3Tqbb2" id="12yN8DyNqgv" role="1tU5fm" />
         </node>
-        <node concept="37vLTG" id="1eEe91P05bm" role="3clF46">
-          <property role="TrG5h" value="param" />
-          <node concept="16syzq" id="1eEe91P05YL" role="1tU5fm">
-            <ref role="16sUi3" node="1eEe91P03Zq" resolve="P" />
-          </node>
-        </node>
         <node concept="16syzq" id="tIwzd1IBoE" role="3clF45">
           <ref role="16sUi3" node="tIwzd1IBnx" resolve="T" />
         </node>
@@ -4735,46 +4719,11 @@
         <node concept="3Tm1VV" id="tIwzd1ILXp" role="1B3o_S" />
         <node concept="3clFbS" id="tIwzd1ILXq" role="3clF47" />
       </node>
-      <node concept="2tJIrI" id="12yN8DyNqfE" role="jymVt" />
-      <node concept="3clFb_" id="1eEe91P21Wg" role="jymVt">
-        <property role="TrG5h" value="initialParam" />
-        <node concept="16syzq" id="1eEe91P29ch" role="3clF45">
-          <ref role="16sUi3" node="1eEe91P03Zq" resolve="P" />
-        </node>
-        <node concept="3Tm1VV" id="1eEe91P21Wj" role="1B3o_S" />
-        <node concept="3clFbS" id="1eEe91P21Wk" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="1eEe91P2ebP" role="jymVt" />
-      <node concept="3clFb_" id="1eEe91P2lma" role="jymVt">
-        <property role="TrG5h" value="nextParam" />
-        <node concept="37vLTG" id="1eEe91P2vYz" role="3clF46">
-          <property role="TrG5h" value="parent" />
-          <node concept="3Tqbb2" id="1eEe91P2x6O" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="1eEe91P2xwO" role="3clF46">
-          <property role="TrG5h" value="child" />
-          <node concept="3Tqbb2" id="1eEe91P2z4z" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="1eEe91P2ziL" role="3clF46">
-          <property role="TrG5h" value="prevParam" />
-          <node concept="16syzq" id="1eEe91P2$DI" role="1tU5fm">
-            <ref role="16sUi3" node="1eEe91P03Zq" resolve="P" />
-          </node>
-        </node>
-        <node concept="16syzq" id="1eEe91P2r8m" role="3clF45">
-          <ref role="16sUi3" node="1eEe91P03Zq" resolve="P" />
-        </node>
-        <node concept="3Tm1VV" id="1eEe91P2lmd" role="1B3o_S" />
-        <node concept="3clFbS" id="1eEe91P2lme" role="3clF47" />
-      </node>
       <node concept="2tJIrI" id="1eEe91P1UxR" role="jymVt" />
       <node concept="3Tm1VV" id="12yN8DyNqe9" role="1B3o_S" />
       <node concept="16euLQ" id="tIwzd1IBnx" role="16eVyc">
         <property role="TrG5h" value="T" />
       </node>
-      <node concept="16euLQ" id="1eEe91P03Zq" role="16eVyc">
-        <property role="TrG5h" value="P" />
-      </node>
       <node concept="3UR2Jj" id="tIwzd1IT_8" role="lGtFl">
         <node concept="TZ5HA" id="tIwzd1IT_9" role="TZ5H$">
           <node concept="1dT_AC" id="tIwzd1IT_a" role="1dT_Ay">
@@ -4800,9 +4749,6 @@
             <node concept="16syzq" id="4UTrqZZNZlu" role="11_B2D">
               <ref role="16sUi3" node="4UTrqZZNWwV" resolve="S" />
             </node>
-            <node concept="16syzq" id="1eEe91P0CA3" role="11_B2D">
-              <ref role="16sUi3" node="1eEe91P0A8O" resolve="P" />
-            </node>
           </node>
         </node>
         <node concept="3cqZAl" id="4UTrqZZNYyf" role="3clF45" />
@@ -4849,9 +4795,6 @@
             <node concept="16syzq" id="3IIf9O_hbbv" role="11_B2D">
               <ref role="16sUi3" node="4UTrqZZNWwV" resolve="S" />
             </node>
-            <node concept="16syzq" id="1eEe91P0CL$" role="11_B2D">
-              <ref role="16sUi3" node="1eEe91P0A8O" resolve="P" />
-            </node>
           </node>
         </node>
         <node concept="3cqZAl" id="3IIf9O_hbbw" role="3clF45" />
@@ -4892,50 +4835,18 @@
               <ref role="37wK5l" node="tIwzd1KVkc" resolve="reduce" />
               <node concept="2ShNRf" id="4UTrqZZNWZS" role="37wK5m">
                 <node concept="kMnCb" id="4UTrqZZNWZT" role="2ShVmc">
-                  <node concept="1LlUBW" id="1eEe91P0WEw" role="kMuH3">
-                    <node concept="3Tqbb2" id="1eEe91P0WXI" role="1Lm7xW" />
-                    <node concept="16syzq" id="1eEe91P0YiB" role="1Lm7xW">
-                      <ref role="16sUi3" node="1eEe91P0A8O" resolve="P" />
-                    </node>
-                  </node>
                   <node concept="1bVj0M" id="4UTrqZZNWZV" role="kMx8a">
                     <node concept="3clFbS" id="4UTrqZZNWZW" role="1bW5cS">
-                      <node concept="3cpWs8" id="1eEe91P3Y1W" role="3cqZAp">
-                        <node concept="3cpWsn" id="1eEe91P3Y1X" role="3cpWs9">
-                          <property role="TrG5h" value="initialParam" />
-                          <node concept="16syzq" id="1eEe91P3XDa" role="1tU5fm">
-                            <ref role="16sUi3" node="1eEe91P0A8O" resolve="P" />
-                          </node>
-                          <node concept="2OqwBi" id="1eEe91P3Y1Y" role="33vP2m">
-                            <node concept="37vLTw" id="1eEe91P3Y1Z" role="2Oq$k0">
-                              <ref role="3cqZAo" node="12yN8DyNqkg" resolve="action" />
-                            </node>
-                            <node concept="liA8E" id="1eEe91P3Y20" role="2OqNvi">
-                              <ref role="37wK5l" node="1eEe91P21Wg" resolve="initialParam" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
                       <node concept="3clFbH" id="1eEe91P40hC" role="3cqZAp" />
                       <node concept="3cpWs8" id="4UTrqZZNWZX" role="3cqZAp">
                         <node concept="3cpWsn" id="4UTrqZZNWZY" role="3cpWs9">
                           <property role="TrG5h" value="queue" />
                           <node concept="3O6Q9H" id="4UTrqZZNWZZ" role="1tU5fm">
-                            <node concept="1LlUBW" id="1eEe91P4ZHZ" role="3O5elw">
-                              <node concept="3Tqbb2" id="1eEe91P52Er" role="1Lm7xW" />
-                              <node concept="16syzq" id="1eEe91P565S" role="1Lm7xW">
-                                <ref role="16sUi3" node="1eEe91P0A8O" resolve="P" />
-                              </node>
-                            </node>
+                            <node concept="3Tqbb2" id="1eEe91P52Er" role="3O5elw" />
                           </node>
                           <node concept="2ShNRf" id="4UTrqZZNX01" role="33vP2m">
                             <node concept="2Jqq0_" id="4UTrqZZNX02" role="2ShVmc">
-                              <node concept="1LlUBW" id="1eEe91P58rM" role="HW$YZ">
-                                <node concept="3Tqbb2" id="1eEe91P5cre" role="1Lm7xW" />
-                                <node concept="16syzq" id="1eEe91P5hgj" role="1Lm7xW">
-                                  <ref role="16sUi3" node="1eEe91P0A8O" resolve="P" />
-                                </node>
-                              </node>
+                              <node concept="3Tqbb2" id="IFW4V3qBZP" role="HW$YZ" />
                             </node>
                           </node>
                         </node>
@@ -4946,30 +4857,8 @@
                             <ref role="3cqZAo" node="4UTrqZZNWZY" resolve="queue" />
                           </node>
                           <node concept="X8dFx" id="3IIf9O_iBeP" role="2OqNvi">
-                            <node concept="2OqwBi" id="1eEe91P5qbq" role="25WWJ7">
-                              <node concept="37vLTw" id="3IIf9O_iBeR" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4UTrqZZNZvj" resolve="startFrom" />
-                              </node>
-                              <node concept="3$u5V9" id="1eEe91P5rqG" role="2OqNvi">
-                                <node concept="1bVj0M" id="1eEe91P5rqI" role="23t8la">
-                                  <node concept="3clFbS" id="1eEe91P5rqJ" role="1bW5cS">
-                                    <node concept="3clFbF" id="1eEe91P5sl9" role="3cqZAp">
-                                      <node concept="1Ls8ON" id="1eEe91P5sl8" role="3clFbG">
-                                        <node concept="37vLTw" id="1eEe91P5tIb" role="1Lso8e">
-                                          <ref role="3cqZAo" node="1eEe91P5rqK" resolve="it" />
-                                        </node>
-                                        <node concept="37vLTw" id="1eEe91P5vnO" role="1Lso8e">
-                                          <ref role="3cqZAo" node="1eEe91P3Y1X" resolve="initialParam" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="Rh6nW" id="1eEe91P5rqK" role="1bW2Oz">
-                                    <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="1eEe91P5rqL" role="1tU5fm" />
-                                  </node>
-                                </node>
-                              </node>
+                            <node concept="37vLTw" id="3IIf9O_iBeR" role="25WWJ7">
+                              <ref role="3cqZAo" node="4UTrqZZNZvj" resolve="startFrom" />
                             </node>
                           </node>
                         </node>
@@ -4980,18 +4869,13 @@
                           <node concept="3cpWs8" id="4UTrqZZNX0c" role="3cqZAp">
                             <node concept="3cpWsn" id="4UTrqZZNX0d" role="3cpWs9">
                               <property role="TrG5h" value="next" />
-                              <node concept="1LlUBW" id="1eEe91P5vKn" role="1tU5fm">
-                                <node concept="3Tqbb2" id="1eEe91P5y8B" role="1Lm7xW" />
-                                <node concept="16syzq" id="1eEe91P5$mZ" role="1Lm7xW">
-                                  <ref role="16sUi3" node="1eEe91P0A8O" resolve="P" />
-                                </node>
-                              </node>
                               <node concept="2OqwBi" id="4UTrqZZNX0f" role="33vP2m">
                                 <node concept="37vLTw" id="4UTrqZZNX0g" role="2Oq$k0">
                                   <ref role="3cqZAo" node="4UTrqZZNWZY" resolve="queue" />
                                 </node>
                                 <node concept="2Kt2Hk" id="4UTrqZZNX0h" role="2OqNvi" />
                               </node>
+                              <node concept="3Tqbb2" id="IFW4V3qFLW" role="1tU5fm" />
                             </node>
                           </node>
                           <node concept="3clFbH" id="799SgOKwxHO" role="3cqZAp" />
@@ -5009,65 +4893,20 @@
                                 </node>
                                 <node concept="1rXfSq" id="4UTrqZZO6nB" role="3clFbw">
                                   <ref role="37wK5l" node="4UTrqZZO4eL" resolve="skip" />
-                                  <node concept="1LFfDK" id="1eEe91P5DJo" role="37wK5m">
-                                    <node concept="3cmrfG" id="1eEe91P5ExY" role="1LF_Uc">
-                                      <property role="3cmrfH" value="0" />
-                                    </node>
-                                    <node concept="37vLTw" id="4UTrqZZOcm6" role="1LFl5Q">
-                                      <ref role="3cqZAo" node="4UTrqZZNX0d" resolve="next" />
-                                    </node>
+                                  <node concept="37vLTw" id="IFW4V3qPxv" role="37wK5m">
+                                    <ref role="3cqZAo" node="4UTrqZZNX0d" resolve="next" />
                                   </node>
                                 </node>
                               </node>
                               <node concept="3clFbH" id="1eEe91P5F7x" role="3cqZAp" />
-                              <node concept="3cpWs8" id="1eEe91P5O1S" role="3cqZAp">
-                                <node concept="3cpWsn" id="1eEe91P5O1T" role="3cpWs9">
-                                  <property role="TrG5h" value="nextParam" />
-                                  <node concept="16syzq" id="1eEe91P5NVm" role="1tU5fm">
-                                    <ref role="16sUi3" node="1eEe91P0A8O" resolve="P" />
-                                  </node>
-                                  <node concept="2OqwBi" id="1eEe91P5O1U" role="33vP2m">
-                                    <node concept="37vLTw" id="1eEe91P5O1V" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="12yN8DyNqkg" resolve="action" />
-                                    </node>
-                                    <node concept="liA8E" id="1eEe91P5O1W" role="2OqNvi">
-                                      <ref role="37wK5l" node="1eEe91P2lma" resolve="nextParam" />
-                                      <node concept="1LFfDK" id="1eEe91P5O1X" role="37wK5m">
-                                        <node concept="3cmrfG" id="1eEe91P5O1Y" role="1LF_Uc">
-                                          <property role="3cmrfH" value="0" />
-                                        </node>
-                                        <node concept="37vLTw" id="1eEe91P5O1Z" role="1LFl5Q">
-                                          <ref role="3cqZAo" node="4UTrqZZNX0d" resolve="next" />
-                                        </node>
-                                      </node>
-                                      <node concept="37vLTw" id="1eEe91P5O20" role="37wK5m">
-                                        <ref role="3cqZAo" node="4UTrqZZNX0N" resolve="ch" />
-                                      </node>
-                                      <node concept="1LFfDK" id="1eEe91P5O21" role="37wK5m">
-                                        <node concept="3cmrfG" id="1eEe91P5O22" role="1LF_Uc">
-                                          <property role="3cmrfH" value="1" />
-                                        </node>
-                                        <node concept="37vLTw" id="1eEe91P5O23" role="1LFl5Q">
-                                          <ref role="3cqZAo" node="4UTrqZZNX0d" resolve="next" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
                               <node concept="3clFbF" id="4UTrqZZNX0I" role="3cqZAp">
                                 <node concept="2OqwBi" id="4UTrqZZNX0J" role="3clFbG">
                                   <node concept="37vLTw" id="4UTrqZZNX0K" role="2Oq$k0">
                                     <ref role="3cqZAo" node="4UTrqZZNWZY" resolve="queue" />
                                   </node>
                                   <node concept="2Ke9KJ" id="4UTrqZZNX0L" role="2OqNvi">
-                                    <node concept="1Ls8ON" id="1eEe91P5QF9" role="25WWJ7">
-                                      <node concept="37vLTw" id="1eEe91P5SyO" role="1Lso8e">
-                                        <ref role="3cqZAo" node="4UTrqZZNX0N" resolve="ch" />
-                                      </node>
-                                      <node concept="37vLTw" id="1eEe91P5THe" role="1Lso8e">
-                                        <ref role="3cqZAo" node="1eEe91P5O1T" resolve="nextParam" />
-                                      </node>
+                                    <node concept="37vLTw" id="IFW4V3qSGk" role="25WWJ7">
+                                      <ref role="3cqZAo" node="4UTrqZZNX0N" resolve="ch" />
                                     </node>
                                   </node>
                                 </node>
@@ -5078,15 +4917,10 @@
                               <node concept="3Tqbb2" id="4UTrqZZNX0O" role="1tU5fm" />
                             </node>
                             <node concept="2OqwBi" id="4UTrqZZNX0P" role="1DdaDG">
-                              <node concept="1LFfDK" id="1eEe91P5B5Q" role="2Oq$k0">
-                                <node concept="3cmrfG" id="1eEe91P5Ck4" role="1LF_Uc">
-                                  <property role="3cmrfH" value="0" />
-                                </node>
-                                <node concept="37vLTw" id="4UTrqZZNX0Q" role="1LFl5Q">
-                                  <ref role="3cqZAo" node="4UTrqZZNX0d" resolve="next" />
-                                </node>
-                              </node>
                               <node concept="32TBzR" id="4UTrqZZNX0R" role="2OqNvi" />
+                              <node concept="37vLTw" id="IFW4V3qIE9" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4UTrqZZNX0d" resolve="next" />
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -5101,6 +4935,7 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3Tqbb2" id="IFW4V3qDFR" role="kMuH3" />
                 </node>
               </node>
             </node>
@@ -5140,16 +4975,10 @@
         <node concept="16syzq" id="4UTrqZZNWxK" role="11_B2D">
           <ref role="16sUi3" node="4UTrqZZNWwV" resolve="S" />
         </node>
-        <node concept="16syzq" id="1eEe91P0BHq" role="11_B2D">
-          <ref role="16sUi3" node="1eEe91P0A8O" resolve="P" />
-        </node>
       </node>
       <node concept="16euLQ" id="4UTrqZZNWwV" role="16eVyc">
         <property role="TrG5h" value="S" />
       </node>
-      <node concept="16euLQ" id="1eEe91P0A8O" role="16eVyc">
-        <property role="TrG5h" value="P" />
-      </node>
       <node concept="312cEg" id="4UTrqZZNZvj" role="jymVt">
         <property role="TrG5h" value="startFrom" />
         <node concept="3Tm6S6" id="4UTrqZZNZvk" role="1B3o_S" />
@@ -5198,9 +5027,6 @@
             <node concept="16syzq" id="4UTrqZZObkm" role="11_B2D">
               <ref role="16sUi3" node="4UTrqZZOaLH" resolve="S" />
             </node>
-            <node concept="16syzq" id="1eEe91P0MZP" role="11_B2D">
-              <ref role="16sUi3" node="1eEe91P0Mqf" resolve="P" />
-            </node>
           </node>
         </node>
         <node concept="3cqZAl" id="4UTrqZZOaY8" role="3clF45" />
@@ -5232,9 +5058,6 @@
             <node concept="16syzq" id="3IIf9O_hpaf" role="11_B2D">
               <ref role="16sUi3" node="4UTrqZZOaLH" resolve="S" />
             </node>
-            <node concept="16syzq" id="1eEe91P0Ne3" role="11_B2D">
-              <ref role="16sUi3" node="1eEe91P0Mqf" resolve="P" />
-            </node>
           </node>
         </node>
         <node concept="3cqZAl" id="3IIf9O_hpag" role="3clF45" />
@@ -5315,16 +5138,10 @@
         <node concept="16syzq" id="4UTrqZZOaRM" role="11_B2D">
           <ref role="16sUi3" node="4UTrqZZOaLH" resolve="S" />
         </node>
-        <node concept="16syzq" id="1eEe91P0MNF" role="11_B2D">
-          <ref role="16sUi3" node="1eEe91P0Mqf" resolve="P" />
-        </node>
       </node>
       <node concept="16euLQ" id="4UTrqZZOaLH" role="16eVyc">
         <property role="TrG5h" value="S" />
       </node>
-      <node concept="16euLQ" id="1eEe91P0Mqf" role="16eVyc">
-        <property role="TrG5h" value="P" />
-      </node>
       <node concept="3UR2Jj" id="4UTrqZZQMQS" role="lGtFl">
         <node concept="TZ5HA" id="4UTrqZZQMQT" role="TZ5H$">
           <node concept="1dT_AC" id="4UTrqZZQMQU" role="1dT_Ay">
@@ -5353,9 +5170,6 @@
             <node concept="16syzq" id="4UTrqZZOjG1" role="11_B2D">
               <ref role="16sUi3" node="4UTrqZZOiH2" resolve="S" />
             </node>
-            <node concept="16syzq" id="1eEe91P0NLW" role="11_B2D">
-              <ref role="16sUi3" node="1eEe91P0NiJ" resolve="P" />
-            </node>
           </node>
         </node>
         <node concept="3cqZAl" id="4UTrqZZOjgR" role="3clF45" />
@@ -5394,35 +5208,8 @@
           <node concept="3clFbF" id="4UTrqZZQ_xi" role="3cqZAp">
             <node concept="1rXfSq" id="4UTrqZZQ_xg" role="3clFbG">
               <ref role="37wK5l" node="tIwzd1KVkc" resolve="reduce" />
-              <node concept="2OqwBi" id="1eEe91P11Z1" role="37wK5m">
-                <node concept="37vLTw" id="4UTrqZZQ_Hb" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4UTrqZZOjSr" resolve="nodes" />
-                </node>
-                <node concept="3$u5V9" id="1eEe91P12h_" role="2OqNvi">
-                  <node concept="1bVj0M" id="1eEe91P12hB" role="23t8la">
-                    <node concept="3clFbS" id="1eEe91P12hC" role="1bW5cS">
-                      <node concept="3clFbF" id="4Q576RaZ1Am" role="3cqZAp">
-                        <node concept="1Ls8ON" id="1eEe91P12qg" role="3clFbG">
-                          <node concept="37vLTw" id="1eEe91P12_g" role="1Lso8e">
-                            <ref role="3cqZAo" node="1eEe91P12hD" resolve="it" />
-                          </node>
-                          <node concept="2OqwBi" id="1eEe91P41lZ" role="1Lso8e">
-                            <node concept="37vLTw" id="1eEe91P410B" role="2Oq$k0">
-                              <ref role="3cqZAo" node="12yN8DyNqkg" resolve="action" />
-                            </node>
-                            <node concept="liA8E" id="1eEe91P41WR" role="2OqNvi">
-                              <ref role="37wK5l" node="1eEe91P21Wg" resolve="initialParam" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="1eEe91P12hD" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="1eEe91P12hE" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
+              <node concept="37vLTw" id="4UTrqZZQ_Hb" role="37wK5m">
+                <ref role="3cqZAo" node="4UTrqZZOjSr" resolve="nodes" />
               </node>
             </node>
           </node>
@@ -5436,17 +5223,11 @@
       <node concept="16euLQ" id="4UTrqZZOiH2" role="16eVyc">
         <property role="TrG5h" value="S" />
       </node>
-      <node concept="16euLQ" id="1eEe91P0NiJ" role="16eVyc">
-        <property role="TrG5h" value="P" />
-      </node>
       <node concept="3uibUv" id="4UTrqZZOj1t" role="1zkMxy">
         <ref role="3uigEE" node="12yN8DyNqdl" resolve="NodeWalker" />
         <node concept="16syzq" id="4UTrqZZOjas" role="11_B2D">
           <ref role="16sUi3" node="4UTrqZZOiH2" resolve="S" />
         </node>
-        <node concept="16syzq" id="1eEe91P0NDw" role="11_B2D">
-          <ref role="16sUi3" node="1eEe91P0NiJ" resolve="P" />
-        </node>
       </node>
       <node concept="312cEg" id="4UTrqZZOjSr" role="jymVt">
         <property role="TrG5h" value="nodes" />
@@ -5472,9 +5253,6 @@
           <node concept="16syzq" id="tIwzd1IBE1" role="11_B2D">
             <ref role="16sUi3" node="tIwzd1IC9f" resolve="T" />
           </node>
-          <node concept="16syzq" id="1eEe91P0NYA" role="11_B2D">
-            <ref role="16sUi3" node="1eEe91P0CSK" resolve="P" />
-          </node>
         </node>
       </node>
       <node concept="3cqZAl" id="12yN8DyNqjc" role="3clF45" />
@@ -5511,12 +5289,7 @@
       <node concept="37vLTG" id="tIwzd1KVkd" role="3clF46">
         <property role="TrG5h" value="nodes_param" />
         <node concept="A3Dl8" id="tIwzd1KZEw" role="1tU5fm">
-          <node concept="1LlUBW" id="1eEe91P0QK2" role="A3Ik2">
-            <node concept="3Tqbb2" id="1eEe91P0RLV" role="1Lm7xW" />
-            <node concept="16syzq" id="1eEe91P0T9Z" role="1Lm7xW">
-              <ref role="16sUi3" node="1eEe91P0CSK" resolve="P" />
-            </node>
-          </node>
+          <node concept="3Tqbb2" id="IFW4V3qWu$" role="A3Ik2" />
         </node>
       </node>
       <node concept="16syzq" id="tIwzd1KVkh" role="3clF45">
@@ -5549,21 +5322,8 @@
                 </node>
                 <node concept="1rXfSq" id="tIwzd1KVkL" role="33vP2m">
                   <ref role="37wK5l" node="5ntLU8Gjd9b" resolve="nodeAction" />
-                  <node concept="1LFfDK" id="1eEe91P0URN" role="37wK5m">
-                    <node concept="3cmrfG" id="1eEe91P0UWv" role="1LF_Uc">
-                      <property role="3cmrfH" value="0" />
-                    </node>
-                    <node concept="2GrUjf" id="tIwzd1KZp6" role="1LFl5Q">
-                      <ref role="2Gs0qQ" node="tIwzd1KYfA" resolve="next" />
-                    </node>
-                  </node>
-                  <node concept="1LFfDK" id="1eEe91P0V90" role="37wK5m">
-                    <node concept="3cmrfG" id="1eEe91P0Va1" role="1LF_Uc">
-                      <property role="3cmrfH" value="1" />
-                    </node>
-                    <node concept="2GrUjf" id="1eEe91P0V6c" role="1LFl5Q">
-                      <ref role="2Gs0qQ" node="tIwzd1KYfA" resolve="next" />
-                    </node>
+                  <node concept="2GrUjf" id="IFW4V3qZNB" role="37wK5m">
+                    <ref role="2Gs0qQ" node="tIwzd1KYfA" resolve="next" />
                   </node>
                 </node>
               </node>
@@ -5609,12 +5369,6 @@
         <property role="TrG5h" value="next" />
         <node concept="3Tqbb2" id="5ntLU8Gjd97" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="1eEe91P0Veh" role="3clF46">
-        <property role="TrG5h" value="param" />
-        <node concept="16syzq" id="1eEe91P0Wes" role="1tU5fm">
-          <ref role="16sUi3" node="1eEe91P0CSK" resolve="P" />
-        </node>
-      </node>
       <node concept="3clFbS" id="5ntLU8Gjd90" role="3clF47">
         <node concept="3SKdUt" id="5ntLU8GjdpF" role="3cqZAp">
           <node concept="1PaTwC" id="589APehYxQ1" role="1aUNEU">
@@ -5636,12 +5390,9 @@
             </node>
             <node concept="liA8E" id="5ntLU8Gjd94" role="2OqNvi">
               <ref role="37wK5l" node="12yN8DyNqeO" resolve="doAction" />
-              <node concept="37vLTw" id="5ntLU8Gjd98" role="37wK5m">
+              <node concept="37vLTw" id="IFW4V3r8dd" role="37wK5m">
                 <ref role="3cqZAo" node="5ntLU8Gjd96" resolve="next" />
               </node>
-              <node concept="37vLTw" id="1eEe91P0W$H" role="37wK5m">
-                <ref role="3cqZAo" node="1eEe91P0Veh" resolve="param" />
-              </node>
             </node>
           </node>
         </node>
@@ -5740,17 +5491,11 @@
         <node concept="16syzq" id="tIwzd1ID1q" role="11_B2D">
           <ref role="16sUi3" node="tIwzd1IC9f" resolve="T" />
         </node>
-        <node concept="16syzq" id="1eEe91P0OF7" role="11_B2D">
-          <ref role="16sUi3" node="1eEe91P0CSK" resolve="P" />
-        </node>
       </node>
     </node>
     <node concept="16euLQ" id="tIwzd1IC9f" role="16eVyc">
       <property role="TrG5h" value="T" />
     </node>
-    <node concept="16euLQ" id="1eEe91P0CSK" role="16eVyc">
-      <property role="TrG5h" value="P" />
-    </node>
     <node concept="2tJIrI" id="7DvO2M9_As1" role="jymVt" />
   </node>
   <node concept="312cEu" id="70Wv0dJhQb2">
@@ -6644,10 +6389,6 @@
                   </node>
                   <node concept="10Nm6u" id="2Qe6u2cltUB" role="37wK5m" />
                   <node concept="3clFbT" id="xaaVXviDd8" role="37wK5m" />
-                  <node concept="2YIFZM" id="1eEe91OYC50" role="37wK5m">
-                    <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
-                    <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-                  </node>
                   <node concept="37vLTw" id="5HxDM7D9TSc" role="37wK5m">
                     <ref role="3cqZAo" node="5HxDM7D9SW0" resolve="isPreamble" />
                   </node>
@@ -7995,15 +7736,6 @@
         <property role="TrG5h" value="skipAuxiliary" />
         <node concept="10P_77" id="xaaVXvi$Eh" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="1eEe91OYhWx" role="3clF46">
-        <property role="TrG5h" value="segmentPath" />
-        <node concept="3uibUv" id="1eEe91OYp0N" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="1eEe91OYqTx" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
       <node concept="3clFbS" id="tIwzd1I3Wv" role="3clF47">
         <node concept="3clFbH" id="3DPJ8QIV5YQ" role="3cqZAp" />
         <node concept="3clFbJ" id="3DPJ8QIV0vQ" role="3cqZAp">
@@ -8387,9 +8119,6 @@
                                     <node concept="37vLTw" id="47oVduO_peB" role="37wK5m">
                                       <ref role="3cqZAo" node="47oVduO$fi8" resolve="builders" />
                                     </node>
-                                    <node concept="37vLTw" id="47oVduO_rcM" role="37wK5m">
-                                      <ref role="3cqZAo" node="1eEe91OYhWx" resolve="segmentPath" />
-                                    </node>
                                   </node>
                                 </node>
                                 <node concept="3cpWs6" id="47oVduOAlJy" role="3cqZAp">
@@ -8745,15 +8474,6 @@
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="47oVduO$qDA" role="3clF46">
-        <property role="TrG5h" value="segmentPath" />
-        <node concept="3uibUv" id="47oVduO$qDB" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="47oVduO$qDC" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
       <node concept="3clFbS" id="47oVduO$qBJ" role="3clF47">
         <node concept="3cpWs8" id="47oVduO$qBK" role="3cqZAp">
           <node concept="3cpWsn" id="47oVduO$qBL" role="3cpWs9">
@@ -9036,20 +8756,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="47oVduO$qDu" role="3cqZAp" />
-            <node concept="3clFbF" id="47oVduO$qDv" role="3cqZAp">
-              <node concept="2OqwBi" id="47oVduO$qDw" role="3clFbG">
-                <node concept="2GrUjf" id="47oVduO$qDx" role="2Oq$k0">
-                  <ref role="2Gs0qQ" node="47oVduO$qD_" resolve="builder" />
-                </node>
-                <node concept="liA8E" id="47oVduO$qDy" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:1eEe91OXtFC" resolve="setSegmentPath" />
-                  <node concept="37vLTw" id="47oVduO$qDD" role="37wK5m">
-                    <ref role="3cqZAo" node="47oVduO$qDA" resolve="segmentPath" />
-                  </node>
-                </node>
-              </node>
-            </node>
           </node>
           <node concept="37vLTw" id="47oVduO_lWk" role="2GsD0m">
             <ref role="3cqZAo" node="47oVduO_4Od" resolve="builders" />
@@ -9690,15 +9396,6 @@
           <property role="TrG5h" value="node" />
           <node concept="3Tqbb2" id="5ntLU8GlzgH" role="1tU5fm" />
         </node>
-        <node concept="37vLTG" id="1eEe91P0sqE" role="3clF46">
-          <property role="TrG5h" value="segmentPath" />
-          <node concept="3uibUv" id="1eEe91P0wHh" role="1tU5fm">
-            <ref role="3uigEE" to="33ny:~List" resolve="List" />
-            <node concept="3uibUv" id="1eEe91P0yIX" role="11_B2D">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-        </node>
         <node concept="3Tm1VV" id="5ntLU8GlzgJ" role="1B3o_S" />
         <node concept="3clFbS" id="5ntLU8GlzgL" role="3clF47">
           <node concept="3cpWs8" id="5ntLU8GlzSI" role="3cqZAp">
@@ -9772,9 +9469,6 @@
                     <ref role="3cqZAo" node="42eP3wrZOvp" resolve="includeAuxiliary" />
                   </node>
                 </node>
-                <node concept="37vLTw" id="1eEe91P0_t8" role="37wK5m">
-                  <ref role="3cqZAo" node="1eEe91P0sqE" resolve="segmentPath" />
-                </node>
                 <node concept="37vLTw" id="4baZKvbn3qR" role="37wK5m">
                   <ref role="3cqZAo" node="5HxDM7DaixD" resolve="isProgramPreamble" />
                 </node>
@@ -9856,12 +9550,6 @@
         <node concept="3uibUv" id="4MqhgXU_ix8" role="11_B2D">
           <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramFactory.ResultTriple" />
         </node>
-        <node concept="3uibUv" id="1eEe91P0kf8" role="11_B2D">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="1eEe91P0nHd" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
       </node>
       <node concept="2tJIrI" id="7Oc59RSFIrK" role="jymVt" />
       <node concept="3clFb_" id="tIwzd1IJm5" role="jymVt">
@@ -9993,67 +9681,6 @@
         </node>
       </node>
       <node concept="2tJIrI" id="1CcQBrPgAwx" role="jymVt" />
-      <node concept="3clFb_" id="1eEe91P3gTo" role="jymVt">
-        <property role="TrG5h" value="initialParam" />
-        <node concept="3uibUv" id="1eEe91P3gTs" role="3clF45">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="1eEe91P3gTt" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="1eEe91P3gTq" role="1B3o_S" />
-        <node concept="3clFbS" id="1eEe91P3gTu" role="3clF47">
-          <node concept="3clFbF" id="1eEe91P3LUF" role="3cqZAp">
-            <node concept="2YIFZM" id="1eEe91P3LWQ" role="3clFbG">
-              <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
-              <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="1eEe91P3gTv" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="1eEe91P3sDJ" role="jymVt" />
-      <node concept="3clFb_" id="1eEe91P3xTh" role="jymVt">
-        <property role="TrG5h" value="nextParam" />
-        <node concept="37vLTG" id="1eEe91P3xTi" role="3clF46">
-          <property role="TrG5h" value="parent" />
-          <node concept="3Tqbb2" id="1eEe91P3xTj" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="1eEe91P3xTk" role="3clF46">
-          <property role="TrG5h" value="child" />
-          <node concept="3Tqbb2" id="1eEe91P3xTl" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="1eEe91P3xTm" role="3clF46">
-          <property role="TrG5h" value="prevParam" />
-          <node concept="3uibUv" id="1eEe91P3xTt" role="1tU5fm">
-            <ref role="3uigEE" to="33ny:~List" resolve="List" />
-            <node concept="3uibUv" id="1eEe91P3xTu" role="11_B2D">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-        </node>
-        <node concept="3uibUv" id="1eEe91P3xTr" role="3clF45">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="1eEe91P3xTs" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="1eEe91P3xTp" role="1B3o_S" />
-        <node concept="3clFbS" id="1eEe91P3xTv" role="3clF47">
-          <node concept="3cpWs6" id="1eEe91P7wK_" role="3cqZAp">
-            <node concept="2YIFZM" id="1eEe91P7wKA" role="3cqZAk">
-              <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
-              <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="1eEe91P3xTw" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="799SgOKx_ct" role="jymVt" />
       <node concept="312cEg" id="42eP3wrZOvp" role="jymVt">
         <property role="TrG5h" value="includeAuxiliary" />
         <node concept="3Tm6S6" id="42eP3wrZOvq" role="1B3o_S" />
@@ -10232,9 +9859,6 @@
             <node concept="16syzq" id="61G6TdDSwHn" role="11_B2D">
               <ref role="16sUi3" node="61G6TdDSwIC" resolve="T" />
             </node>
-            <node concept="16syzq" id="61G6TdDSwHo" role="11_B2D">
-              <ref role="16sUi3" node="61G6TdDSwID" resolve="P" />
-            </node>
           </node>
         </node>
         <node concept="3clFbS" id="61G6TdDSwHp" role="3clF47">
@@ -10379,9 +10003,6 @@
             <node concept="16syzq" id="6nFpYltNIg6" role="11_B2D">
               <ref role="16sUi3" node="6nFpYltNyaU" resolve="T" />
             </node>
-            <node concept="16syzq" id="6nFpYltNJZa" role="11_B2D">
-              <ref role="16sUi3" node="6nFpYltN$ut" resolve="P" />
-            </node>
           </node>
         </node>
         <node concept="3clFbS" id="6nFpYltNprk" role="3clF47">
@@ -10498,9 +10119,6 @@
             <node concept="16syzq" id="61G6TdDQN_h" role="11_B2D">
               <ref role="16sUi3" node="61G6TdDQNAL" resolve="T" />
             </node>
-            <node concept="16syzq" id="61G6TdDQN_i" role="11_B2D">
-              <ref role="16sUi3" node="61G6TdDQNAM" resolve="P" />
-            </node>
           </node>
         </node>
         <node concept="3clFbS" id="61G6TdDQN_l" role="3clF47">
@@ -10613,9 +10231,6 @@
             <node concept="16syzq" id="6nFpYltSFnA" role="11_B2D">
               <ref role="16sUi3" node="6nFpYltS$IB" resolve="T" />
             </node>
-            <node concept="16syzq" id="6nFpYltSFnB" role="11_B2D">
-              <ref role="16sUi3" node="6nFpYltSATb" resolve="P" />
-            </node>
           </node>
         </node>
         <node concept="16syzq" id="6nFpYltTlXP" role="3clF45">
@@ -10641,9 +10256,6 @@
         <node concept="16euLQ" id="6nFpYltS$IB" role="16eVyc">
           <property role="TrG5h" value="T" />
         </node>
-        <node concept="16euLQ" id="6nFpYltSATb" role="16eVyc">
-          <property role="TrG5h" value="P" />
-        </node>
       </node>
       <node concept="2tJIrI" id="7vRcs5$YXnG" role="jymVt" />
       <node concept="3clFb_" id="61G6TdDTpT1" role="jymVt">
@@ -10775,9 +10387,6 @@
             <node concept="16syzq" id="6nFpYltFRjL" role="11_B2D">
               <ref role="16sUi3" node="6nFpYltFQCT" resolve="T" />
             </node>
-            <node concept="16syzq" id="6nFpYltFRlM" role="11_B2D">
-              <ref role="16sUi3" node="6nFpYltFQDd" resolve="P" />
-            </node>
           </node>
         </node>
         <node concept="16syzq" id="6nFpYltH_ao" role="3clF45">
@@ -10793,9 +10402,6 @@
                   <node concept="16syzq" id="6nFpYltFVZO" role="1pMfVU">
                     <ref role="16sUi3" node="6nFpYltFQCT" resolve="T" />
                   </node>
-                  <node concept="16syzq" id="6nFpYltFW9$" role="1pMfVU">
-                    <ref role="16sUi3" node="6nFpYltFQDd" resolve="P" />
-                  </node>
                   <node concept="37vLTw" id="6nFpYltFZ8B" role="37wK5m">
                     <ref role="3cqZAo" node="6nFpYltFYAs" resolve="startFrom" />
                   </node>
@@ -10833,9 +10439,6 @@
             <node concept="16syzq" id="6nFpYltFTtZ" role="11_B2D">
               <ref role="16sUi3" node="6nFpYltFTu6" resolve="T" />
             </node>
-            <node concept="16syzq" id="6nFpYltFTu0" role="11_B2D">
-              <ref role="16sUi3" node="6nFpYltFTu7" resolve="P" />
-            </node>
           </node>
         </node>
         <node concept="16syzq" id="6nFpYltHFRV" role="3clF45">
@@ -10851,9 +10454,6 @@
                   <node concept="16syzq" id="6nFpYltG0kf" role="1pMfVU">
                     <ref role="16sUi3" node="6nFpYltFTu6" resolve="T" />
                   </node>
-                  <node concept="16syzq" id="6nFpYltG0kg" role="1pMfVU">
-                    <ref role="16sUi3" node="6nFpYltFTu7" resolve="P" />
-                  </node>
                   <node concept="37vLTw" id="6nFpYltG0kh" role="37wK5m">
                     <ref role="3cqZAo" node="6nFpYltFZVX" resolve="startFrom" />
                   </node>
@@ -10891,9 +10491,6 @@
             <node concept="16syzq" id="6nFpYltFTQT" role="11_B2D">
               <ref role="16sUi3" node="6nFpYltFTR0" resolve="T" />
             </node>
-            <node concept="16syzq" id="6nFpYltFTQU" role="11_B2D">
-              <ref role="16sUi3" node="6nFpYltFTR1" resolve="P" />
-            </node>
           </node>
         </node>
         <node concept="16syzq" id="6nFpYltHFZu" role="3clF45">
@@ -10909,9 +10506,6 @@
                   <node concept="16syzq" id="6nFpYltG0Dk" role="1pMfVU">
                     <ref role="16sUi3" node="6nFpYltFTR0" resolve="T" />
                   </node>
-                  <node concept="16syzq" id="6nFpYltG0Dl" role="1pMfVU">
-                    <ref role="16sUi3" node="6nFpYltFTR1" resolve="P" />
-                  </node>
                   <node concept="37vLTw" id="6nFpYltG1n9" role="37wK5m">
                     <ref role="3cqZAo" node="6nFpYltG10Q" resolve="nodes" />
                   </node>
@@ -10942,9 +10536,6 @@
           <node concept="16syzq" id="6nFpYltMtL1" role="11_B2D">
             <ref role="16sUi3" node="6nFpYltMnGF" resolve="T" />
           </node>
-          <node concept="16syzq" id="6nFpYltMuf5" role="11_B2D">
-            <ref role="16sUi3" node="6nFpYltMpXP" resolve="P" />
-          </node>
         </node>
         <node concept="37vLTG" id="6nFpYltM1Ej" role="3clF46">
           <property role="TrG5h" value="action" />
@@ -10953,9 +10544,6 @@
             <node concept="16syzq" id="6nFpYltM1El" role="11_B2D">
               <ref role="16sUi3" node="6nFpYltMnGF" resolve="T" />
             </node>
-            <node concept="16syzq" id="6nFpYltM1Em" role="11_B2D">
-              <ref role="16sUi3" node="6nFpYltMpXP" resolve="P" />
-            </node>
           </node>
         </node>
         <node concept="3clFbS" id="6nFpYltM1DF" role="3clF47">
@@ -10973,21 +10561,12 @@
                   <node concept="16syzq" id="6nFpYltM1DM" role="2Ghqu4">
                     <ref role="16sUi3" node="6nFpYltMnGF" resolve="T" />
                   </node>
-                  <node concept="16syzq" id="6nFpYltM1DN" role="2Ghqu4">
-                    <ref role="16sUi3" node="6nFpYltMpXP" resolve="P" />
-                  </node>
                   <node concept="3clFb_" id="6nFpYltM1DO" role="jymVt">
                     <property role="TrG5h" value="doAction" />
                     <node concept="37vLTG" id="6nFpYltM1DP" role="3clF46">
                       <property role="TrG5h" value="node" />
                       <node concept="3Tqbb2" id="6nFpYltM1DQ" role="1tU5fm" />
                     </node>
-                    <node concept="37vLTG" id="6nFpYltM1DR" role="3clF46">
-                      <property role="TrG5h" value="param" />
-                      <node concept="16syzq" id="6nFpYltM1DS" role="1tU5fm">
-                        <ref role="16sUi3" node="6nFpYltMpXP" resolve="P" />
-                      </node>
-                    </node>
                     <node concept="16syzq" id="6nFpYltM1DT" role="3clF45">
                       <ref role="16sUi3" node="6nFpYltMnGF" resolve="T" />
                     </node>
@@ -11040,9 +10619,6 @@
                             <node concept="37vLTw" id="3DPJ8QIzOUG" role="37wK5m">
                               <ref role="3cqZAo" node="6nFpYltM1DP" resolve="node" />
                             </node>
-                            <node concept="37vLTw" id="3DPJ8QIzOUH" role="37wK5m">
-                              <ref role="3cqZAo" node="6nFpYltM1DR" resolve="param" />
-                            </node>
                           </node>
                         </node>
                       </node>
@@ -11069,9 +10645,6 @@
           <node concept="16syzq" id="3DPJ8QIyRCc" role="11_B2D">
             <ref role="16sUi3" node="3DPJ8QIyRCI" resolve="T" />
           </node>
-          <node concept="16syzq" id="3DPJ8QIyRCd" role="11_B2D">
-            <ref role="16sUi3" node="3DPJ8QIyRCJ" resolve="P" />
-          </node>
         </node>
         <node concept="37vLTG" id="3DPJ8QIyRCe" role="3clF46">
           <property role="TrG5h" value="action" />
@@ -11080,9 +10653,6 @@
             <node concept="16syzq" id="3DPJ8QIyRCg" role="11_B2D">
               <ref role="16sUi3" node="3DPJ8QIyRCI" resolve="T" />
             </node>
-            <node concept="16syzq" id="3DPJ8QIyRCh" role="11_B2D">
-              <ref role="16sUi3" node="3DPJ8QIyRCJ" resolve="P" />
-            </node>
           </node>
         </node>
         <node concept="3clFbS" id="3DPJ8QIyRCi" role="3clF47">
@@ -11100,21 +10670,12 @@
                   <node concept="16syzq" id="3DPJ8QIyRCp" role="2Ghqu4">
                     <ref role="16sUi3" node="3DPJ8QIyRCI" resolve="T" />
                   </node>
-                  <node concept="16syzq" id="3DPJ8QIyRCq" role="2Ghqu4">
-                    <ref role="16sUi3" node="3DPJ8QIyRCJ" resolve="P" />
-                  </node>
                   <node concept="3clFb_" id="3DPJ8QIyRCr" role="jymVt">
                     <property role="TrG5h" value="doAction" />
                     <node concept="37vLTG" id="3DPJ8QIyRCs" role="3clF46">
                       <property role="TrG5h" value="node" />
                       <node concept="3Tqbb2" id="3DPJ8QIyRCt" role="1tU5fm" />
                     </node>
-                    <node concept="37vLTG" id="3DPJ8QIyRCu" role="3clF46">
-                      <property role="TrG5h" value="param" />
-                      <node concept="16syzq" id="3DPJ8QIyRCv" role="1tU5fm">
-                        <ref role="16sUi3" node="3DPJ8QIyRCJ" resolve="P" />
-                      </node>
-                    </node>
                     <node concept="16syzq" id="3DPJ8QIyRCw" role="3clF45">
                       <ref role="16sUi3" node="3DPJ8QIyRCI" resolve="T" />
                     </node>
@@ -11143,9 +10704,6 @@
                           <node concept="37vLTw" id="3DPJ8QIyRCG" role="37wK5m">
                             <ref role="3cqZAo" node="3DPJ8QIyRCs" resolve="node" />
                           </node>
-                          <node concept="37vLTw" id="3DPJ8QIyRCH" role="37wK5m">
-                            <ref role="3cqZAo" node="3DPJ8QIyRCu" resolve="param" />
-                          </node>
                         </node>
                       </node>
                     </node>
@@ -11171,9 +10729,6 @@
           <node concept="16syzq" id="6nFpYltVXdj" role="11_B2D">
             <ref role="16sUi3" node="6nFpYltVXe1" resolve="T" />
           </node>
-          <node concept="16syzq" id="6nFpYltVXdk" role="11_B2D">
-            <ref role="16sUi3" node="6nFpYltVXe2" resolve="P" />
-          </node>
         </node>
         <node concept="37vLTG" id="6nFpYltVXdl" role="3clF46">
           <property role="TrG5h" value="action" />
@@ -11182,9 +10737,6 @@
             <node concept="16syzq" id="6nFpYltVXdn" role="11_B2D">
               <ref role="16sUi3" node="6nFpYltVXe1" resolve="T" />
             </node>
-            <node concept="16syzq" id="6nFpYltVXdo" role="11_B2D">
-              <ref role="16sUi3" node="6nFpYltVXe2" resolve="P" />
-            </node>
           </node>
         </node>
         <node concept="3clFbS" id="6nFpYltVXdp" role="3clF47">
@@ -11202,21 +10754,12 @@
                   <node concept="16syzq" id="6nFpYltVXdw" role="2Ghqu4">
                     <ref role="16sUi3" node="6nFpYltVXe1" resolve="T" />
                   </node>
-                  <node concept="16syzq" id="6nFpYltVXdx" role="2Ghqu4">
-                    <ref role="16sUi3" node="6nFpYltVXe2" resolve="P" />
-                  </node>
                   <node concept="3clFb_" id="6nFpYltVXdy" role="jymVt">
                     <property role="TrG5h" value="doAction" />
                     <node concept="37vLTG" id="6nFpYltVXdz" role="3clF46">
                       <property role="TrG5h" value="node" />
                       <node concept="3Tqbb2" id="6nFpYltVXd$" role="1tU5fm" />
                     </node>
-                    <node concept="37vLTG" id="6nFpYltVXd_" role="3clF46">
-                      <property role="TrG5h" value="param" />
-                      <node concept="16syzq" id="6nFpYltVXdA" role="1tU5fm">
-                        <ref role="16sUi3" node="6nFpYltVXe2" resolve="P" />
-                      </node>
-                    </node>
                     <node concept="16syzq" id="6nFpYltVXdB" role="3clF45">
                       <ref role="16sUi3" node="6nFpYltVXe1" resolve="T" />
                     </node>
@@ -11263,9 +10806,6 @@
                           <node concept="37vLTw" id="6nFpYltVXdZ" role="37wK5m">
                             <ref role="3cqZAo" node="6nFpYltVXdz" resolve="node" />
                           </node>
-                          <node concept="37vLTw" id="6nFpYltVXe0" role="37wK5m">
-                            <ref role="3cqZAo" node="6nFpYltVXd_" resolve="param" />
-                          </node>
                         </node>
                       </node>
                     </node>
@@ -11313,9 +10853,6 @@
               <node concept="16syzq" id="6nFpYltLISk" role="11_B2D">
                 <ref role="16sUi3" node="6nFpYltLIpo" resolve="T" />
               </node>
-              <node concept="16syzq" id="6nFpYltLIU7" role="11_B2D">
-                <ref role="16sUi3" node="6nFpYltLIqK" resolve="P" />
-              </node>
             </node>
           </node>
         </node>
@@ -11326,12 +10863,6 @@
             <property role="TrG5h" value="node" />
             <node concept="3Tqbb2" id="6nFpYltLJrw" role="1tU5fm" />
           </node>
-          <node concept="37vLTG" id="6nFpYltLJrx" role="3clF46">
-            <property role="TrG5h" value="param" />
-            <node concept="16syzq" id="6nFpYltLJrA" role="1tU5fm">
-              <ref role="16sUi3" node="6nFpYltLIqK" resolve="P" />
-            </node>
-          </node>
           <node concept="16syzq" id="6nFpYltLJrB" role="3clF45">
             <ref role="16sUi3" node="6nFpYltLIpo" resolve="T" />
           </node>
@@ -11347,9 +10878,6 @@
                   <node concept="37vLTw" id="6nFpYltQrjn" role="37wK5m">
                     <ref role="3cqZAo" node="6nFpYltLJrv" resolve="node" />
                   </node>
-                  <node concept="37vLTw" id="6nFpYltQrLH" role="37wK5m">
-                    <ref role="3cqZAo" node="6nFpYltLJrx" resolve="param" />
-                  </node>
                 </node>
               </node>
             </node>
@@ -11422,75 +10950,6 @@
             <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
           </node>
         </node>
-        <node concept="2tJIrI" id="6nFpYltVQAM" role="jymVt" />
-        <node concept="3clFb_" id="6nFpYltLJrY" role="jymVt">
-          <property role="TrG5h" value="initialParam" />
-          <node concept="16syzq" id="6nFpYltLJs2" role="3clF45">
-            <ref role="16sUi3" node="6nFpYltLIqK" resolve="P" />
-          </node>
-          <node concept="3Tm1VV" id="6nFpYltLJs0" role="1B3o_S" />
-          <node concept="3clFbS" id="6nFpYltLJs3" role="3clF47">
-            <node concept="3clFbF" id="6nFpYltLLUk" role="3cqZAp">
-              <node concept="2OqwBi" id="6nFpYltLLYQ" role="3clFbG">
-                <node concept="37vLTw" id="6nFpYltLLUj" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6nFpYltLIXL" resolve="delegate" />
-                </node>
-                <node concept="liA8E" id="6nFpYltLMd7" role="2OqNvi">
-                  <ref role="37wK5l" node="1eEe91P21Wg" resolve="initialParam" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="6nFpYltLJs4" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="2tJIrI" id="6nFpYltVPG9" role="jymVt" />
-        <node concept="3clFb_" id="6nFpYltLJs5" role="jymVt">
-          <property role="TrG5h" value="nextParam" />
-          <node concept="37vLTG" id="6nFpYltLJs6" role="3clF46">
-            <property role="TrG5h" value="parent" />
-            <node concept="3Tqbb2" id="6nFpYltLJs7" role="1tU5fm" />
-          </node>
-          <node concept="37vLTG" id="6nFpYltLJs8" role="3clF46">
-            <property role="TrG5h" value="child" />
-            <node concept="3Tqbb2" id="6nFpYltLJs9" role="1tU5fm" />
-          </node>
-          <node concept="37vLTG" id="6nFpYltLJsa" role="3clF46">
-            <property role="TrG5h" value="prevParam" />
-            <node concept="16syzq" id="6nFpYltLJsf" role="1tU5fm">
-              <ref role="16sUi3" node="6nFpYltLIqK" resolve="P" />
-            </node>
-          </node>
-          <node concept="16syzq" id="6nFpYltLJsg" role="3clF45">
-            <ref role="16sUi3" node="6nFpYltLIqK" resolve="P" />
-          </node>
-          <node concept="3Tm1VV" id="6nFpYltLJsd" role="1B3o_S" />
-          <node concept="3clFbS" id="6nFpYltLJsh" role="3clF47">
-            <node concept="3clFbF" id="6nFpYltLMsC" role="3cqZAp">
-              <node concept="2OqwBi" id="6nFpYltLMv9" role="3clFbG">
-                <node concept="37vLTw" id="6nFpYltLMsB" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6nFpYltLIXL" resolve="delegate" />
-                </node>
-                <node concept="liA8E" id="6nFpYltLMHy" role="2OqNvi">
-                  <ref role="37wK5l" node="1eEe91P2lma" resolve="nextParam" />
-                  <node concept="37vLTw" id="6nFpYltLMWZ" role="37wK5m">
-                    <ref role="3cqZAo" node="6nFpYltLJs6" resolve="parent" />
-                  </node>
-                  <node concept="37vLTw" id="6nFpYltLNeh" role="37wK5m">
-                    <ref role="3cqZAo" node="6nFpYltLJs8" resolve="child" />
-                  </node>
-                  <node concept="37vLTw" id="6nFpYltLO0M" role="37wK5m">
-                    <ref role="3cqZAo" node="6nFpYltLJsa" resolve="prevParam" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="6nFpYltLJsi" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
         <node concept="2tJIrI" id="6nFpYltLIwg" role="jymVt" />
         <node concept="3Tm6S6" id="6nFpYltMDV6" role="1B3o_S" />
         <node concept="3uibUv" id="6nFpYltLI0Z" role="EKbjA">
@@ -11498,16 +10957,10 @@
           <node concept="16syzq" id="6nFpYltLIta" role="11_B2D">
             <ref role="16sUi3" node="6nFpYltLIpo" resolve="T" />
           </node>
-          <node concept="16syzq" id="6nFpYltLItJ" role="11_B2D">
-            <ref role="16sUi3" node="6nFpYltLIqK" resolve="P" />
-          </node>
         </node>
         <node concept="16euLQ" id="6nFpYltLIpo" role="16eVyc">
           <property role="TrG5h" value="T" />
         </node>
-        <node concept="16euLQ" id="6nFpYltLIqK" role="16eVyc">
-          <property role="TrG5h" value="P" />
-        </node>
         <node concept="312cEg" id="6nFpYltLIXL" role="jymVt">
           <property role="TrG5h" value="delegate" />
           <node concept="3Tm6S6" id="6nFpYltLIXM" role="1B3o_S" />
@@ -11516,9 +10969,6 @@
             <node concept="16syzq" id="6nFpYltLIXP" role="11_B2D">
               <ref role="16sUi3" node="6nFpYltLIpo" resolve="T" />
             </node>
-            <node concept="16syzq" id="6nFpYltLIXQ" role="11_B2D">
-              <ref role="16sUi3" node="6nFpYltLIqK" resolve="P" />
-            </node>
           </node>
         </node>
       </node>
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 4457f827..44cadc2b 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
@@ -2701,28 +2701,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="6KCGZaSx62j" role="jymVt" />
-    <node concept="3clFb_" id="1GGmKhcjhMF" role="jymVt">
-      <property role="TrG5h" value="getOccurrenceCache" />
-      <node concept="3clFbS" id="1GGmKhcjhMI" role="3clF47">
-        <node concept="3clFbF" id="1GGmKhcjmJw" role="3cqZAp">
-          <node concept="2OqwBi" id="1GGmKhcjnb8" role="3clFbG">
-            <node concept="37vLTw" id="1GGmKhcjmJv" role="2Oq$k0">
-              <ref role="3cqZAo" node="1GGmKhchgOO" resolve="occurrenceCache" />
-            </node>
-            <node concept="liA8E" id="1GGmKhcjnLp" role="2OqNvi">
-              <ref role="37wK5l" to="i348:1imVejVtNz$" resolve="occurrences" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1GGmKhcjfA2" role="1B3o_S" />
-      <node concept="3vKaQO" id="1GGmKhcjhmy" role="3clF45">
-        <node concept="3uibUv" id="1GGmKhcjhKZ" role="3O5elw">
-          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="WJTIIoPfRU" role="jymVt" />
     <node concept="312cEg" id="5fMWD6Iop7s" role="jymVt">
       <property role="TrG5h" value="typeCollector" />
       <node concept="3uibUv" id="WJTIIoP7K$" role="1tU5fm">
@@ -2758,18 +2736,6 @@
         <ref role="37wK5l" to="psoy:7Oc59RSEjeq" resolve="OK" />
       </node>
     </node>
-    <node concept="312cEg" id="1GGmKhchgOO" role="jymVt">
-      <property role="TrG5h" value="occurrenceCache" />
-      <node concept="3Tm6S6" id="1GGmKhchf6r" role="1B3o_S" />
-      <node concept="3uibUv" id="1GGmKhchgcj" role="1tU5fm">
-        <ref role="3uigEE" to="i348:1imVejVtN6P" resolve="PrincipalStore" />
-      </node>
-      <node concept="2ShNRf" id="1GGmKhchiVy" role="33vP2m">
-        <node concept="HV5vD" id="1GGmKhchkzL" role="2ShVmc">
-          <ref role="HV5vE" to="i348:1imVejVtN6P" resolve="PrincipalStore" />
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="WJTIIoPcaO" role="jymVt" />
     <node concept="312cEg" id="4aLjyB0YZFj" role="jymVt">
       <property role="TrG5h" value="trace" />
@@ -4967,8 +4933,8 @@
                         <ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
                       </node>
                     </node>
-                    <node concept="liA8E" id="7ElRE1BMesf" role="2OqNvi">
-                      <ref role="37wK5l" to="av0y:~Rule$Tag.name()" resolve="name" />
+                    <node concept="liA8E" id="IFW4V3e30N" role="2OqNvi">
+                      <ref role="37wK5l" to="av0y:~Rule$Tag.toString()" resolve="toString" />
                     </node>
                   </node>
                 </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index 9b819250..dd822537 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -3171,7 +3171,7 @@
               <node concept="TSZUe" id="7WKNeR8TcX_" role="2OqNvi">
                 <node concept="2ShNRf" id="7WKNeR8TcXE" role="25WWJ7">
                   <node concept="1pGfFk" id="7WKNeR8TcXF" role="2ShVmc">
-                    <ref role="37wK5l" to="1yqb:5EDW3XEoy55" resolve="ApplyTemplatesStep" />
+                    <ref role="37wK5l" to="1yqb:1imVejVB$_h" resolve="ApplyTemplatesStep" />
                     <node concept="37vLTw" id="6nFpYluoiGj" role="37wK5m">
                       <ref role="3cqZAo" node="6nFpYluoeMV" resolve="session" />
                     </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index 46744e23..5d064f43 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
@@ -14577,7 +14577,7 @@
       <node concept="3Tm1VV" id="7i3KM7gApvx" role="1B3o_S" />
       <node concept="3clFbS" id="7i3KM7gApvy" role="3clF47">
         <node concept="XkiVB" id="6nFpYlursqi" role="3cqZAp">
-          <ref role="37wK5l" to="1yqb:5EDW3XEoy55" resolve="ApplyTemplatesStep" />
+          <ref role="37wK5l" to="1yqb:1imVejVB$_h" resolve="ApplyTemplatesStep" />
           <node concept="37vLTw" id="6nFpYlurv6W" role="37wK5m">
             <ref role="3cqZAo" node="6nFpYluo8Vd" resolve="session" />
           </node>
@@ -16805,7 +16805,7 @@
           <node concept="3clFbF" id="4XsNDZYgfjs" role="3cqZAp">
             <node concept="2ShNRf" id="6kREIVkWRFr" role="3clFbG">
               <node concept="1pGfFk" id="6kREIVkWRFs" role="2ShVmc">
-                <ref role="37wK5l" to="1yqb:5EDW3XEoy55" resolve="ApplyTemplatesStep" />
+                <ref role="37wK5l" to="1yqb:1imVejVB$_h" resolve="ApplyTemplatesStep" />
                 <node concept="37vLTw" id="4XsNDZYgxYu" role="37wK5m">
                   <ref role="3cqZAo" node="4XsNDZYgxYr" resolve="processingSession" />
                 </node>
@@ -17433,7 +17433,6 @@
                 <node concept="37vLTw" id="6XnUDeizCcV" role="37wK5m">
                   <ref role="3cqZAo" node="6XnUDeizCcf" resolve="query" />
                 </node>
-                <node concept="10Nm6u" id="2gPa6JIuj_Z" role="37wK5m" />
               </node>
             </node>
           </node>
@@ -18170,7 +18169,7 @@
           <node concept="3clFbF" id="3OUB6BBbeOR" role="3cqZAp">
             <node concept="2ShNRf" id="3OUB6BBbeOS" role="3clFbG">
               <node concept="1pGfFk" id="3OUB6BBbeOT" role="2ShVmc">
-                <ref role="37wK5l" to="1yqb:5EDW3XEoy55" resolve="ApplyTemplatesStep" />
+                <ref role="37wK5l" to="1yqb:1imVejVB$_h" resolve="ApplyTemplatesStep" />
                 <node concept="37vLTw" id="3OUB6BBbeOU" role="37wK5m">
                   <ref role="3cqZAo" node="3OUB6BBbaed" resolve="ruleProcessingSession" />
                 </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index d61408fd..4f0ccc2d 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="1178893518978" name="jetbrains.mps.baseLanguage.structure.ThisConstructorInvocation" flags="nn" index="1VxSAg" />
       <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" />
@@ -521,74 +520,6 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="39eNUjlYwif" role="jymVt" />
-    <node concept="3clFbW" id="5EDW3XEoy55" role="jymVt">
-      <node concept="3cqZAl" id="5EDW3XEoy56" role="3clF45" />
-      <node concept="3Tm1VV" id="5EDW3XEoy57" role="1B3o_S" />
-      <node concept="3clFbS" id="5EDW3XEoy58" role="3clF47">
-        <node concept="1VxSAg" id="1imVejVBUsL" role="3cqZAp">
-          <ref role="37wK5l" node="1imVejVB$_h" resolve="ApplyTemplatesStep" />
-          <node concept="37vLTw" id="1imVejVBV2H" role="37wK5m">
-            <ref role="3cqZAo" node="5EDW3XEoy5P" resolve="session" />
-          </node>
-          <node concept="37vLTw" id="1imVejVBVoV" role="37wK5m">
-            <ref role="3cqZAo" node="61G6TdBActe" resolve="macroProcessing" />
-          </node>
-          <node concept="37vLTw" id="1imVejVBW2T" role="37wK5m">
-            <ref role="3cqZAo" node="5EDW3XEoy5R" resolve="inputNodes" />
-          </node>
-          <node concept="37vLTw" id="1imVejVBWy$" role="37wK5m">
-            <ref role="3cqZAo" node="61G6TdE2izs" resolve="recursive" />
-          </node>
-          <node concept="37vLTw" id="3VwM5b67SAR" role="37wK5m">
-            <ref role="3cqZAo" node="3VwM5b67Rf$" resolve="invalidated" />
-          </node>
-          <node concept="37vLTw" id="1imVejVBZ$2" role="37wK5m">
-            <ref role="3cqZAo" node="5EDW3XEoy5T" resolve="repository" />
-          </node>
-          <node concept="37vLTw" id="1imVejVBWUS" role="37wK5m">
-            <ref role="3cqZAo" node="5EDW3XEoy5X" resolve="query" />
-          </node>
-          <node concept="10Nm6u" id="2gPa6JIzIh1" role="37wK5m" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5EDW3XEoy5P" role="3clF46">
-        <property role="TrG5h" value="session" />
-        <node concept="3uibUv" id="5EDW3XEoy5Q" role="1tU5fm">
-          <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="61G6TdBActe" role="3clF46">
-        <property role="TrG5h" value="macroProcessing" />
-        <node concept="3uibUv" id="61G6TdBAdA8" role="1tU5fm">
-          <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5EDW3XEoy5R" role="3clF46">
-        <property role="TrG5h" value="inputNodes" />
-        <node concept="2I9FWS" id="5EDW3XEoy5S" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="61G6TdE2izs" role="3clF46">
-        <property role="TrG5h" value="recursive" />
-        <node concept="10P_77" id="61G6TdE2lVn" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="3VwM5b67Rf$" role="3clF46">
-        <property role="TrG5h" value="invalidated" />
-        <node concept="10P_77" id="3VwM5b67S8h" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="5EDW3XEoy5T" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="5EDW3XEoy5U" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5EDW3XEoy5X" role="3clF46">
-        <property role="TrG5h" value="query" />
-        <node concept="3uibUv" id="5EDW3XEoAaz" role="1tU5fm">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="1imVejVBD2G" role="jymVt" />
     <node concept="3clFbW" id="1imVejVB$_h" role="jymVt">
       <node concept="3cqZAl" id="1imVejVB$_i" role="3clF45" />
@@ -722,12 +653,6 @@
           <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
-      <node concept="37vLTG" id="1imVejVBGUx" role="3clF46">
-        <property role="TrG5h" value="ignore" />
-        <node concept="3uibUv" id="1imVejVBI01" role="1tU5fm">
-          <ref role="3uigEE" to="i348:1imVejVtN6P" resolve="PrincipalStore" />
-        </node>
-      </node>
     </node>
     <node concept="2tJIrI" id="5EDW3XEoy54" role="jymVt" />
     <node concept="3clFb_" id="51ek2rQF9Dx" role="jymVt">
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
index 36f3e4ee..38003de7 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
@@ -1010,7 +1010,7 @@
               <node concept="TSZUe" id="7WKNeR8TcX_" role="2OqNvi">
                 <node concept="2ShNRf" id="7WKNeR8TcXE" role="25WWJ7">
                   <node concept="1pGfFk" id="7WKNeR8TcXF" role="2ShVmc">
-                    <ref role="37wK5l" to="1yqb:5EDW3XEoy55" resolve="ApplyTemplatesStep" />
+                    <ref role="37wK5l" to="1yqb:1imVejVB$_h" resolve="ApplyTemplatesStep" />
                     <node concept="37vLTw" id="6nFpYluoru8" role="37wK5m">
                       <ref role="3cqZAo" node="6nFpYlun4Ef" resolve="session" />
                     </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index 591fd0e7..ba15cf22 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -38,13 +38,6 @@
       <concept id="1238852151516" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleType" flags="in" index="1LlUBW">
         <child id="1238852204892" name="componentType" index="1Lm7xW" />
       </concept>
-      <concept id="1238853782547" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleLiteral" flags="nn" index="1Ls8ON">
-        <child id="1238853845806" name="component" index="1Lso8e" />
-      </concept>
-      <concept id="1238857743184" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleMemberAccessExpression" flags="nn" index="1LFfDK">
-        <child id="1238857764950" name="tuple" index="1LFl5Q" />
-        <child id="1238857834412" name="index" index="1LF_Uc" />
-      </concept>
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
@@ -66,9 +59,6 @@
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
-      <concept id="5279705229678483897" name="jetbrains.mps.baseLanguage.structure.FloatingPointFloatConstant" flags="nn" index="2$xPTn">
-        <property id="5279705229678483899" name="value" index="2$xPTl" />
-      </concept>
       <concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
         <child id="1076505808688" name="condition" index="2$JKZa" />
       </concept>
@@ -140,7 +130,6 @@
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
-      <concept id="1070534436861" name="jetbrains.mps.baseLanguage.structure.FloatType" flags="in" index="10OMs4" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
         <child id="1070534760952" name="componentType" index="10Q1$1" />
@@ -299,7 +288,6 @@
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
         <child id="1163668934364" name="ifFalse" index="3K4GZi" />
       </concept>
-      <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
       <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
@@ -388,7 +376,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="2526372162255441536" name="jetbrains.mps.baseLanguage.collections.structure.AsUnmodifiableOperation" flags="nn" index="26Dbio" />
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
@@ -396,7 +383,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
         <child id="1153944400369" name="variable" index="2Gsz3X" />
         <child id="1153944424730" name="inputSequence" index="2GsD0m" />
@@ -409,24 +395,17 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227026094155" name="jetbrains.mps.baseLanguage.collections.structure.RemoveLastElementOperation" flags="nn" index="2Kt5_m" />
-      <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
-        <child id="1201654602639" name="key" index="38cxEo" />
-      </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
-      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="1167380149909" name="jetbrains.mps.baseLanguage.collections.structure.RemoveElementOperation" flags="nn" index="3dhRuq" />
-      <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
         <child id="1197683466920" name="keyType" index="3rvQeY" />
         <child id="1197683475734" name="valueType" index="3rvSg0" />
       </concept>
       <concept id="1197686869805" name="jetbrains.mps.baseLanguage.collections.structure.HashMapCreator" flags="nn" index="3rGOSV">
-        <child id="1562299158921034623" name="initSize" index="3lNPQL" />
         <child id="1197687026896" name="keyType" index="3rHrn6" />
         <child id="1197687035757" name="valueType" index="3rHtpV" />
       </concept>
@@ -437,9 +416,6 @@
         <child id="1197932505799" name="map" index="3ElQJh" />
         <child id="1197932525128" name="key" index="3ElVtu" />
       </concept>
-      <concept id="1240906768633" name="jetbrains.mps.baseLanguage.collections.structure.PutAllOperation" flags="nn" index="3FNE7p">
-        <child id="1240906921264" name="map" index="3FOfgg" />
-      </concept>
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
       <concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
         <child id="5686963296372573084" name="elementType" index="3O5elw" />
@@ -3414,7 +3390,7 @@
         </node>
       </node>
       <node concept="37vLTG" id="6xVZN2uA02z" role="3clF46">
-        <property role="TrG5h" value="baseTag" />
+        <property role="TrG5h" value="templateName" />
         <node concept="17QB3L" id="6xVZN2uA0cE" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="7nPD14OeqYK" role="3clF46">
@@ -3445,12 +3421,12 @@
         <node concept="3clFbF" id="6xVZN2uAqIF" role="3cqZAp">
           <node concept="37vLTI" id="6xVZN2uArcw" role="3clFbG">
             <node concept="37vLTw" id="6xVZN2uArjF" role="37vLTx">
-              <ref role="3cqZAo" node="6xVZN2uA02z" resolve="baseTag" />
+              <ref role="3cqZAo" node="6xVZN2uA02z" resolve="templateName" />
             </node>
             <node concept="2OqwBi" id="6xVZN2uAqPp" role="37vLTJ">
               <node concept="Xjq3P" id="6xVZN2uAqID" role="2Oq$k0" />
               <node concept="2OwXpG" id="6xVZN2uAqVp" role="2OqNvi">
-                <ref role="2Oxat5" node="6xVZN2uAbNZ" resolve="basetag" />
+                <ref role="2Oxat5" node="6xVZN2uAbNZ" resolve="templateName" />
               </node>
             </node>
           </node>
@@ -3582,38 +3558,15 @@
         <property role="TrG5h" value="tagSuffix" />
         <node concept="10Oyi0" id="1lzLQ0zu_HF" role="1tU5fm" />
       </node>
+      <node concept="P$JXv" id="IFW4V3zIjb" role="lGtFl">
+        <node concept="TZ5HA" id="IFW4V3zIjc" role="TZ5H$">
+          <node concept="1dT_AC" id="IFW4V3zIjd" role="1dT_Ay">
+            <property role="1dT_AB" value="Helps distinguish among multiple instances of the same rule generate e.g. in a loop." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="32fHqDf8Y5W" role="jymVt" />
-    <node concept="3clFb_" id="1eEe91OXtFC" role="jymVt">
-      <property role="TrG5h" value="setSegmentPath" />
-      <node concept="37vLTG" id="1eEe91OXLTf" role="3clF46">
-        <property role="TrG5h" value="path" />
-        <node concept="3uibUv" id="1eEe91OXQHG" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="1eEe91OXR7u" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="1eEe91OXtFE" role="3clF45" />
-      <node concept="3Tm1VV" id="1eEe91OXtFF" role="1B3o_S" />
-      <node concept="3clFbS" id="1eEe91OXtFG" role="3clF47">
-        <node concept="3clFbF" id="1eEe91OXSQF" role="3cqZAp">
-          <node concept="37vLTI" id="1eEe91OXSQH" role="3clFbG">
-            <node concept="2OqwBi" id="1eEe91OXZFw" role="37vLTJ">
-              <node concept="Xjq3P" id="1eEe91OXZG6" role="2Oq$k0" />
-              <node concept="2OwXpG" id="1eEe91OXZFz" role="2OqNvi">
-                <ref role="2Oxat5" node="1eEe91OXSQA" resolve="segmentPath" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="1eEe91OXSQL" role="37vLTx">
-              <ref role="3cqZAo" node="1eEe91OXLTf" resolve="path" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7L9cSENGM0W" role="jymVt" />
     <node concept="3clFb_" id="7L9cSENGVlN" role="jymVt">
       <property role="TrG5h" value="setQuery" />
       <node concept="37vLTG" id="7L9cSENH1rk" role="3clF46">
@@ -4419,7 +4372,7 @@
             <node concept="1pGfFk" id="7ElRE1BOtf2" role="2ShVmc">
               <ref role="37wK5l" to="av0y:~Rule$Tag.&lt;init&gt;(java.lang.String,java.lang.String,java.lang.Object)" resolve="Rule.Tag" />
               <node concept="37vLTw" id="e$ws1zVqId" role="37wK5m">
-                <ref role="3cqZAo" node="6xVZN2uAbNZ" resolve="basetag" />
+                <ref role="3cqZAo" node="6xVZN2uAbNZ" resolve="templateName" />
               </node>
               <node concept="2OqwBi" id="7ElRE1BOBML" role="37wK5m">
                 <node concept="37vLTw" id="7ElRE1BOyiS" role="2Oq$k0">
@@ -5869,9 +5822,6 @@
               <node concept="37vLTw" id="cmlg9NSmpI" role="37wK5m">
                 <ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
               </node>
-              <node concept="37vLTw" id="cmlg9NSmRp" role="37wK5m">
-                <ref role="3cqZAo" node="1eEe91OXSQA" resolve="segmentPath" />
-              </node>
             </node>
           </node>
         </node>
@@ -6291,7 +6241,7 @@
       <node concept="17QB3L" id="6lpwCiZjjEp" role="1tU5fm" />
     </node>
     <node concept="312cEg" id="6xVZN2uAbNZ" role="jymVt">
-      <property role="TrG5h" value="basetag" />
+      <property role="TrG5h" value="templateName" />
       <node concept="3Tm6S6" id="6xVZN2uA62G" role="1B3o_S" />
       <node concept="17QB3L" id="6xVZN2uAbM7" role="1tU5fm" />
     </node>
@@ -6412,20 +6362,6 @@
         </node>
       </node>
     </node>
-    <node concept="312cEg" id="1eEe91OXSQA" role="jymVt">
-      <property role="TrG5h" value="segmentPath" />
-      <node concept="3Tm6S6" id="1eEe91OXSQB" role="1B3o_S" />
-      <node concept="3uibUv" id="1eEe91OXSQD" role="1tU5fm">
-        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3uibUv" id="1eEe91OXSQE" role="11_B2D">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-      <node concept="2YIFZM" id="1eEe91OY04L" role="33vP2m">
-        <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
-        <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="cmlg9NQysg" role="jymVt" />
     <node concept="312cEg" id="1lzLQ0ztUU2" role="jymVt">
       <property role="TrG5h" value="tagGenSuffix" />
@@ -6978,23 +6914,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="cmlg9NRmo2" role="3cqZAp">
-          <node concept="37vLTI" id="cmlg9NRmo3" role="3clFbG">
-            <node concept="2YIFZM" id="cmlg9NRmo4" role="37vLTx">
-              <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-              <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
-              <node concept="37vLTw" id="cmlg9NSlai" role="37wK5m">
-                <ref role="3cqZAo" node="cmlg9NRZ5b" resolve="segmentPath" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="cmlg9NRpP4" role="37vLTJ">
-              <node concept="Xjq3P" id="cmlg9NRpVR" role="2Oq$k0" />
-              <node concept="2OwXpG" id="cmlg9NRpP7" role="2OqNvi">
-                <ref role="2Oxat5" node="cmlg9NR7I8" resolve="segmentPath" />
-              </node>
-            </node>
-          </node>
-        </node>
       </node>
       <node concept="37vLTG" id="7eGEHDlc$dP" role="3clF46">
         <property role="TrG5h" value="kind" />
@@ -7067,15 +6986,6 @@
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="cmlg9NRZ5b" role="3clF46">
-        <property role="TrG5h" value="segmentPath" />
-        <node concept="3uibUv" id="cmlg9NRZXz" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="cmlg9NSeLx" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
       <node concept="3Tmbuc" id="cmlg9NQ1Sh" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="7eGEHDlc$dR" role="jymVt" />
@@ -7148,27 +7058,6 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="7nPD14Ob79p" role="jymVt" />
-    <node concept="3clFb_" id="1eEe91OY4FB" role="jymVt">
-      <property role="TrG5h" value="segmentPath" />
-      <node concept="3Tm1VV" id="1eEe91OY4FC" role="1B3o_S" />
-      <node concept="3uibUv" id="1eEe91OY4FE" role="3clF45">
-        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3uibUv" id="1eEe91OY4FF" role="11_B2D">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="1eEe91OY4FH" role="3clF47">
-        <node concept="3clFbF" id="1eEe91OYcB2" role="3cqZAp">
-          <node concept="37vLTw" id="cmlg9NRr3t" role="3clFbG">
-            <ref role="3cqZAo" node="cmlg9NR7I8" resolve="segmentPath" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="1eEe91OY4FI" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="6DQTzHy3kTC" role="jymVt" />
     <node concept="3clFb_" id="6DQTzHy3qNo" role="jymVt">
       <property role="TrG5h" value="isBasis" />
@@ -7513,16 +7402,6 @@
         </node>
       </node>
     </node>
-    <node concept="312cEg" id="cmlg9NR7I8" role="jymVt">
-      <property role="TrG5h" value="segmentPath" />
-      <node concept="3Tm6S6" id="cmlg9NR7I9" role="1B3o_S" />
-      <node concept="3uibUv" id="cmlg9NR7Ia" role="1tU5fm">
-        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3uibUv" id="cmlg9NR7Ib" role="11_B2D">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-    </node>
   </node>
   <node concept="312cEu" id="6R6MIbU8KKa">
     <property role="3GE5qa" value="query" />
@@ -8773,1117 +8652,6 @@
     <node concept="2tJIrI" id="4VNF0fT2$fD" role="jymVt" />
     <node concept="3Tm1VV" id="4VNF0fT1sxl" role="1B3o_S" />
   </node>
-  <node concept="312cEu" id="1imVejVtN6P">
-    <property role="TrG5h" value="PrincipalStore" />
-    <node concept="2tJIrI" id="1imVejV_491" role="jymVt" />
-    <node concept="312cEg" id="1imVejVujwS" role="jymVt">
-      <property role="TrG5h" value="store" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3Tm6S6" id="1imVejVuhOY" role="1B3o_S" />
-      <node concept="3rvAFt" id="1imVejVujjr" role="1tU5fm">
-        <node concept="3vKaQO" id="1imVejVujus" role="3rvSg0">
-          <node concept="3uibUv" id="1imVejVuju_" role="3O5elw">
-            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-          </node>
-        </node>
-        <node concept="1LlUBW" id="1imVejVunw2" role="3rvQeY">
-          <node concept="17QB3L" id="1imVejVunw3" role="1Lm7xW" />
-          <node concept="3uibUv" id="5F2qBBEr2dS" role="1Lm7xW">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="2ShNRf" id="1imVejVulbc" role="33vP2m">
-        <node concept="1pGfFk" id="8aYibnacRb" role="2ShVmc">
-          <ref role="37wK5l" node="8aYibn9jVD" resolve="PrincipalStore.LRUStore" />
-          <node concept="3cmrfG" id="8aYibnae_W" role="37wK5m">
-            <property role="3cmrfH" value="1024" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="8aYibn91mZ" role="jymVt" />
-    <node concept="3Tm1VV" id="1imVejVtN6Q" role="1B3o_S" />
-    <node concept="2tJIrI" id="1imVejV_6p$" role="jymVt" />
-    <node concept="3clFb_" id="1imVejV_97e" role="jymVt">
-      <property role="TrG5h" value="toFilter" />
-      <node concept="3clFbS" id="1imVejV_97h" role="3clF47">
-        <node concept="3clFbF" id="1imVejV_a9g" role="3cqZAp">
-          <node concept="2ShNRf" id="1imVejV_a9e" role="3clFbG">
-            <node concept="1pGfFk" id="1imVejV_aA_" role="2ShVmc">
-              <ref role="37wK5l" node="1imVejV$tqF" resolve="PrincipalStore.StoreTemplateFilter" />
-              <node concept="Xjq3P" id="1imVejV_aLD" role="37wK5m" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1imVejV_7G3" role="1B3o_S" />
-      <node concept="3uibUv" id="1imVejV_8Pd" role="3clF45">
-        <ref role="3uigEE" node="1imVejVxYQd" resolve="TemplateApplicationFilter" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1imVejVA$rM" role="jymVt" />
-    <node concept="3clFb_" id="1imVejVABtA" role="jymVt">
-      <property role="TrG5h" value="getAll" />
-      <node concept="37vLTG" id="1imVejVAKoT" role="3clF46">
-        <property role="TrG5h" value="templateBindings" />
-        <node concept="A3Dl8" id="1imVejVALgK" role="1tU5fm">
-          <node concept="1LlUBW" id="1imVejVALt5" role="A3Ik2">
-            <node concept="17QB3L" id="1imVejVALt6" role="1Lm7xW" />
-            <node concept="3uibUv" id="5F2qBBEraxd" role="1Lm7xW">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbS" id="1imVejVABtD" role="3clF47">
-        <node concept="3cpWs8" id="1imVejVAMtH" role="3cqZAp">
-          <node concept="3cpWsn" id="1imVejVAMtK" role="3cpWs9">
-            <property role="TrG5h" value="result" />
-            <node concept="_YKpA" id="1imVejVAMtF" role="1tU5fm">
-              <node concept="3uibUv" id="1imVejVAMxc" role="_ZDj9">
-                <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="1imVejVAMJh" role="33vP2m">
-              <node concept="Tc6Ow" id="1imVejVAMZl" role="2ShVmc">
-                <node concept="3uibUv" id="1imVejVANLI" role="HW$YZ">
-                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2Gpval" id="1imVejVANXP" role="3cqZAp">
-          <node concept="2GrKxI" id="1imVejVANXR" role="2Gsz3X">
-            <property role="TrG5h" value="binding" />
-          </node>
-          <node concept="37vLTw" id="1imVejVAOaO" role="2GsD0m">
-            <ref role="3cqZAo" node="1imVejVAKoT" resolve="templateBindings" />
-          </node>
-          <node concept="3clFbS" id="1imVejVANXV" role="2LFqv$">
-            <node concept="3clFbF" id="1imVejVAOue" role="3cqZAp">
-              <node concept="2OqwBi" id="1imVejVAPbI" role="3clFbG">
-                <node concept="37vLTw" id="1imVejVAOud" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1imVejVAMtK" resolve="result" />
-                </node>
-                <node concept="X8dFx" id="1imVejVAPH$" role="2OqNvi">
-                  <node concept="1rXfSq" id="1imVejVAXkf" role="25WWJ7">
-                    <ref role="37wK5l" node="8aYibn9Iv3" resolve="getOrEmpty" />
-                    <node concept="2GrUjf" id="1imVejVAY1u" role="37wK5m">
-                      <ref role="2Gs0qQ" node="1imVejVANXR" resolve="binding" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="1imVejVAZlM" role="3cqZAp">
-          <node concept="37vLTw" id="1imVejVB14k" role="3cqZAk">
-            <ref role="3cqZAo" node="1imVejVAMtK" resolve="result" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1imVejVA_Px" role="1B3o_S" />
-      <node concept="3vKaQO" id="1imVejVAFbp" role="3clF45">
-        <node concept="3uibUv" id="1imVejVAG3b" role="3O5elw">
-          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1imVejVuJaM" role="jymVt" />
-    <node concept="3clFb_" id="1imVejVtNz5" role="jymVt">
-      <property role="TrG5h" value="hasPrincipalResults" />
-      <node concept="37vLTG" id="1imVejVtNz6" role="3clF46">
-        <property role="TrG5h" value="templateBiinding" />
-        <node concept="1LlUBW" id="1imVejVtNz7" role="1tU5fm">
-          <node concept="17QB3L" id="1imVejVtNz8" role="1Lm7xW" />
-          <node concept="3uibUv" id="5F2qBBErcyk" role="1Lm7xW">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1imVejVtNzb" role="1B3o_S" />
-      <node concept="10P_77" id="1imVejVtNzc" role="3clF45" />
-      <node concept="3clFbS" id="1imVejVtNzd" role="3clF47">
-        <node concept="3clFbF" id="1imVejVvvrb" role="3cqZAp">
-          <node concept="2OqwBi" id="1imVejVvwlZ" role="3clFbG">
-            <node concept="37vLTw" id="1imVejVvvra" role="2Oq$k0">
-              <ref role="3cqZAo" node="1imVejVujwS" resolve="store" />
-            </node>
-            <node concept="2Nt0df" id="1imVejVvx8B" role="2OqNvi">
-              <node concept="37vLTw" id="1imVejVvxtu" role="38cxEo">
-                <ref role="3cqZAo" node="1imVejVtNz6" resolve="templateBiinding" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1imVejVuOsq" role="jymVt" />
-    <node concept="3clFb_" id="1imVejVtNzg" role="jymVt">
-      <property role="TrG5h" value="getPrincipalResults" />
-      <node concept="37vLTG" id="1imVejVtNzh" role="3clF46">
-        <property role="TrG5h" value="templateBinding" />
-        <node concept="1LlUBW" id="1imVejVtNzi" role="1tU5fm">
-          <node concept="17QB3L" id="1imVejVtNzj" role="1Lm7xW" />
-          <node concept="3uibUv" id="5F2qBBEreAc" role="1Lm7xW">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1imVejVtNzm" role="1B3o_S" />
-      <node concept="A3Dl8" id="1imVejVtNzn" role="3clF45">
-        <node concept="3uibUv" id="1imVejVtNzo" role="A3Ik2">
-          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="1imVejVtNzp" role="3clF47">
-        <node concept="3clFbF" id="1imVejVvsZj" role="3cqZAp">
-          <node concept="3EllGN" id="1imVejVvtQ$" role="3clFbG">
-            <node concept="37vLTw" id="1imVejVvulx" role="3ElVtu">
-              <ref role="3cqZAo" node="1imVejVtNzh" resolve="templateBinding" />
-            </node>
-            <node concept="37vLTw" id="1imVejVvsZi" role="3ElQJh">
-              <ref role="3cqZAo" node="1imVejVujwS" resolve="store" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1imVejVuMFe" role="jymVt" />
-    <node concept="3clFb_" id="1imVejVtNzq" role="jymVt">
-      <property role="TrG5h" value="putAll" />
-      <node concept="37vLTG" id="1imVejVuT73" role="3clF46">
-        <property role="TrG5h" value="templateBinding" />
-        <node concept="1LlUBW" id="1imVejVuT74" role="1tU5fm">
-          <node concept="17QB3L" id="1imVejVuT75" role="1Lm7xW" />
-          <node concept="3uibUv" id="5F2qBBErgtF" role="1Lm7xW">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="1imVejVtNzu" role="3clF46">
-        <property role="TrG5h" value="occurrences" />
-        <node concept="A3Dl8" id="1imVejVtNzv" role="1tU5fm">
-          <node concept="3uibUv" id="1imVejVtNzw" role="A3Ik2">
-            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1imVejVtNzx" role="1B3o_S" />
-      <node concept="3cqZAl" id="1imVejVtNzy" role="3clF45" />
-      <node concept="3clFbS" id="1imVejVtNzz" role="3clF47">
-        <node concept="3SKdUt" id="1imVejVvsgY" role="3cqZAp">
-          <node concept="1PaTwC" id="1imVejVvsgZ" role="1aUNEU">
-            <node concept="3oM_SD" id="1imVejVvsh0" role="1PaTwD">
-              <property role="3oM_SC" value="check" />
-            </node>
-            <node concept="3oM_SD" id="1imVejVvsFo" role="1PaTwD">
-              <property role="3oM_SC" value="validity" />
-            </node>
-          </node>
-        </node>
-        <node concept="2Gpval" id="1imVejVuZH8" role="3cqZAp">
-          <node concept="2GrKxI" id="1imVejVuZHa" role="2Gsz3X">
-            <property role="TrG5h" value="occ" />
-          </node>
-          <node concept="37vLTw" id="1imVejVv0HT" role="2GsD0m">
-            <ref role="3cqZAo" node="1imVejVtNzu" resolve="occurrences" />
-          </node>
-          <node concept="3clFbS" id="1imVejVuZHe" role="2LFqv$">
-            <node concept="3clFbJ" id="1imVejVv6Gi" role="3cqZAp">
-              <node concept="3clFbS" id="1imVejVv6Gk" role="3clFbx">
-                <node concept="YS8fn" id="1imVejVvgHY" role="3cqZAp">
-                  <node concept="2ShNRf" id="1imVejVvgND" role="YScLw">
-                    <node concept="1pGfFk" id="1imVejVvhg9" role="2ShVmc">
-                      <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;()" resolve="IllegalArgumentException" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3fqX7Q" id="1imVejVvfRo" role="3clFbw">
-                <node concept="2OqwBi" id="1imVejVvfRq" role="3fr31v">
-                  <node concept="2OqwBi" id="1imVejVvfRr" role="2Oq$k0">
-                    <node concept="2OqwBi" id="1imVejVvfRs" role="2Oq$k0">
-                      <node concept="2GrUjf" id="1imVejVvfRt" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="1imVejVuZHa" resolve="occ" />
-                      </node>
-                      <node concept="liA8E" id="1imVejVvfRu" role="2OqNvi">
-                        <ref role="37wK5l" to="w7la:~ConstraintOccurrence.sourceRule()" resolve="sourceRule" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="1imVejVvfRv" role="2OqNvi">
-                      <ref role="37wK5l" to="av0y:~Rule$Tag.groupName()" resolve="groupName" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="1imVejVvfRw" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
-                    <node concept="1LFfDK" id="1imVejVvfRx" role="37wK5m">
-                      <node concept="3cmrfG" id="1imVejVvfRy" role="1LF_Uc">
-                        <property role="3cmrfH" value="0" />
-                      </node>
-                      <node concept="37vLTw" id="1imVejVvfRz" role="1LFl5Q">
-                        <ref role="3cqZAo" node="1imVejVuT73" resolve="templateBinding" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="1imVejVvmst" role="3cqZAp">
-              <node concept="3clFbS" id="1imVejVvmsv" role="3clFbx">
-                <node concept="YS8fn" id="1imVejVvr_U" role="3cqZAp">
-                  <node concept="2ShNRf" id="1imVejVvr_V" role="YScLw">
-                    <node concept="1pGfFk" id="1imVejVvr_W" role="2ShVmc">
-                      <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;()" resolve="IllegalArgumentException" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3fqX7Q" id="1imVejVvmzh" role="3clFbw">
-                <node concept="2OqwBi" id="1imVejVvnxn" role="3fr31v">
-                  <node concept="2OqwBi" id="1imVejVvmG8" role="2Oq$k0">
-                    <node concept="2GrUjf" id="1imVejVvmCY" role="2Oq$k0">
-                      <ref role="2Gs0qQ" node="1imVejVuZHa" resolve="occ" />
-                    </node>
-                    <node concept="liA8E" id="1imVejVvmRr" role="2OqNvi">
-                      <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments()" resolve="arguments" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="1imVejVvoj$" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~List.contains(java.lang.Object)" resolve="contains" />
-                    <node concept="1LFfDK" id="1imVejVvqXs" role="37wK5m">
-                      <node concept="3cmrfG" id="1imVejVvr_b" role="1LF_Uc">
-                        <property role="3cmrfH" value="1" />
-                      </node>
-                      <node concept="37vLTw" id="1imVejVvpBO" role="1LFl5Q">
-                        <ref role="3cqZAo" node="1imVejVuT73" resolve="templateBinding" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1imVejVvsFF" role="3cqZAp" />
-        <node concept="3clFbF" id="1imVejVuQfu" role="3cqZAp">
-          <node concept="2OqwBi" id="1imVejVuXfy" role="3clFbG">
-            <node concept="1rXfSq" id="1imVejVuQft" role="2Oq$k0">
-              <ref role="37wK5l" node="1imVejVupih" resolve="getOrNew" />
-              <node concept="37vLTw" id="1imVejVuW9i" role="37wK5m">
-                <ref role="3cqZAo" node="1imVejVuT73" resolve="templateBinding" />
-              </node>
-            </node>
-            <node concept="X8dFx" id="1imVejVuXUA" role="2OqNvi">
-              <node concept="37vLTw" id="1imVejVuYmn" role="25WWJ7">
-                <ref role="3cqZAo" node="1imVejVtNzu" resolve="occurrences" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1imVejVCy5B" role="jymVt" />
-    <node concept="3clFb_" id="1imVejVCuLX" role="jymVt">
-      <property role="TrG5h" value="putAll" />
-      <node concept="37vLTG" id="1imVejVCuM2" role="3clF46">
-        <property role="TrG5h" value="occurrences" />
-        <node concept="A3Dl8" id="1imVejVCuM3" role="1tU5fm">
-          <node concept="3uibUv" id="1imVejVCuM4" role="A3Ik2">
-            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1imVejVCuM5" role="1B3o_S" />
-      <node concept="3cqZAl" id="1imVejVCuM6" role="3clF45" />
-      <node concept="3clFbS" id="1imVejVCuM7" role="3clF47">
-        <node concept="3cpWs8" id="2cnBL_GKB2v" role="3cqZAp">
-          <node concept="3cpWsn" id="2cnBL_GKB2y" role="3cpWs9">
-            <property role="TrG5h" value="tmpStore" />
-            <node concept="3rvAFt" id="2cnBL_GKB2$" role="1tU5fm">
-              <node concept="3vKaQO" id="2cnBL_GKB2_" role="3rvSg0">
-                <node concept="3uibUv" id="2cnBL_GKB2A" role="3O5elw">
-                  <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-                </node>
-              </node>
-              <node concept="1LlUBW" id="2cnBL_GKB2B" role="3rvQeY">
-                <node concept="17QB3L" id="2cnBL_GKB2C" role="1Lm7xW" />
-                <node concept="3uibUv" id="5F2qBBErikq" role="1Lm7xW">
-                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                </node>
-              </node>
-            </node>
-            <node concept="2ShNRf" id="2cnBL_GKBMk" role="33vP2m">
-              <node concept="3rGOSV" id="2cnBL_GKDPI" role="2ShVmc">
-                <node concept="1LlUBW" id="2cnBL_GKE8I" role="3rHrn6">
-                  <node concept="17QB3L" id="2cnBL_GKE8J" role="1Lm7xW" />
-                  <node concept="3uibUv" id="5F2qBBErjYO" role="1Lm7xW">
-                    <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                  </node>
-                </node>
-                <node concept="3vKaQO" id="2cnBL_GLfbq" role="3rHtpV">
-                  <node concept="3uibUv" id="2cnBL_GLfbr" role="3O5elw">
-                    <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="8aYibnaOG_" role="3lNPQL">
-                  <node concept="37vLTw" id="8aYibnaOE2" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1imVejVCuM2" resolve="occurrences" />
-                  </node>
-                  <node concept="34oBXx" id="8aYibnaQ1D" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="2cnBL_GKARg" role="3cqZAp" />
-        <node concept="2Gpval" id="1imVejVCuMc" role="3cqZAp">
-          <node concept="2GrKxI" id="1imVejVCuMd" role="2Gsz3X">
-            <property role="TrG5h" value="occ" />
-          </node>
-          <node concept="37vLTw" id="1imVejVCuMe" role="2GsD0m">
-            <ref role="3cqZAo" node="1imVejVCuM2" resolve="occurrences" />
-          </node>
-          <node concept="3clFbS" id="1imVejVCuMf" role="2LFqv$">
-            <node concept="3cpWs8" id="1imVejVDkEE" role="3cqZAp">
-              <node concept="3cpWsn" id="1imVejVDkEH" role="3cpWs9">
-                <property role="TrG5h" value="target" />
-                <node concept="3Tqbb2" id="1imVejVDkEC" role="1tU5fm" />
-                <node concept="1rXfSq" id="1imVejVDl1X" role="33vP2m">
-                  <ref role="37wK5l" node="1imVejVCTNP" resolve="targetNode" />
-                  <node concept="2GrUjf" id="1imVejVDlyK" role="37wK5m">
-                    <ref role="2Gs0qQ" node="1imVejVCuMd" resolve="occ" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="1imVejVDmoV" role="3cqZAp">
-              <node concept="3clFbS" id="1imVejVDmoX" role="3clFbx">
-                <node concept="3SKdUt" id="1imVejVDnL2" role="3cqZAp">
-                  <node concept="1PaTwC" id="1imVejVDnL3" role="1aUNEU">
-                    <node concept="3oM_SD" id="1imVejVDnL4" role="1PaTwD">
-                      <property role="3oM_SC" value="fixme:" />
-                    </node>
-                    <node concept="3oM_SD" id="1imVejVDnLb" role="1PaTwD">
-                      <property role="3oM_SC" value="warn?" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="1X3_iC" id="1imVejVDGow" role="lGtFl">
-                  <property role="3V$3am" value="statement" />
-                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                  <node concept="YS8fn" id="1imVejVDFx7" role="8Wnug">
-                    <node concept="2ShNRf" id="1imVejVDFAy" role="YScLw">
-                      <node concept="1pGfFk" id="1imVejVDG36" role="2ShVmc">
-                        <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
-                        <node concept="Xl_RD" id="1imVejVDGc8" role="37wK5m">
-                          <property role="Xl_RC" value="expected principal occurrence" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3N13vt" id="1imVejVDGui" role="3cqZAp" />
-              </node>
-              <node concept="3clFbC" id="1imVejVDnjm" role="3clFbw">
-                <node concept="10Nm6u" id="1imVejVDnwD" role="3uHU7w" />
-                <node concept="37vLTw" id="1imVejVDnaW" role="3uHU7B">
-                  <ref role="3cqZAo" node="1imVejVDkEH" resolve="target" />
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="1imVejVDoIv" role="3cqZAp">
-              <node concept="3cpWsn" id="1imVejVDoIy" role="3cpWs9">
-                <property role="TrG5h" value="templateName" />
-                <node concept="17QB3L" id="1imVejVDoIt" role="1tU5fm" />
-                <node concept="2OqwBi" id="1imVejVDpUn" role="33vP2m">
-                  <node concept="2OqwBi" id="1imVejVDpiK" role="2Oq$k0">
-                    <node concept="2GrUjf" id="1imVejVDpgZ" role="2Oq$k0">
-                      <ref role="2Gs0qQ" node="1imVejVCuMd" resolve="occ" />
-                    </node>
-                    <node concept="liA8E" id="1imVejVDpJU" role="2OqNvi">
-                      <ref role="37wK5l" to="w7la:~ConstraintOccurrence.sourceRule()" resolve="sourceRule" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="1imVejVDqxt" role="2OqNvi">
-                    <ref role="37wK5l" to="av0y:~Rule$Tag.groupName()" resolve="groupName" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="1imVejVDC1o" role="3cqZAp">
-              <node concept="2OqwBi" id="1imVejVDC1p" role="3clFbG">
-                <node concept="1rXfSq" id="1imVejVDC1q" role="2Oq$k0">
-                  <ref role="37wK5l" node="2cnBL_GKEp_" resolve="getOrNew" />
-                  <node concept="37vLTw" id="2cnBL_GLgIW" role="37wK5m">
-                    <ref role="3cqZAo" node="2cnBL_GKB2y" resolve="tmpStore" />
-                  </node>
-                  <node concept="1Ls8ON" id="1imVejVDC1r" role="37wK5m">
-                    <node concept="37vLTw" id="1imVejVDC1s" role="1Lso8e">
-                      <ref role="3cqZAo" node="1imVejVDoIy" resolve="templateName" />
-                    </node>
-                    <node concept="1eOMI4" id="5F2qBBEw3AT" role="1Lso8e">
-                      <node concept="10QFUN" id="5F2qBBEw3AS" role="1eOMHV">
-                        <node concept="37vLTw" id="5F2qBBEw3AR" role="10QFUP">
-                          <ref role="3cqZAo" node="1imVejVDkEH" resolve="target" />
-                        </node>
-                        <node concept="3uibUv" id="5F2qBBEw3Pn" role="10QFUM">
-                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="TSZUe" id="1imVejVDDSE" role="2OqNvi">
-                  <node concept="2GrUjf" id="1imVejVDEbu" role="25WWJ7">
-                    <ref role="2Gs0qQ" node="1imVejVCuMd" resolve="occ" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="2cnBL_GLlJy" role="3cqZAp" />
-        <node concept="3SKdUt" id="2cnBL_GLl5f" role="3cqZAp">
-          <node concept="1PaTwC" id="2cnBL_GLl5g" role="1aUNEU">
-            <node concept="3oM_SD" id="2cnBL_GLl5h" role="1PaTwD">
-              <property role="3oM_SC" value="substitute" />
-            </node>
-            <node concept="3oM_SD" id="2cnBL_GLlvy" role="1PaTwD">
-              <property role="3oM_SC" value="older" />
-            </node>
-            <node concept="3oM_SD" id="2cnBL_GLlvH" role="1PaTwD">
-              <property role="3oM_SC" value="cached" />
-            </node>
-            <node concept="3oM_SD" id="2cnBL_GLlw9" role="1PaTwD">
-              <property role="3oM_SC" value="occurrences" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="2cnBL_GLi2a" role="3cqZAp">
-          <node concept="2OqwBi" id="2cnBL_GLjnW" role="3clFbG">
-            <node concept="2OqwBi" id="2cnBL_GLiqY" role="2Oq$k0">
-              <node concept="Xjq3P" id="2cnBL_GLi28" role="2Oq$k0" />
-              <node concept="2OwXpG" id="2cnBL_GLiL0" role="2OqNvi">
-                <ref role="2Oxat5" node="1imVejVujwS" resolve="store" />
-              </node>
-            </node>
-            <node concept="3FNE7p" id="2cnBL_GLkz4" role="2OqNvi">
-              <node concept="37vLTw" id="2cnBL_GLkKk" role="3FOfgg">
-                <ref role="3cqZAo" node="2cnBL_GKB2y" resolve="tmpStore" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1imVejVCODo" role="jymVt" />
-    <node concept="3clFb_" id="1imVejVCTNP" role="jymVt">
-      <property role="TrG5h" value="targetNode" />
-      <node concept="3clFbS" id="1imVejVCTNS" role="3clF47">
-        <node concept="2Gpval" id="1imVejVCNfF" role="3cqZAp">
-          <node concept="2GrKxI" id="1imVejVCNfH" role="2Gsz3X">
-            <property role="TrG5h" value="arg" />
-          </node>
-          <node concept="2OqwBi" id="1imVejVCNvH" role="2GsD0m">
-            <node concept="37vLTw" id="1imVejVDjYv" role="2Oq$k0">
-              <ref role="3cqZAo" node="1imVejVCXs3" resolve="occ" />
-            </node>
-            <node concept="liA8E" id="1imVejVCNPl" role="2OqNvi">
-              <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments()" resolve="arguments" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="1imVejVCNfL" role="2LFqv$">
-            <node concept="3clFbJ" id="1imVejVCNZS" role="3cqZAp">
-              <node concept="2ZW3vV" id="1imVejVCOkg" role="3clFbw">
-                <node concept="3uibUv" id="1imVejVCOnN" role="2ZW6by">
-                  <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                </node>
-                <node concept="2GrUjf" id="1imVejVDgNC" role="2ZW6bz">
-                  <ref role="2Gs0qQ" node="1imVejVCNfH" resolve="arg" />
-                </node>
-              </node>
-              <node concept="3clFbS" id="1imVejVCNZU" role="3clFbx">
-                <node concept="3cpWs6" id="1imVejVD5i6" role="3cqZAp">
-                  <node concept="10QFUN" id="1imVejVE8sR" role="3cqZAk">
-                    <node concept="2GrUjf" id="1imVejVE8sQ" role="10QFUP">
-                      <ref role="2Gs0qQ" node="1imVejVCNfH" resolve="arg" />
-                    </node>
-                    <node concept="3uibUv" id="1imVejVE8sP" role="10QFUM">
-                      <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="1imVejVDach" role="3cqZAp">
-          <node concept="10Nm6u" id="1imVejVDdS1" role="3cqZAk" />
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="1imVejVCROH" role="1B3o_S" />
-      <node concept="37vLTG" id="1imVejVCXs3" role="3clF46">
-        <property role="TrG5h" value="occ" />
-        <node concept="3uibUv" id="1imVejVCXs2" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="1imVejVCYTw" role="2AJF6D">
-        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
-      </node>
-      <node concept="3uibUv" id="1imVejVD21_" role="3clF45">
-        <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1imVejVuKWA" role="jymVt" />
-    <node concept="3clFb_" id="1imVejVtNz$" role="jymVt">
-      <property role="TrG5h" value="occurrences" />
-      <node concept="3Tm1VV" id="1imVejVtNzA" role="1B3o_S" />
-      <node concept="3clFbS" id="1imVejVtNzD" role="3clF47">
-        <node concept="3clFbF" id="1imVejVuCF8" role="3cqZAp">
-          <node concept="2OqwBi" id="1imVejVuFxj" role="3clFbG">
-            <node concept="2OqwBi" id="1imVejVuE_y" role="2Oq$k0">
-              <node concept="2OqwBi" id="1imVejVuDf9" role="2Oq$k0">
-                <node concept="37vLTw" id="1imVejVuCF7" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1imVejVujwS" resolve="store" />
-                </node>
-                <node concept="T8wYR" id="1imVejVuDSC" role="2OqNvi" />
-              </node>
-              <node concept="3goQfb" id="1imVejVuFcr" role="2OqNvi">
-                <node concept="1bVj0M" id="1imVejVuFct" role="23t8la">
-                  <node concept="3clFbS" id="1imVejVuFcu" role="1bW5cS">
-                    <node concept="3clFbF" id="1imVejVuFpt" role="3cqZAp">
-                      <node concept="37vLTw" id="1imVejVuFps" role="3clFbG">
-                        <ref role="3cqZAo" node="1imVejVuFcv" resolve="it" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="Rh6nW" id="1imVejVuFcv" role="1bW2Oz">
-                    <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="1imVejVuFcw" role="1tU5fm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="ANE8D" id="1imVejVuG6x" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-      <node concept="3vKaQO" id="1imVejVw_uE" role="3clF45">
-        <node concept="3uibUv" id="1imVejVwAu3" role="3O5elw">
-          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1imVejVuAWJ" role="jymVt" />
-    <node concept="3clFb_" id="1imVejVupih" role="jymVt">
-      <property role="TrG5h" value="getOrNew" />
-      <node concept="37vLTG" id="1imVejVur98" role="3clF46">
-        <property role="TrG5h" value="templateBinding" />
-        <node concept="1LlUBW" id="1imVejVur99" role="1tU5fm">
-          <node concept="17QB3L" id="1imVejVur9a" role="1Lm7xW" />
-          <node concept="3uibUv" id="5F2qBBErlEc" role="1Lm7xW">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbS" id="1imVejVupik" role="3clF47">
-        <node concept="3clFbF" id="2cnBL_GLal6" role="3cqZAp">
-          <node concept="1rXfSq" id="2cnBL_GKXNB" role="3clFbG">
-            <ref role="37wK5l" node="2cnBL_GKEp_" resolve="getOrNew" />
-            <node concept="2OqwBi" id="2cnBL_GL1bE" role="37wK5m">
-              <node concept="Xjq3P" id="2cnBL_GKZJl" role="2Oq$k0" />
-              <node concept="2OwXpG" id="2cnBL_GL38k" role="2OqNvi">
-                <ref role="2Oxat5" node="1imVejVujwS" resolve="store" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="2cnBL_GL64P" role="37wK5m">
-              <ref role="3cqZAo" node="1imVejVur98" resolve="templateBinding" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="1imVejVunN_" role="1B3o_S" />
-      <node concept="3vKaQO" id="1imVejVuqPc" role="3clF45">
-        <node concept="3uibUv" id="1imVejVuqPd" role="3O5elw">
-          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1imVejVuglP" role="jymVt" />
-    <node concept="3clFb_" id="8aYibn9Iv3" role="jymVt">
-      <property role="TrG5h" value="getOrEmpty" />
-      <node concept="37vLTG" id="8aYibn9Iv4" role="3clF46">
-        <property role="TrG5h" value="templateBinding" />
-        <node concept="1LlUBW" id="8aYibn9Iv5" role="1tU5fm">
-          <node concept="17QB3L" id="8aYibn9Iv6" role="1Lm7xW" />
-          <node concept="3uibUv" id="5F2qBBErnYr" role="1Lm7xW">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbS" id="8aYibn9Iv8" role="3clF47">
-        <node concept="3cpWs8" id="8aYibn9Ud0" role="3cqZAp">
-          <node concept="3cpWsn" id="8aYibn9Ud1" role="3cpWs9">
-            <property role="TrG5h" value="values" />
-            <node concept="3vKaQO" id="8aYibn9Ud2" role="1tU5fm">
-              <node concept="3uibUv" id="8aYibn9Ud3" role="3O5elw">
-                <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-              </node>
-            </node>
-            <node concept="3EllGN" id="8aYibn9Ud4" role="33vP2m">
-              <node concept="37vLTw" id="8aYibn9Ud5" role="3ElVtu">
-                <ref role="3cqZAo" node="8aYibn9Iv4" resolve="templateBinding" />
-              </node>
-              <node concept="37vLTw" id="8aYibn9VU4" role="3ElQJh">
-                <ref role="3cqZAo" node="1imVejVujwS" resolve="store" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="8aYibn9ULc" role="3cqZAp">
-          <node concept="3clFbS" id="8aYibn9ULe" role="3clFbx">
-            <node concept="3clFbF" id="8aYibn9V1L" role="3cqZAp">
-              <node concept="37vLTI" id="8aYibn9Vb4" role="3clFbG">
-                <node concept="2YIFZM" id="8aYibn9Vuc" role="37vLTx">
-                  <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
-                  <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-                </node>
-                <node concept="37vLTw" id="8aYibn9V1J" role="37vLTJ">
-                  <ref role="3cqZAo" node="8aYibn9Ud1" resolve="values" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="8aYibn9UWU" role="3clFbw">
-            <node concept="10Nm6u" id="8aYibn9UYT" role="3uHU7w" />
-            <node concept="37vLTw" id="8aYibn9UO1" role="3uHU7B">
-              <ref role="3cqZAo" node="8aYibn9Ud1" resolve="values" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="8aYibn9VFO" role="3cqZAp">
-          <node concept="37vLTw" id="8aYibn9VHZ" role="3cqZAk">
-            <ref role="3cqZAo" node="8aYibn9Ud1" resolve="values" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="8aYibn9Ivf" role="1B3o_S" />
-      <node concept="3vKaQO" id="8aYibn9Ivg" role="3clF45">
-        <node concept="3uibUv" id="8aYibn9Ivh" role="3O5elw">
-          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="8aYibn9ZT9" role="jymVt" />
-    <node concept="3clFb_" id="2cnBL_GKEp_" role="jymVt">
-      <property role="TrG5h" value="getOrNew" />
-      <node concept="37vLTG" id="2cnBL_GKMNK" role="3clF46">
-        <property role="TrG5h" value="store0" />
-        <node concept="3rvAFt" id="2cnBL_GKPfq" role="1tU5fm">
-          <node concept="3vKaQO" id="2cnBL_GKPfr" role="3rvSg0">
-            <node concept="3uibUv" id="2cnBL_GKPfs" role="3O5elw">
-              <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-            </node>
-          </node>
-          <node concept="1LlUBW" id="2cnBL_GKPft" role="3rvQeY">
-            <node concept="17QB3L" id="2cnBL_GKPfu" role="1Lm7xW" />
-            <node concept="3uibUv" id="5F2qBBErqMM" role="1Lm7xW">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="2cnBL_GKEpA" role="3clF46">
-        <property role="TrG5h" value="templateBinding" />
-        <node concept="1LlUBW" id="2cnBL_GKEpB" role="1tU5fm">
-          <node concept="17QB3L" id="2cnBL_GKEpC" role="1Lm7xW" />
-          <node concept="3uibUv" id="5F2qBBEru3R" role="1Lm7xW">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbS" id="2cnBL_GKEpE" role="3clF47">
-        <node concept="3cpWs8" id="2cnBL_GKEpF" role="3cqZAp">
-          <node concept="3cpWsn" id="2cnBL_GKEpG" role="3cpWs9">
-            <property role="TrG5h" value="values" />
-            <node concept="3vKaQO" id="2cnBL_GKEpH" role="1tU5fm">
-              <node concept="3uibUv" id="2cnBL_GKEpI" role="3O5elw">
-                <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-              </node>
-            </node>
-            <node concept="3EllGN" id="2cnBL_GKEpJ" role="33vP2m">
-              <node concept="37vLTw" id="2cnBL_GKEpK" role="3ElVtu">
-                <ref role="3cqZAo" node="2cnBL_GKEpA" resolve="templateBinding" />
-              </node>
-              <node concept="37vLTw" id="2cnBL_GKRSd" role="3ElQJh">
-                <ref role="3cqZAo" node="2cnBL_GKMNK" resolve="store0" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="2cnBL_GKEpM" role="3cqZAp">
-          <node concept="3clFbS" id="2cnBL_GKEpN" role="3clFbx">
-            <node concept="3clFbF" id="2cnBL_GKEpO" role="3cqZAp">
-              <node concept="37vLTI" id="2cnBL_GKEpP" role="3clFbG">
-                <node concept="2ShNRf" id="2cnBL_GKEpQ" role="37vLTx">
-                  <node concept="Tc6Ow" id="2cnBL_GKEpR" role="2ShVmc">
-                    <node concept="3uibUv" id="2cnBL_GKEpS" role="HW$YZ">
-                      <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="2cnBL_GKEpT" role="37vLTJ">
-                  <ref role="3cqZAo" node="2cnBL_GKEpG" resolve="values" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="2cnBL_GKEpU" role="3cqZAp">
-              <node concept="37vLTI" id="2cnBL_GKEpV" role="3clFbG">
-                <node concept="37vLTw" id="2cnBL_GKEpW" role="37vLTx">
-                  <ref role="3cqZAo" node="2cnBL_GKEpG" resolve="values" />
-                </node>
-                <node concept="3EllGN" id="2cnBL_GKEpX" role="37vLTJ">
-                  <node concept="37vLTw" id="2cnBL_GKEpY" role="3ElVtu">
-                    <ref role="3cqZAo" node="2cnBL_GKEpA" resolve="templateBinding" />
-                  </node>
-                  <node concept="37vLTw" id="2cnBL_GKTSt" role="3ElQJh">
-                    <ref role="3cqZAo" node="2cnBL_GKMNK" resolve="store0" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="2cnBL_GKEq0" role="3clFbw">
-            <node concept="10Nm6u" id="2cnBL_GKEq1" role="3uHU7w" />
-            <node concept="37vLTw" id="2cnBL_GKEq2" role="3uHU7B">
-              <ref role="3cqZAo" node="2cnBL_GKEpG" resolve="values" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="2cnBL_GKEq3" role="3cqZAp">
-          <node concept="37vLTw" id="2cnBL_GKEq4" role="3cqZAk">
-            <ref role="3cqZAo" node="2cnBL_GKEpG" resolve="values" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="2cnBL_GKEq5" role="1B3o_S" />
-      <node concept="3vKaQO" id="2cnBL_GKEq6" role="3clF45">
-        <node concept="3uibUv" id="2cnBL_GKEq7" role="3O5elw">
-          <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2cnBL_GKEjL" role="jymVt" />
-    <node concept="2tJIrI" id="2cnBL_GLdK4" role="jymVt" />
-    <node concept="312cEu" id="1imVejVygwb" role="jymVt">
-      <property role="TrG5h" value="StoreTemplateFilter" />
-      <node concept="2tJIrI" id="1imVejV$sVZ" role="jymVt" />
-      <node concept="312cEg" id="1imVejV$_c5" role="jymVt">
-        <property role="TrG5h" value="store" />
-        <node concept="3Tm6S6" id="1imVejV$$XW" role="1B3o_S" />
-        <node concept="3uibUv" id="1imVejV$_66" role="1tU5fm">
-          <ref role="3uigEE" node="1imVejVtN6P" resolve="PrincipalStore" />
-        </node>
-      </node>
-      <node concept="312cEg" id="1imVejVvX20" role="jymVt">
-        <property role="TrG5h" value="skippedTemplates" />
-        <node concept="3Tm6S6" id="1imVejVvX21" role="1B3o_S" />
-        <node concept="3vKaQO" id="1imVejVyoEX" role="1tU5fm">
-          <node concept="1LlUBW" id="1imVejV$Le$" role="3O5elw">
-            <node concept="17QB3L" id="1imVejV$Le_" role="1Lm7xW" />
-            <node concept="3uibUv" id="5F2qBBErx9x" role="1Lm7xW">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-        </node>
-        <node concept="2ShNRf" id="1imVejV$Lw0" role="33vP2m">
-          <node concept="Tc6Ow" id="1imVejV$LM_" role="2ShVmc">
-            <node concept="1LlUBW" id="1imVejV$MmX" role="HW$YZ">
-              <node concept="17QB3L" id="1imVejV$MmY" role="1Lm7xW" />
-              <node concept="3uibUv" id="5F2qBBEryLK" role="1Lm7xW">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="1imVejV$_kf" role="jymVt" />
-      <node concept="3clFbW" id="1imVejV$tqF" role="jymVt">
-        <node concept="37vLTG" id="1imVejV$tyx" role="3clF46">
-          <property role="TrG5h" value="store" />
-          <node concept="3uibUv" id="1imVejV$tJp" role="1tU5fm">
-            <ref role="3uigEE" node="1imVejVtN6P" resolve="PrincipalStore" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="1imVejV$tqG" role="3clF45" />
-        <node concept="3clFbS" id="1imVejV$tqI" role="3clF47">
-          <node concept="3clFbF" id="1imVejV$$PG" role="3cqZAp">
-            <node concept="37vLTI" id="1imVejV$Abo" role="3clFbG">
-              <node concept="37vLTw" id="1imVejV$Af6" role="37vLTx">
-                <ref role="3cqZAo" node="1imVejV$tyx" resolve="store" />
-              </node>
-              <node concept="2OqwBi" id="1imVejV$_BH" role="37vLTJ">
-                <node concept="Xjq3P" id="1imVejV$$PF" role="2Oq$k0" />
-                <node concept="2OwXpG" id="1imVejV$_LM" role="2OqNvi">
-                  <ref role="2Oxat5" node="1imVejV$_c5" resolve="store" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="1imVejV$t43" role="1B3o_S" />
-      </node>
-      <node concept="2tJIrI" id="1imVejV$s5e" role="jymVt" />
-      <node concept="3Tm6S6" id="1imVejVAicX" role="1B3o_S" />
-      <node concept="3uibUv" id="1imVejV$sw6" role="EKbjA">
-        <ref role="3uigEE" node="1imVejVxYQd" resolve="TemplateApplicationFilter" />
-      </node>
-      <node concept="3clFb_" id="1imVejV$sG0" role="jymVt">
-        <property role="TrG5h" value="skipApplication" />
-        <node concept="37vLTG" id="1imVejV$sG1" role="3clF46">
-          <property role="TrG5h" value="templateBinding" />
-          <node concept="1LlUBW" id="1imVejV$sG2" role="1tU5fm">
-            <node concept="17QB3L" id="1imVejV$sG3" role="1Lm7xW" />
-            <node concept="3uibUv" id="5F2qBBEr$3m" role="1Lm7xW">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="1imVejV$sG5" role="1B3o_S" />
-        <node concept="10P_77" id="1imVejV$sG6" role="3clF45" />
-        <node concept="3clFbS" id="1imVejV$sG8" role="3clF47">
-          <node concept="3clFbJ" id="1imVejV$Nli" role="3cqZAp">
-            <node concept="3clFbS" id="1imVejV$Nm2" role="3clFbx">
-              <node concept="3clFbF" id="1imVejV$Mzl" role="3cqZAp">
-                <node concept="2OqwBi" id="1imVejV$OeB" role="3clFbG">
-                  <node concept="37vLTw" id="1imVejV$Mzj" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1imVejVvX20" resolve="skippedTemplates" />
-                  </node>
-                  <node concept="TSZUe" id="1imVejV$OVe" role="2OqNvi">
-                    <node concept="37vLTw" id="1imVejV$PcZ" role="25WWJ7">
-                      <ref role="3cqZAo" node="1imVejV$sG1" resolve="templateBinding" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs6" id="1imVejV$PB1" role="3cqZAp">
-                <node concept="3clFbT" id="1imVejV$PP_" role="3cqZAk">
-                  <property role="3clFbU" value="true" />
-                </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="1imVejV$BrO" role="3clFbw">
-              <node concept="37vLTw" id="1imVejV$Bca" role="2Oq$k0">
-                <ref role="3cqZAo" node="1imVejV$_c5" resolve="store" />
-              </node>
-              <node concept="liA8E" id="1imVejV$BMZ" role="2OqNvi">
-                <ref role="37wK5l" node="1imVejVtNz5" resolve="hasPrincipalResults" />
-                <node concept="37vLTw" id="1imVejV$C82" role="37wK5m">
-                  <ref role="3cqZAo" node="1imVejV$sG1" resolve="templateBinding" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs6" id="1imVejV$Qrr" role="3cqZAp">
-            <node concept="3clFbT" id="1imVejV$QM9" role="3cqZAk" />
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="1imVejV$XcB" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="1imVejV$Cn5" role="jymVt" />
-      <node concept="3clFb_" id="1imVejV$sGb" role="jymVt">
-        <property role="TrG5h" value="getSkippedApplications" />
-        <node concept="3Tm1VV" id="1imVejV$sGd" role="1B3o_S" />
-        <node concept="3vKaQO" id="1imVejV$sGe" role="3clF45">
-          <node concept="1LlUBW" id="1imVejV$sGf" role="3O5elw">
-            <node concept="17QB3L" id="1imVejV$sGg" role="1Lm7xW" />
-            <node concept="3uibUv" id="5F2qBBErEEO" role="1Lm7xW">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbS" id="1imVejV$sGi" role="3clF47">
-          <node concept="3clFbF" id="1imVejV$R8O" role="3cqZAp">
-            <node concept="2OqwBi" id="1imVejV$ROr" role="3clFbG">
-              <node concept="37vLTw" id="1imVejV$R8N" role="2Oq$k0">
-                <ref role="3cqZAo" node="1imVejVvX20" resolve="skippedTemplates" />
-              </node>
-              <node concept="26Dbio" id="1imVejV$SsK" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="1imVejV$XcA" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1imVejV$Z3G" role="jymVt" />
-    <node concept="312cEu" id="8aYibn93yv" role="jymVt">
-      <property role="TrG5h" value="LRUStore" />
-      <node concept="2tJIrI" id="8aYibn9v_z" role="jymVt" />
-      <node concept="312cEg" id="8aYibn9whq" role="jymVt">
-        <property role="TrG5h" value="maxSize" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3Tm6S6" id="8aYibn9vBw" role="1B3o_S" />
-        <node concept="10Oyi0" id="8aYibn9w4v" role="1tU5fm" />
-      </node>
-      <node concept="2tJIrI" id="8aYibn98nH" role="jymVt" />
-      <node concept="3clFbW" id="8aYibn9f78" role="jymVt">
-        <node concept="37vLTG" id="8aYibn9uZv" role="3clF46">
-          <property role="TrG5h" value="maxSize" />
-          <node concept="10Oyi0" id="8aYibn9vrw" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="8aYibn9fzd" role="3clF46">
-          <property role="TrG5h" value="initialCapacity" />
-          <node concept="10Oyi0" id="8aYibn9fLr" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="8aYibn9fNa" role="3clF46">
-          <property role="TrG5h" value="loadFactor" />
-          <node concept="10OMs4" id="8aYibnbD_v" role="1tU5fm" />
-        </node>
-        <node concept="3cqZAl" id="8aYibn9f79" role="3clF45" />
-        <node concept="3clFbS" id="8aYibn9f7b" role="3clF47">
-          <node concept="3SKdUt" id="8aYibn9_qE" role="3cqZAp">
-            <node concept="1PaTwC" id="8aYibn9_qF" role="1aUNEU">
-              <node concept="3oM_SD" id="8aYibn9_qG" role="1PaTwD">
-                <property role="3oM_SC" value="'true'" />
-              </node>
-              <node concept="3oM_SD" id="8aYibn9_rR" role="1PaTwD">
-                <property role="3oM_SC" value="means" />
-              </node>
-              <node concept="3oM_SD" id="8aYibn9_rX" role="1PaTwD">
-                <property role="3oM_SC" value="order" />
-              </node>
-              <node concept="3oM_SD" id="8aYibn9_rr" role="1PaTwD">
-                <property role="3oM_SC" value="entries" />
-              </node>
-              <node concept="3oM_SD" id="8aYibn9_rA" role="1PaTwD">
-                <property role="3oM_SC" value="in" />
-              </node>
-              <node concept="3oM_SD" id="8aYibn9_rE" role="1PaTwD">
-                <property role="3oM_SC" value="access" />
-              </node>
-              <node concept="3oM_SD" id="8aYibn9_sc" role="1PaTwD">
-                <property role="3oM_SC" value="order" />
-              </node>
-            </node>
-          </node>
-          <node concept="XkiVB" id="8aYibn9h64" role="3cqZAp">
-            <ref role="37wK5l" to="33ny:~LinkedHashMap.&lt;init&gt;(int,float,boolean)" resolve="LinkedHashMap" />
-            <node concept="37vLTw" id="8aYibn9idI" role="37wK5m">
-              <ref role="3cqZAo" node="8aYibn9fzd" resolve="initialCapacity" />
-            </node>
-            <node concept="37vLTw" id="8aYibn9i$y" role="37wK5m">
-              <ref role="3cqZAo" node="8aYibn9fNa" resolve="loadFactor" />
-            </node>
-            <node concept="3clFbT" id="8aYibn9jFB" role="37wK5m">
-              <property role="3clFbU" value="true" />
-            </node>
-          </node>
-          <node concept="3clFbF" id="8aYibnalvl" role="3cqZAp">
-            <node concept="37vLTI" id="8aYibnan_x" role="3clFbG">
-              <node concept="37vLTw" id="8aYibnanWa" role="37vLTx">
-                <ref role="3cqZAo" node="8aYibn9uZv" resolve="maxSize" />
-              </node>
-              <node concept="2OqwBi" id="8aYibnalvA" role="37vLTJ">
-                <node concept="Xjq3P" id="8aYibnalvj" role="2Oq$k0" />
-                <node concept="2OwXpG" id="8aYibnamd_" role="2OqNvi">
-                  <ref role="2Oxat5" node="8aYibn9whq" resolve="maxSize" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="8aYibn9eF6" role="1B3o_S" />
-      </node>
-      <node concept="2tJIrI" id="8aYibn9jUI" role="jymVt" />
-      <node concept="3clFbW" id="8aYibn9jVD" role="jymVt">
-        <node concept="37vLTG" id="8aYibn9wN_" role="3clF46">
-          <property role="TrG5h" value="maxSize" />
-          <node concept="10Oyi0" id="8aYibn9x22" role="1tU5fm" />
-        </node>
-        <node concept="3cqZAl" id="8aYibn9jVI" role="3clF45" />
-        <node concept="3clFbS" id="8aYibn9jVJ" role="3clF47">
-          <node concept="1VxSAg" id="8aYibn9r62" role="3cqZAp">
-            <ref role="37wK5l" node="8aYibn9f78" resolve="PrincipalStore.LRUStore" />
-            <node concept="37vLTw" id="8aYibn9xqh" role="37wK5m">
-              <ref role="3cqZAo" node="8aYibn9wN_" resolve="maxSize" />
-            </node>
-            <node concept="3cmrfG" id="8aYibn9u7r" role="37wK5m">
-              <property role="3cmrfH" value="64" />
-            </node>
-            <node concept="2$xPTn" id="8aYibnbElk" role="37wK5m">
-              <property role="2$xPTl" value="0.75f" />
-            </node>
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="8aYibn9jVO" role="1B3o_S" />
-      </node>
-      <node concept="2tJIrI" id="8aYibn9jVb" role="jymVt" />
-      <node concept="3Tm6S6" id="8aYibn92w7" role="1B3o_S" />
-      <node concept="3uibUv" id="8aYibn94UW" role="1zkMxy">
-        <ref role="3uigEE" to="33ny:~LinkedHashMap" resolve="LinkedHashMap" />
-        <node concept="1LlUBW" id="8aYibn97jm" role="11_B2D">
-          <node concept="17QB3L" id="8aYibn97$G" role="1Lm7xW" />
-          <node concept="3uibUv" id="5F2qBBEr5HX" role="1Lm7xW">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-        <node concept="3vKaQO" id="8aYibn9835" role="11_B2D">
-          <node concept="3uibUv" id="8aYibn9836" role="3O5elw">
-            <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="8aYibn9a30" role="jymVt">
-        <property role="TrG5h" value="removeEldestEntry" />
-        <node concept="3Tmbuc" id="8aYibn9a31" role="1B3o_S" />
-        <node concept="10P_77" id="8aYibn9a33" role="3clF45" />
-        <node concept="37vLTG" id="8aYibn9a34" role="3clF46">
-          <property role="TrG5h" value="eldest" />
-          <node concept="3uibUv" id="8aYibn9a35" role="1tU5fm">
-            <ref role="3uigEE" to="33ny:~Map$Entry" resolve="Map.Entry" />
-            <node concept="1LlUBW" id="8aYibn9a38" role="11_B2D">
-              <node concept="17QB3L" id="8aYibn9a39" role="1Lm7xW" />
-              <node concept="3uibUv" id="5F2qBBErG0i" role="1Lm7xW">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-            </node>
-            <node concept="3vKaQO" id="8aYibn9a3b" role="11_B2D">
-              <node concept="3uibUv" id="8aYibn9a3c" role="3O5elw">
-                <ref role="3uigEE" to="w7la:~ConstraintOccurrence" resolve="ConstraintOccurrence" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbS" id="8aYibn9a3d" role="3clF47">
-          <node concept="3clFbF" id="8aYibnaiMP" role="3cqZAp">
-            <node concept="3eOSWO" id="8aYibn9E3u" role="3clFbG">
-              <node concept="2OqwBi" id="8aYibn9AeM" role="3uHU7B">
-                <node concept="Xjq3P" id="8aYibn9_MJ" role="2Oq$k0" />
-                <node concept="liA8E" id="8aYibn9B8Z" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~HashMap.size()" resolve="size" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="8aYibn9DtA" role="3uHU7w">
-                <ref role="3cqZAo" node="8aYibn9whq" resolve="maxSize" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="8aYibnaqXI" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="3HP615" id="1imVejVxYQd">
     <property role="TrG5h" value="TemplateApplicationFilter" />
     <node concept="2tJIrI" id="1imVejVyer2" role="jymVt" />