From 2425fe933a4ec5dd6d07188a0337ddc5e961f968 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 30 Jun 2021 18:25:03 +0200
Subject: [PATCH] Ensure dependency is tracked for nested expand macro
 applications

Expand macro passes the rule's input to nested macro calls.
This adds the macro input as the dependency of the rule's input.
As a result, incremental processing starts working in some cases.
---
 .../generator/template/main@generator.mps     | 1213 ++++++-----------
 .../jetbrains.mps.lang.coderules.program.mps  |  159 ++-
 .../jetbrains.mps.lang.coderules.template.mps |   69 +
 3 files changed, 634 insertions(+), 807 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 3b28131b..4aee2188 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -5121,6 +5121,11 @@
       <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
       <ref role="2rTdP9" to="wq2x:5itBwM56wgT" resolve="MacroTemplate" />
     </node>
+    <node concept="2rT7sh" id="C1f6iElasQ" role="2rTMjI">
+      <property role="TrG5h" value="macro_token_method" />
+      <ref role="2rTdP9" to="wq2x:5itBwM56wgT" resolve="MacroTemplate" />
+      <ref role="2rZz_L" to="tpee:6LFqxSRBTg8" resolve="MethodDeclaration" />
+    </node>
     <node concept="2rT7sh" id="6EY0p2x1Uxb" role="2rTMjI">
       <property role="TrG5h" value="macro_inputNode_field" />
       <ref role="2rZz_L" to="tpee:fz12cDC" resolve="FieldDeclaration" />
@@ -10129,80 +10134,220 @@
     <node concept="3aamgX" id="5itBwMbdiJc" role="3aUrZf">
       <property role="36QftV" value="true" />
       <ref role="30HIoZ" to="wq2x:5itBwM7GBv1" resolve="ExpandMacroConstraint" />
-      <node concept="14YyZ8" id="At0yqMbR7z" role="1lVwrX">
-        <node concept="14ZrTv" id="At0yqMbR7D" role="14ZwWg">
-          <node concept="30G5F_" id="At0yqMbR7E" role="150hEN">
-            <node concept="3clFbS" id="At0yqMbR7F" role="2VODD2">
-              <node concept="3clFbF" id="2LxIQemW5gA" role="3cqZAp">
-                <node concept="2OqwBi" id="2LxIQemW6wY" role="3clFbG">
-                  <node concept="2OqwBi" id="2LxIQemW60M" role="2Oq$k0">
-                    <node concept="2OqwBi" id="2LxIQemW5wm" role="2Oq$k0">
-                      <node concept="30H73N" id="2LxIQemW5g_" role="2Oq$k0" />
-                      <node concept="2Xjw5R" id="2LxIQemW5HE" role="2OqNvi">
-                        <node concept="1xMEDy" id="2LxIQemW5HG" role="1xVPHs">
-                          <node concept="chp4Y" id="2LxIQemW5Kv" role="ri$Ld">
-                            <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+      <node concept="1Koe21" id="C1f6iElqzm" role="1lVwrX">
+        <node concept="3clFb_" id="5itBwMbdiJe" role="1Koe22">
+          <property role="TrG5h" value="method" />
+          <node concept="37vLTG" id="5itBwMbdiJf" role="3clF46">
+            <property role="TrG5h" value="session" />
+            <node concept="3uibUv" id="5itBwMbdiJg" role="1tU5fm">
+              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+            </node>
+          </node>
+          <node concept="3cqZAl" id="5itBwMbdiJh" role="3clF45" />
+          <node concept="3Tm1VV" id="5itBwMbdiJi" role="1B3o_S" />
+          <node concept="3clFbS" id="5itBwMbdiJj" role="3clF47">
+            <node concept="3cpWs8" id="5itBwMbdiJk" role="3cqZAp">
+              <node concept="3cpWsn" id="5itBwMbdiJl" role="3cpWs9">
+                <property role="TrG5h" value="builder" />
+                <node concept="3uibUv" id="5itBwMbdiJm" role="1tU5fm">
+                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                </node>
+                <node concept="2ShNRf" id="5itBwMbdiJn" role="33vP2m">
+                  <node concept="1pGfFk" id="5itBwMbdiJo" role="2ShVmc">
+                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <node concept="10Nm6u" id="5itBwMbdiJp" role="37wK5m" />
+                    <node concept="Xl_RD" id="5itBwMbdiJq" role="37wK5m">
+                      <property role="Xl_RC" value="" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3J1_TO" id="2TBKto$1gXQ" role="3cqZAp">
+              <node concept="3clFbS" id="2TBKto$1gXS" role="1zxBo7">
+                <node concept="3clFbF" id="5itBwMbdiJu" role="3cqZAp">
+                  <node concept="2OqwBi" id="5itBwMbdiJv" role="3clFbG">
+                    <node concept="37vLTw" id="5itBwMbdiJw" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5itBwMbdiJf" resolve="session" />
+                      <node concept="1sPUBX" id="5itBwMbdiJx" role="lGtFl">
+                        <ref role="v9R2y" node="1L74NXExmCW" resolve="session_variable" />
+                        <node concept="3NFfHV" id="5itBwMbdiJy" role="1sPUBK">
+                          <node concept="3clFbS" id="5itBwMbdiJz" role="2VODD2">
+                            <node concept="3clFbF" id="5itBwMbdiJ$" role="3cqZAp">
+                              <node concept="2OqwBi" id="5itBwMbdiJ_" role="3clFbG">
+                                <node concept="30H73N" id="5itBwMbdiJA" role="2Oq$k0" />
+                                <node concept="2Xjw5R" id="5itBwMbdiJB" role="2OqNvi">
+                                  <node concept="3gmYPX" id="5itBwMbdiJC" role="1xVPHs">
+                                    <node concept="3gn64h" id="5itBwMbdiJD" role="3gmYPZ">
+                                      <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
+                                    </node>
+                                    <node concept="3gn64h" id="5itBwMbdiJE" role="3gmYPZ">
+                                      <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3TrEf2" id="2LxIQemW6k4" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:36tQV5AmIsx" resolve="input" />
+                    <node concept="liA8E" id="5itBwMbdiJF" role="2OqNvi">
+                      <ref role="37wK5l" to="i348:7DvO2M9IiMh" resolve="putParameter" />
+                      <node concept="Xl_RD" id="5itBwMbdiJG" role="37wK5m">
+                        <node concept="17Uvod" id="5itBwMbdiJH" role="lGtFl">
+                          <property role="2qtEX9" value="value" />
+                          <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                          <node concept="3zFVjK" id="5itBwMbdiJI" role="3zH0cK">
+                            <node concept="3clFbS" id="5itBwMbdiJJ" role="2VODD2">
+                              <node concept="3clFbF" id="5itBwMbdiJK" role="3cqZAp">
+                                <node concept="2OqwBi" id="5itBwMbdiJL" role="3clFbG">
+                                  <node concept="2OqwBi" id="5itBwMbdiJM" role="2Oq$k0">
+                                    <node concept="30H73N" id="5itBwMbdiJN" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="5itBwMbdiJO" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:5itBwM7QPtQ" resolve="declaration" />
+                                    </node>
+                                  </node>
+                                  <node concept="2qgKlT" id="5itBwMbdiJP" role="2OqNvi">
+                                    <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="10Nm6u" id="5itBwMbdiJQ" role="37wK5m">
+                        <node concept="29HgVG" id="5itBwMbdiJR" role="lGtFl">
+                          <node concept="3NFfHV" id="5itBwMbdiJS" role="3NFExx">
+                            <node concept="3clFbS" id="5itBwMbdiJT" role="2VODD2">
+                              <node concept="3clFbF" id="5itBwMbdiJU" role="3cqZAp">
+                                <node concept="2OqwBi" id="5itBwMbdiJV" role="3clFbG">
+                                  <node concept="30H73N" id="5itBwMbdiJW" role="2Oq$k0" />
+                                  <node concept="3TrEf2" id="5itBwMbdiJX" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="wq2x:5itBwM7QPtO" resolve="argument" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
-                  <node concept="3x8VRR" id="2LxIQemW6EX" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1Koe21" id="At0yqMc638" role="150oIE">
-            <node concept="3clFb_" id="5itBwMbdiJe" role="1Koe22">
-              <property role="TrG5h" value="method" />
-              <node concept="37vLTG" id="5itBwMbdiJf" role="3clF46">
-                <property role="TrG5h" value="session" />
-                <node concept="3uibUv" id="5itBwMbdiJg" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-                </node>
-              </node>
-              <node concept="3cqZAl" id="5itBwMbdiJh" role="3clF45" />
-              <node concept="3Tm1VV" id="5itBwMbdiJi" role="1B3o_S" />
-              <node concept="3clFbS" id="5itBwMbdiJj" role="3clF47">
-                <node concept="3cpWs8" id="5itBwMbdiJk" role="3cqZAp">
-                  <node concept="3cpWsn" id="5itBwMbdiJl" role="3cpWs9">
-                    <property role="TrG5h" value="builder" />
-                    <node concept="3uibUv" id="5itBwMbdiJm" role="1tU5fm">
-                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                    </node>
-                    <node concept="2ShNRf" id="5itBwMbdiJn" role="33vP2m">
-                      <node concept="1pGfFk" id="5itBwMbdiJo" role="2ShVmc">
-                        <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
-                        <node concept="10Nm6u" id="5itBwMbdiJp" role="37wK5m" />
-                        <node concept="Xl_RD" id="5itBwMbdiJq" role="37wK5m">
-                          <property role="Xl_RC" value="" />
+                  <node concept="1WS0z7" id="5itBwMbdiJY" role="lGtFl">
+                    <node concept="3JmXsc" id="5itBwMbdiJZ" role="3Jn$fo">
+                      <node concept="3clFbS" id="5itBwMbdiK0" role="2VODD2">
+                        <node concept="3clFbF" id="5itBwMbdiK1" role="3cqZAp">
+                          <node concept="2OqwBi" id="5itBwMbdiK2" role="3clFbG">
+                            <node concept="2OqwBi" id="5itBwMbdiK3" role="2Oq$k0">
+                              <node concept="30H73N" id="5itBwMbdiK4" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="5itBwMbdiK5" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:5itBwM7QPB1" resolve="arglist" />
+                              </node>
+                            </node>
+                            <node concept="3Tsc0h" id="5itBwMbdiK6" role="2OqNvi">
+                              <ref role="3TtcxE" to="wq2x:5itBwM7QPw7" resolve="binding" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3J1_TO" id="2TBKto$1gXQ" role="3cqZAp">
-                  <node concept="3clFbS" id="2TBKto$1gXS" role="1zxBo7">
-                    <node concept="3clFbF" id="5itBwMbdiJu" role="3cqZAp">
-                      <node concept="2OqwBi" id="5itBwMbdiJv" role="3clFbG">
-                        <node concept="37vLTw" id="5itBwMbdiJw" role="2Oq$k0">
+                <node concept="3clFbF" id="5itBwMbdiK7" role="3cqZAp">
+                  <node concept="2OqwBi" id="5itBwMbdiK8" role="3clFbG">
+                    <node concept="37vLTw" id="5itBwMbdiK9" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5itBwMbdiJl" resolve="builder" />
+                      <node concept="1sPUBX" id="5itBwMbdiKa" role="lGtFl">
+                        <ref role="v9R2y" node="1L74NXE_$78" resolve="builder_variable" />
+                        <node concept="3NFfHV" id="5itBwMbdiKb" role="1sPUBK">
+                          <node concept="3clFbS" id="5itBwMbdiKc" role="2VODD2">
+                            <node concept="3clFbF" id="5itBwMbdiKd" role="3cqZAp">
+                              <node concept="2OqwBi" id="5itBwMbdiKe" role="3clFbG">
+                                <node concept="30H73N" id="5itBwMbdiKf" role="2Oq$k0" />
+                                <node concept="2Xjw5R" id="5itBwMbdiKg" role="2OqNvi">
+                                  <node concept="3gmYPX" id="5itBwMbdiKh" role="1xVPHs">
+                                    <node concept="3gn64h" id="5itBwMbdiKi" role="3gmYPZ">
+                                      <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
+                                    </node>
+                                    <node concept="3gn64h" id="5itBwMbdiKj" role="3gmYPZ">
+                                      <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="5itBwMbdiKk" role="2OqNvi">
+                      <ref role="37wK5l" to="i348:2_NfR5wo4nJ" resolve="merge" />
+                      <node concept="3cmrfG" id="4p2fwwrRSwL" role="37wK5m">
+                        <property role="3cmrfH" value="0" />
+                        <node concept="17Uvod" id="4p2fwwrT2Pl" role="lGtFl">
+                          <property role="2qtEX9" value="value" />
+                          <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
+                          <node concept="3zFVjK" id="4p2fwwrT2Pm" role="3zH0cK">
+                            <node concept="3clFbS" id="4p2fwwrT2Pn" role="2VODD2">
+                              <node concept="3cpWs8" id="4p2fwwrWky1" role="3cqZAp">
+                                <node concept="3cpWsn" id="4p2fwwrWky2" role="3cpWs9">
+                                  <property role="TrG5h" value="i" />
+                                  <node concept="10Oyi0" id="4p2fwwrWky3" role="1tU5fm" />
+                                  <node concept="2OqwBi" id="4p2fwwrWky4" role="33vP2m">
+                                    <node concept="2OqwBi" id="4p2fwwrWky5" role="2Oq$k0">
+                                      <node concept="30H73N" id="4p2fwwrWky6" role="2Oq$k0" />
+                                      <node concept="2Xjw5R" id="4p2fwwrWky7" role="2OqNvi">
+                                        <node concept="1xMEDy" id="4p2fwwrWky8" role="1xVPHs">
+                                          <node concept="chp4Y" id="4p2fwwrWky9" role="ri$Ld">
+                                            <ref role="cht4Q" to="wq2x:6E2cNiboHlA" resolve="BodyBlock" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="2bSWHS" id="4p2fwwrWkya" role="2OqNvi" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbF" id="4p2fwwrWkyb" role="3cqZAp">
+                                <node concept="3K4zz7" id="4p2fwwrWkyc" role="3clFbG">
+                                  <node concept="37vLTw" id="4p2fwwrWkyd" role="3K4E3e">
+                                    <ref role="3cqZAo" node="4p2fwwrWky2" resolve="i" />
+                                  </node>
+                                  <node concept="3cmrfG" id="4p2fwwrWkye" role="3K4GZi">
+                                    <property role="3cmrfH" value="0" />
+                                  </node>
+                                  <node concept="2d3UOw" id="4p2fwwrWkyf" role="3K4Cdx">
+                                    <node concept="3cmrfG" id="4p2fwwrWkyg" role="3uHU7w">
+                                      <property role="3cmrfH" value="0" />
+                                    </node>
+                                    <node concept="37vLTw" id="4p2fwwrWkyh" role="3uHU7B">
+                                      <ref role="3cqZAo" node="4p2fwwrWky2" resolve="i" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="5itBwMbdiKl" role="37wK5m">
+                        <node concept="37vLTw" id="5itBwMbdiKm" role="2Oq$k0">
                           <ref role="3cqZAo" node="5itBwMbdiJf" resolve="session" />
-                          <node concept="1sPUBX" id="5itBwMbdiJx" role="lGtFl">
+                          <node concept="1sPUBX" id="5itBwMbdiKn" role="lGtFl">
                             <ref role="v9R2y" node="1L74NXExmCW" resolve="session_variable" />
-                            <node concept="3NFfHV" id="5itBwMbdiJy" role="1sPUBK">
-                              <node concept="3clFbS" id="5itBwMbdiJz" role="2VODD2">
-                                <node concept="3clFbF" id="5itBwMbdiJ$" role="3cqZAp">
-                                  <node concept="2OqwBi" id="5itBwMbdiJ_" role="3clFbG">
-                                    <node concept="30H73N" id="5itBwMbdiJA" role="2Oq$k0" />
-                                    <node concept="2Xjw5R" id="5itBwMbdiJB" role="2OqNvi">
-                                      <node concept="3gmYPX" id="5itBwMbdiJC" role="1xVPHs">
-                                        <node concept="3gn64h" id="5itBwMbdiJD" role="3gmYPZ">
+                            <node concept="3NFfHV" id="5itBwMbdiKo" role="1sPUBK">
+                              <node concept="3clFbS" id="5itBwMbdiKp" role="2VODD2">
+                                <node concept="3clFbF" id="5itBwMbdiKq" role="3cqZAp">
+                                  <node concept="2OqwBi" id="5itBwMbdiKr" role="3clFbG">
+                                    <node concept="30H73N" id="5itBwMbdiKs" role="2Oq$k0" />
+                                    <node concept="2Xjw5R" id="5itBwMbdiKt" role="2OqNvi">
+                                      <node concept="3gmYPX" id="5itBwMbdiKu" role="1xVPHs">
+                                        <node concept="3gn64h" id="5itBwMbdiKv" role="3gmYPZ">
                                           <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
                                         </node>
-                                        <node concept="3gn64h" id="5itBwMbdiJE" role="3gmYPZ">
+                                        <node concept="3gn64h" id="5itBwMbdiKw" role="3gmYPZ">
                                           <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                                         </node>
                                       </node>
@@ -10213,24 +10358,22 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="liA8E" id="5itBwMbdiJF" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:7DvO2M9IiMh" resolve="putParameter" />
-                          <node concept="Xl_RD" id="5itBwMbdiJG" role="37wK5m">
-                            <node concept="17Uvod" id="5itBwMbdiJH" role="lGtFl">
-                              <property role="2qtEX9" value="value" />
-                              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                              <node concept="3zFVjK" id="5itBwMbdiJI" role="3zH0cK">
-                                <node concept="3clFbS" id="5itBwMbdiJJ" role="2VODD2">
-                                  <node concept="3clFbF" id="5itBwMbdiJK" role="3cqZAp">
-                                    <node concept="2OqwBi" id="5itBwMbdiJL" role="3clFbG">
-                                      <node concept="2OqwBi" id="5itBwMbdiJM" role="2Oq$k0">
-                                        <node concept="30H73N" id="5itBwMbdiJN" role="2Oq$k0" />
-                                        <node concept="3TrEf2" id="5itBwMbdiJO" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="wq2x:5itBwM7QPtQ" resolve="declaration" />
-                                        </node>
-                                      </node>
-                                      <node concept="2qgKlT" id="5itBwMbdiJP" role="2OqNvi">
-                                        <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+                        <node concept="liA8E" id="5itBwMbdiKx" role="2OqNvi">
+                          <ref role="37wK5l" to="i348:5itBwM7VpML" resolve="expandMacro" />
+                          <node concept="10Nm6u" id="At0yqMchOa" role="37wK5m">
+                            <node concept="1sPUBX" id="At0yqMcjWx" role="lGtFl">
+                              <ref role="v9R2y" node="2LxIQen0ctm" resolve="implicit_rule_input_reference" />
+                            </node>
+                          </node>
+                          <node concept="10Nm6u" id="5itBwMbdiKy" role="37wK5m">
+                            <node concept="29HgVG" id="5itBwMbdiKz" role="lGtFl">
+                              <node concept="3NFfHV" id="5itBwMbdiK$" role="3NFExx">
+                                <node concept="3clFbS" id="5itBwMbdiK_" role="2VODD2">
+                                  <node concept="3clFbF" id="5itBwMbdiKA" role="3cqZAp">
+                                    <node concept="2OqwBi" id="5itBwMbdiKB" role="3clFbG">
+                                      <node concept="30H73N" id="5itBwMbdiKC" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="5itBwMbdiKD" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:5itBwM7GBKT" resolve="input" />
                                       </node>
                                     </node>
                                   </node>
@@ -10238,304 +10381,38 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="10Nm6u" id="5itBwMbdiJQ" role="37wK5m">
-                            <node concept="29HgVG" id="5itBwMbdiJR" role="lGtFl">
-                              <node concept="3NFfHV" id="5itBwMbdiJS" role="3NFExx">
-                                <node concept="3clFbS" id="5itBwMbdiJT" role="2VODD2">
-                                  <node concept="3clFbF" id="5itBwMbdiJU" role="3cqZAp">
-                                    <node concept="2OqwBi" id="5itBwMbdiJV" role="3clFbG">
-                                      <node concept="30H73N" id="5itBwMbdiJW" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="5itBwMbdiJX" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="wq2x:5itBwM7QPtO" resolve="argument" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1WS0z7" id="5itBwMbdiJY" role="lGtFl">
-                        <node concept="3JmXsc" id="5itBwMbdiJZ" role="3Jn$fo">
-                          <node concept="3clFbS" id="5itBwMbdiK0" role="2VODD2">
-                            <node concept="3clFbF" id="5itBwMbdiK1" role="3cqZAp">
-                              <node concept="2OqwBi" id="5itBwMbdiK2" role="3clFbG">
-                                <node concept="2OqwBi" id="5itBwMbdiK3" role="2Oq$k0">
-                                  <node concept="30H73N" id="5itBwMbdiK4" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="5itBwMbdiK5" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:5itBwM7QPB1" resolve="arglist" />
-                                  </node>
-                                </node>
-                                <node concept="3Tsc0h" id="5itBwMbdiK6" role="2OqNvi">
-                                  <ref role="3TtcxE" to="wq2x:5itBwM7QPw7" resolve="binding" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="5itBwMbdiK7" role="3cqZAp">
-                      <node concept="2OqwBi" id="5itBwMbdiK8" role="3clFbG">
-                        <node concept="37vLTw" id="5itBwMbdiK9" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5itBwMbdiJl" resolve="builder" />
-                          <node concept="1sPUBX" id="5itBwMbdiKa" role="lGtFl">
-                            <ref role="v9R2y" node="1L74NXE_$78" resolve="builder_variable" />
-                            <node concept="3NFfHV" id="5itBwMbdiKb" role="1sPUBK">
-                              <node concept="3clFbS" id="5itBwMbdiKc" role="2VODD2">
-                                <node concept="3clFbF" id="5itBwMbdiKd" role="3cqZAp">
-                                  <node concept="2OqwBi" id="5itBwMbdiKe" role="3clFbG">
-                                    <node concept="30H73N" id="5itBwMbdiKf" role="2Oq$k0" />
-                                    <node concept="2Xjw5R" id="5itBwMbdiKg" role="2OqNvi">
-                                      <node concept="3gmYPX" id="5itBwMbdiKh" role="1xVPHs">
-                                        <node concept="3gn64h" id="5itBwMbdiKi" role="3gmYPZ">
-                                          <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                        </node>
-                                        <node concept="3gn64h" id="5itBwMbdiKj" role="3gmYPZ">
-                                          <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="5itBwMbdiKk" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:2_NfR5wo4nJ" resolve="merge" />
-                          <node concept="3cmrfG" id="4p2fwwrRSwL" role="37wK5m">
-                            <property role="3cmrfH" value="0" />
-                            <node concept="17Uvod" id="4p2fwwrT2Pl" role="lGtFl">
-                              <property role="2qtEX9" value="value" />
-                              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
-                              <node concept="3zFVjK" id="4p2fwwrT2Pm" role="3zH0cK">
-                                <node concept="3clFbS" id="4p2fwwrT2Pn" role="2VODD2">
-                                  <node concept="3cpWs8" id="4p2fwwrWky1" role="3cqZAp">
-                                    <node concept="3cpWsn" id="4p2fwwrWky2" role="3cpWs9">
-                                      <property role="TrG5h" value="i" />
-                                      <node concept="10Oyi0" id="4p2fwwrWky3" role="1tU5fm" />
-                                      <node concept="2OqwBi" id="4p2fwwrWky4" role="33vP2m">
-                                        <node concept="2OqwBi" id="4p2fwwrWky5" role="2Oq$k0">
-                                          <node concept="30H73N" id="4p2fwwrWky6" role="2Oq$k0" />
-                                          <node concept="2Xjw5R" id="4p2fwwrWky7" role="2OqNvi">
-                                            <node concept="1xMEDy" id="4p2fwwrWky8" role="1xVPHs">
-                                              <node concept="chp4Y" id="4p2fwwrWky9" role="ri$Ld">
-                                                <ref role="cht4Q" to="wq2x:6E2cNiboHlA" resolve="BodyBlock" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                        <node concept="2bSWHS" id="4p2fwwrWkya" role="2OqNvi" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3clFbF" id="4p2fwwrWkyb" role="3cqZAp">
-                                    <node concept="3K4zz7" id="4p2fwwrWkyc" role="3clFbG">
-                                      <node concept="37vLTw" id="4p2fwwrWkyd" role="3K4E3e">
-                                        <ref role="3cqZAo" node="4p2fwwrWky2" resolve="i" />
-                                      </node>
-                                      <node concept="3cmrfG" id="4p2fwwrWkye" role="3K4GZi">
-                                        <property role="3cmrfH" value="0" />
-                                      </node>
-                                      <node concept="2d3UOw" id="4p2fwwrWkyf" role="3K4Cdx">
-                                        <node concept="3cmrfG" id="4p2fwwrWkyg" role="3uHU7w">
-                                          <property role="3cmrfH" value="0" />
-                                        </node>
-                                        <node concept="37vLTw" id="4p2fwwrWkyh" role="3uHU7B">
-                                          <ref role="3cqZAo" node="4p2fwwrWky2" resolve="i" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="5itBwMbdiKl" role="37wK5m">
-                            <node concept="37vLTw" id="5itBwMbdiKm" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5itBwMbdiJf" resolve="session" />
-                              <node concept="1sPUBX" id="5itBwMbdiKn" role="lGtFl">
-                                <ref role="v9R2y" node="1L74NXExmCW" resolve="session_variable" />
-                                <node concept="3NFfHV" id="5itBwMbdiKo" role="1sPUBK">
-                                  <node concept="3clFbS" id="5itBwMbdiKp" role="2VODD2">
-                                    <node concept="3clFbF" id="5itBwMbdiKq" role="3cqZAp">
-                                      <node concept="2OqwBi" id="5itBwMbdiKr" role="3clFbG">
-                                        <node concept="30H73N" id="5itBwMbdiKs" role="2Oq$k0" />
-                                        <node concept="2Xjw5R" id="5itBwMbdiKt" role="2OqNvi">
-                                          <node concept="3gmYPX" id="5itBwMbdiKu" role="1xVPHs">
-                                            <node concept="3gn64h" id="5itBwMbdiKv" role="3gmYPZ">
-                                              <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                            </node>
-                                            <node concept="3gn64h" id="5itBwMbdiKw" role="3gmYPZ">
-                                              <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="5itBwMbdiKx" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:5itBwM7VpML" resolve="expandMacro" />
-                              <node concept="10Nm6u" id="At0yqMchOa" role="37wK5m">
-                                <node concept="1sPUBX" id="At0yqMcjWx" role="lGtFl">
-                                  <ref role="v9R2y" node="2LxIQen0ctm" resolve="implicit_rule_input_reference" />
-                                </node>
-                              </node>
-                              <node concept="10Nm6u" id="5itBwMbdiKy" role="37wK5m">
-                                <node concept="29HgVG" id="5itBwMbdiKz" role="lGtFl">
-                                  <node concept="3NFfHV" id="5itBwMbdiK$" role="3NFExx">
-                                    <node concept="3clFbS" id="5itBwMbdiK_" role="2VODD2">
-                                      <node concept="3clFbF" id="5itBwMbdiKA" role="3cqZAp">
-                                        <node concept="2OqwBi" id="5itBwMbdiKB" role="3clFbG">
-                                          <node concept="30H73N" id="5itBwMbdiKC" role="2Oq$k0" />
-                                          <node concept="3TrEf2" id="5itBwMbdiKD" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="wq2x:5itBwM7GBKT" resolve="input" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="2YIFZM" id="5itBwMbdiKE" role="37wK5m">
-                                <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
-                                <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
-                                <node concept="Xl_RD" id="5itBwMbdiKF" role="37wK5m">
-                                  <property role="Xl_RC" value="" />
-                                  <node concept="17Uvod" id="5itBwMbdiKG" role="lGtFl">
-                                    <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                                    <property role="2qtEX9" value="value" />
-                                    <node concept="3zFVjK" id="5itBwMbdiKH" role="3zH0cK">
-                                      <node concept="3clFbS" id="5itBwMbdiKI" role="2VODD2">
-                                        <node concept="3clFbF" id="5itBwMbdiKJ" role="3cqZAp">
-                                          <node concept="2OqwBi" id="5itBwMbdiKK" role="3clFbG">
-                                            <node concept="2OqwBi" id="5itBwMbdiKL" role="2Oq$k0">
-                                              <node concept="liA8E" id="5itBwMbdiKM" role="2OqNvi">
-                                                <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                                              </node>
-                                              <node concept="2JrnkZ" id="5itBwMbdiKN" role="2Oq$k0">
-                                                <node concept="2OqwBi" id="5itBwMbdiKO" role="2JrQYb">
-                                                  <node concept="1iwH7S" id="5itBwMbdiKP" role="2Oq$k0" />
-                                                  <node concept="12$id9" id="5itBwMbdiKQ" role="2OqNvi">
-                                                    <node concept="2OqwBi" id="5itBwMbdiKR" role="12$y8L">
-                                                      <node concept="30H73N" id="5itBwMbdiKS" role="2Oq$k0" />
-                                                      <node concept="3TrEf2" id="5itBwMbdiKT" role="2OqNvi">
-                                                        <ref role="3Tt5mk" to="wq2x:5itBwM7GBLp" resolve="template" />
-                                                      </node>
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                              </node>
-                                            </node>
-                                            <node concept="liA8E" id="5itBwMbdiKU" role="2OqNvi">
-                                              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="1bVj0M" id="5itBwMbdiKV" role="37wK5m">
-                                <node concept="3clFbS" id="5itBwMbdiKW" role="1bW5cS">
-                                  <node concept="3clFbF" id="5itBwMbdiKX" role="3cqZAp">
-                                    <node concept="2OqwBi" id="5itBwMbdiKY" role="3clFbG">
-                                      <node concept="2OqwBi" id="5itBwMbdiKZ" role="2Oq$k0">
-                                        <node concept="37vLTw" id="5itBwMbdiL0" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="5itBwMbdiLb" resolve="tok" />
-                                        </node>
-                                        <node concept="liA8E" id="5itBwMbdiL1" role="2OqNvi">
-                                          <ref role="37wK5l" to="i348:5itBwM86qUR" resolve="withLogical" />
-                                          <node concept="10Nm6u" id="5itBwMbdiL2" role="37wK5m">
-                                            <node concept="2b32R4" id="5itBwMbdiL3" role="lGtFl">
-                                              <node concept="3JmXsc" id="5itBwMbdiL4" role="2P8S$">
-                                                <node concept="3clFbS" id="5itBwMbdiL5" role="2VODD2">
-                                                  <node concept="3clFbF" id="5itBwMbdiL6" role="3cqZAp">
-                                                    <node concept="2OqwBi" id="5itBwMbdiL7" role="3clFbG">
-                                                      <node concept="30H73N" id="5itBwMbdiL8" role="2Oq$k0" />
-                                                      <node concept="3Tsc0h" id="5itBwMbdiL9" role="2OqNvi">
-                                                        <ref role="3TtcxE" to="wq2x:5itBwM7GBKR" resolve="logical" />
-                                                      </node>
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="liA8E" id="5itBwMbdiLa" role="2OqNvi">
-                                        <ref role="37wK5l" to="i348:5itBwM7bY2d" resolve="apply" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="37vLTG" id="5itBwMbdiLb" role="1bW2Oz">
-                                  <property role="TrG5h" value="tok" />
-                                  <node concept="3uibUv" id="5itBwMbdiLc" role="1tU5fm">
-                                    <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="1wplmZ" id="2TBKto$1hlF" role="1zxBo6">
-                    <node concept="3clFbS" id="2TBKto$1hlG" role="1wplMD">
-                      <node concept="3clFbF" id="5itBwMbdiLf" role="3cqZAp">
-                        <node concept="2OqwBi" id="5itBwMbdiLg" role="3clFbG">
-                          <node concept="37vLTw" id="5itBwMbdiLh" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5itBwMbdiJf" resolve="session" />
-                            <node concept="1sPUBX" id="5itBwMbdiLi" role="lGtFl">
-                              <ref role="v9R2y" node="1L74NXExmCW" resolve="session_variable" />
-                              <node concept="3NFfHV" id="5itBwMbdiLj" role="1sPUBK">
-                                <node concept="3clFbS" id="5itBwMbdiLk" role="2VODD2">
-                                  <node concept="3clFbF" id="5itBwMbdiLl" role="3cqZAp">
-                                    <node concept="2OqwBi" id="5itBwMbdiLm" role="3clFbG">
-                                      <node concept="30H73N" id="5itBwMbdiLn" role="2Oq$k0" />
-                                      <node concept="2Xjw5R" id="5itBwMbdiLo" role="2OqNvi">
-                                        <node concept="3gmYPX" id="5itBwMbdiLp" role="1xVPHs">
-                                          <node concept="3gn64h" id="5itBwMbdiLq" role="3gmYPZ">
-                                            <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                          </node>
-                                          <node concept="3gn64h" id="5itBwMbdiLr" role="3gmYPZ">
-                                            <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="5itBwMbdiLs" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:7DvO2M9IiMQ" resolve="removeParameter" />
-                            <node concept="Xl_RD" id="5itBwMbdiLt" role="37wK5m">
-                              <node concept="17Uvod" id="5itBwMbdiLu" role="lGtFl">
-                                <property role="2qtEX9" value="value" />
+                          <node concept="2YIFZM" id="5itBwMbdiKE" role="37wK5m">
+                            <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
+                            <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
+                            <node concept="Xl_RD" id="5itBwMbdiKF" role="37wK5m">
+                              <property role="Xl_RC" value="" />
+                              <node concept="17Uvod" id="5itBwMbdiKG" role="lGtFl">
                                 <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                                <node concept="3zFVjK" id="5itBwMbdiLv" role="3zH0cK">
-                                  <node concept="3clFbS" id="5itBwMbdiLw" role="2VODD2">
-                                    <node concept="3clFbF" id="5itBwMbdiLx" role="3cqZAp">
-                                      <node concept="2OqwBi" id="5itBwMbdiLy" role="3clFbG">
-                                        <node concept="2OqwBi" id="5itBwMbdiLz" role="2Oq$k0">
-                                          <node concept="30H73N" id="5itBwMbdiL$" role="2Oq$k0" />
-                                          <node concept="3TrEf2" id="5itBwMbdiL_" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="wq2x:5itBwM7QPtQ" resolve="declaration" />
+                                <property role="2qtEX9" value="value" />
+                                <node concept="3zFVjK" id="5itBwMbdiKH" role="3zH0cK">
+                                  <node concept="3clFbS" id="5itBwMbdiKI" role="2VODD2">
+                                    <node concept="3clFbF" id="5itBwMbdiKJ" role="3cqZAp">
+                                      <node concept="2OqwBi" id="5itBwMbdiKK" role="3clFbG">
+                                        <node concept="2OqwBi" id="5itBwMbdiKL" role="2Oq$k0">
+                                          <node concept="liA8E" id="5itBwMbdiKM" role="2OqNvi">
+                                            <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
+                                          </node>
+                                          <node concept="2JrnkZ" id="5itBwMbdiKN" role="2Oq$k0">
+                                            <node concept="2OqwBi" id="5itBwMbdiKO" role="2JrQYb">
+                                              <node concept="1iwH7S" id="5itBwMbdiKP" role="2Oq$k0" />
+                                              <node concept="12$id9" id="5itBwMbdiKQ" role="2OqNvi">
+                                                <node concept="2OqwBi" id="5itBwMbdiKR" role="12$y8L">
+                                                  <node concept="30H73N" id="5itBwMbdiKS" role="2Oq$k0" />
+                                                  <node concept="3TrEf2" id="5itBwMbdiKT" role="2OqNvi">
+                                                    <ref role="3Tt5mk" to="wq2x:5itBwM7GBLp" resolve="template" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
                                           </node>
                                         </node>
-                                        <node concept="2qgKlT" id="5itBwMbdiLA" role="2OqNvi">
-                                          <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+                                        <node concept="liA8E" id="5itBwMbdiKU" role="2OqNvi">
+                                          <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                                         </node>
                                       </node>
                                     </node>
@@ -10544,83 +10421,72 @@
                               </node>
                             </node>
                           </node>
-                        </node>
-                        <node concept="1WS0z7" id="5itBwMbdiLB" role="lGtFl">
-                          <node concept="3JmXsc" id="5itBwMbdiLC" role="3Jn$fo">
-                            <node concept="3clFbS" id="5itBwMbdiLD" role="2VODD2">
-                              <node concept="3clFbF" id="5itBwMbdiLE" role="3cqZAp">
-                                <node concept="2OqwBi" id="5itBwMbdiLF" role="3clFbG">
-                                  <node concept="2OqwBi" id="5itBwMbdiLG" role="2Oq$k0">
-                                    <node concept="30H73N" id="5itBwMbdiLH" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="5itBwMbdiLI" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:5itBwM7QPB1" resolve="arglist" />
+                          <node concept="1bVj0M" id="5itBwMbdiKV" role="37wK5m">
+                            <node concept="3clFbS" id="5itBwMbdiKW" role="1bW5cS">
+                              <node concept="3clFbF" id="5itBwMbdiKX" role="3cqZAp">
+                                <node concept="2OqwBi" id="5itBwMbdiKY" role="3clFbG">
+                                  <node concept="2OqwBi" id="5itBwMbdiKZ" role="2Oq$k0">
+                                    <node concept="37vLTw" id="5itBwMbdiL0" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="5itBwMbdiLb" resolve="tok" />
+                                    </node>
+                                    <node concept="liA8E" id="5itBwMbdiL1" role="2OqNvi">
+                                      <ref role="37wK5l" to="i348:5itBwM86qUR" resolve="withLogical" />
+                                      <node concept="10Nm6u" id="5itBwMbdiL2" role="37wK5m">
+                                        <node concept="2b32R4" id="5itBwMbdiL3" role="lGtFl">
+                                          <node concept="3JmXsc" id="5itBwMbdiL4" role="2P8S$">
+                                            <node concept="3clFbS" id="5itBwMbdiL5" role="2VODD2">
+                                              <node concept="3clFbF" id="5itBwMbdiL6" role="3cqZAp">
+                                                <node concept="2OqwBi" id="5itBwMbdiL7" role="3clFbG">
+                                                  <node concept="30H73N" id="5itBwMbdiL8" role="2Oq$k0" />
+                                                  <node concept="3Tsc0h" id="5itBwMbdiL9" role="2OqNvi">
+                                                    <ref role="3TtcxE" to="wq2x:5itBwM7GBKR" resolve="logical" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
                                     </node>
                                   </node>
-                                  <node concept="3Tsc0h" id="5itBwMbdiLJ" role="2OqNvi">
-                                    <ref role="3TtcxE" to="wq2x:5itBwM7QPw7" resolve="binding" />
+                                  <node concept="liA8E" id="5itBwMbdiLa" role="2OqNvi">
+                                    <ref role="37wK5l" to="i348:5itBwM7bY2d" resolve="apply" />
                                   </node>
                                 </node>
                               </node>
                             </node>
+                            <node concept="37vLTG" id="5itBwMbdiLb" role="1bW2Oz">
+                              <property role="TrG5h" value="tok" />
+                              <node concept="3uibUv" id="5itBwMbdiLc" role="1tU5fm">
+                                <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="raruj" id="2TBKto$1hCP" role="lGtFl" />
                 </node>
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1Koe21" id="At0yqMcbC8" role="14YRTM">
-          <node concept="3clFb_" id="At0yqMbV4r" role="1Koe22">
-            <property role="TrG5h" value="method" />
-            <node concept="37vLTG" id="At0yqMbV4s" role="3clF46">
-              <property role="TrG5h" value="session" />
-              <node concept="3uibUv" id="At0yqMbV4t" role="1tU5fm">
-                <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-              </node>
-            </node>
-            <node concept="3cqZAl" id="At0yqMbV4u" role="3clF45" />
-            <node concept="3Tm1VV" id="At0yqMbV4v" role="1B3o_S" />
-            <node concept="3clFbS" id="At0yqMbV4w" role="3clF47">
-              <node concept="3cpWs8" id="At0yqMbV4x" role="3cqZAp">
-                <node concept="3cpWsn" id="At0yqMbV4y" role="3cpWs9">
-                  <property role="TrG5h" value="builder" />
-                  <node concept="3uibUv" id="At0yqMbV4z" role="1tU5fm">
-                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                  </node>
-                  <node concept="2ShNRf" id="At0yqMbV4$" role="33vP2m">
-                    <node concept="1pGfFk" id="At0yqMbV4_" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
-                      <node concept="10Nm6u" id="At0yqMbV4A" role="37wK5m" />
-                      <node concept="Xl_RD" id="At0yqMbV4B" role="37wK5m">
-                        <property role="Xl_RC" value="" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3J1_TO" id="At0yqMbV4C" role="3cqZAp">
-                <node concept="3clFbS" id="At0yqMbV4D" role="1zxBo7">
-                  <node concept="3clFbF" id="At0yqMbV4E" role="3cqZAp">
-                    <node concept="2OqwBi" id="At0yqMbV4F" role="3clFbG">
-                      <node concept="37vLTw" id="At0yqMbV4G" role="2Oq$k0">
-                        <ref role="3cqZAo" node="At0yqMbV4s" resolve="session" />
-                        <node concept="1sPUBX" id="At0yqMbV4H" role="lGtFl">
+              <node concept="1wplmZ" id="2TBKto$1hlF" role="1zxBo6">
+                <node concept="3clFbS" id="2TBKto$1hlG" role="1wplMD">
+                  <node concept="3clFbF" id="5itBwMbdiLf" role="3cqZAp">
+                    <node concept="2OqwBi" id="5itBwMbdiLg" role="3clFbG">
+                      <node concept="37vLTw" id="5itBwMbdiLh" role="2Oq$k0">
+                        <ref role="3cqZAo" node="5itBwMbdiJf" resolve="session" />
+                        <node concept="1sPUBX" id="5itBwMbdiLi" role="lGtFl">
                           <ref role="v9R2y" node="1L74NXExmCW" resolve="session_variable" />
-                          <node concept="3NFfHV" id="At0yqMbV4I" role="1sPUBK">
-                            <node concept="3clFbS" id="At0yqMbV4J" role="2VODD2">
-                              <node concept="3clFbF" id="At0yqMbV4K" role="3cqZAp">
-                                <node concept="2OqwBi" id="At0yqMbV4L" role="3clFbG">
-                                  <node concept="30H73N" id="At0yqMbV4M" role="2Oq$k0" />
-                                  <node concept="2Xjw5R" id="At0yqMbV4N" role="2OqNvi">
-                                    <node concept="3gmYPX" id="At0yqMbV4O" role="1xVPHs">
-                                      <node concept="3gn64h" id="At0yqMbV4P" role="3gmYPZ">
+                          <node concept="3NFfHV" id="5itBwMbdiLj" role="1sPUBK">
+                            <node concept="3clFbS" id="5itBwMbdiLk" role="2VODD2">
+                              <node concept="3clFbF" id="5itBwMbdiLl" role="3cqZAp">
+                                <node concept="2OqwBi" id="5itBwMbdiLm" role="3clFbG">
+                                  <node concept="30H73N" id="5itBwMbdiLn" role="2Oq$k0" />
+                                  <node concept="2Xjw5R" id="5itBwMbdiLo" role="2OqNvi">
+                                    <node concept="3gmYPX" id="5itBwMbdiLp" role="1xVPHs">
+                                      <node concept="3gn64h" id="5itBwMbdiLq" role="3gmYPZ">
                                         <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
                                       </node>
-                                      <node concept="3gn64h" id="At0yqMbV4Q" role="3gmYPZ">
+                                      <node concept="3gn64h" id="5itBwMbdiLr" role="3gmYPZ">
                                         <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                                       </node>
                                     </node>
@@ -10631,23 +10497,23 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="At0yqMbV4R" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:7DvO2M9IiMh" resolve="putParameter" />
-                        <node concept="Xl_RD" id="At0yqMbV4S" role="37wK5m">
-                          <node concept="17Uvod" id="At0yqMbV4T" role="lGtFl">
+                      <node concept="liA8E" id="5itBwMbdiLs" role="2OqNvi">
+                        <ref role="37wK5l" to="i348:7DvO2M9IiMQ" resolve="removeParameter" />
+                        <node concept="Xl_RD" id="5itBwMbdiLt" role="37wK5m">
+                          <node concept="17Uvod" id="5itBwMbdiLu" role="lGtFl">
                             <property role="2qtEX9" value="value" />
                             <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                            <node concept="3zFVjK" id="At0yqMbV4U" role="3zH0cK">
-                              <node concept="3clFbS" id="At0yqMbV4V" role="2VODD2">
-                                <node concept="3clFbF" id="At0yqMbV4W" role="3cqZAp">
-                                  <node concept="2OqwBi" id="At0yqMbV4X" role="3clFbG">
-                                    <node concept="2OqwBi" id="At0yqMbV4Y" role="2Oq$k0">
-                                      <node concept="30H73N" id="At0yqMbV4Z" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="At0yqMbV50" role="2OqNvi">
+                            <node concept="3zFVjK" id="5itBwMbdiLv" role="3zH0cK">
+                              <node concept="3clFbS" id="5itBwMbdiLw" role="2VODD2">
+                                <node concept="3clFbF" id="5itBwMbdiLx" role="3cqZAp">
+                                  <node concept="2OqwBi" id="5itBwMbdiLy" role="3clFbG">
+                                    <node concept="2OqwBi" id="5itBwMbdiLz" role="2Oq$k0">
+                                      <node concept="30H73N" id="5itBwMbdiL$" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="5itBwMbdiL_" role="2OqNvi">
                                         <ref role="3Tt5mk" to="wq2x:5itBwM7QPtQ" resolve="declaration" />
                                       </node>
                                     </node>
-                                    <node concept="2qgKlT" id="At0yqMbV51" role="2OqNvi">
+                                    <node concept="2qgKlT" id="5itBwMbdiLA" role="2OqNvi">
                                       <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                                     </node>
                                   </node>
@@ -10656,36 +10522,20 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="10Nm6u" id="At0yqMbV52" role="37wK5m">
-                          <node concept="29HgVG" id="At0yqMbV53" role="lGtFl">
-                            <node concept="3NFfHV" id="At0yqMbV54" role="3NFExx">
-                              <node concept="3clFbS" id="At0yqMbV55" role="2VODD2">
-                                <node concept="3clFbF" id="At0yqMbV56" role="3cqZAp">
-                                  <node concept="2OqwBi" id="At0yqMbV57" role="3clFbG">
-                                    <node concept="30H73N" id="At0yqMbV58" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="At0yqMbV59" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:5itBwM7QPtO" resolve="argument" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
                       </node>
                     </node>
-                    <node concept="1WS0z7" id="At0yqMbV5a" role="lGtFl">
-                      <node concept="3JmXsc" id="At0yqMbV5b" role="3Jn$fo">
-                        <node concept="3clFbS" id="At0yqMbV5c" role="2VODD2">
-                          <node concept="3clFbF" id="At0yqMbV5d" role="3cqZAp">
-                            <node concept="2OqwBi" id="At0yqMbV5e" role="3clFbG">
-                              <node concept="2OqwBi" id="At0yqMbV5f" role="2Oq$k0">
-                                <node concept="30H73N" id="At0yqMbV5g" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="At0yqMbV5h" role="2OqNvi">
+                    <node concept="1WS0z7" id="5itBwMbdiLB" role="lGtFl">
+                      <node concept="3JmXsc" id="5itBwMbdiLC" role="3Jn$fo">
+                        <node concept="3clFbS" id="5itBwMbdiLD" role="2VODD2">
+                          <node concept="3clFbF" id="5itBwMbdiLE" role="3cqZAp">
+                            <node concept="2OqwBi" id="5itBwMbdiLF" role="3clFbG">
+                              <node concept="2OqwBi" id="5itBwMbdiLG" role="2Oq$k0">
+                                <node concept="30H73N" id="5itBwMbdiLH" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="5itBwMbdiLI" role="2OqNvi">
                                   <ref role="3Tt5mk" to="wq2x:5itBwM7QPB1" resolve="arglist" />
                                 </node>
                               </node>
-                              <node concept="3Tsc0h" id="At0yqMbV5i" role="2OqNvi">
+                              <node concept="3Tsc0h" id="5itBwMbdiLJ" role="2OqNvi">
                                 <ref role="3TtcxE" to="wq2x:5itBwM7QPw7" resolve="binding" />
                               </node>
                             </node>
@@ -10694,294 +10544,9 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbF" id="At0yqMbV5j" role="3cqZAp">
-                    <node concept="2OqwBi" id="At0yqMbV5k" role="3clFbG">
-                      <node concept="37vLTw" id="At0yqMbV5l" role="2Oq$k0">
-                        <ref role="3cqZAo" node="At0yqMbV4y" resolve="builder" />
-                        <node concept="1sPUBX" id="At0yqMbV5m" role="lGtFl">
-                          <ref role="v9R2y" node="1L74NXE_$78" resolve="builder_variable" />
-                          <node concept="3NFfHV" id="At0yqMbV5n" role="1sPUBK">
-                            <node concept="3clFbS" id="At0yqMbV5o" role="2VODD2">
-                              <node concept="3clFbF" id="At0yqMbV5p" role="3cqZAp">
-                                <node concept="2OqwBi" id="At0yqMbV5q" role="3clFbG">
-                                  <node concept="30H73N" id="At0yqMbV5r" role="2Oq$k0" />
-                                  <node concept="2Xjw5R" id="At0yqMbV5s" role="2OqNvi">
-                                    <node concept="3gmYPX" id="At0yqMbV5t" role="1xVPHs">
-                                      <node concept="3gn64h" id="At0yqMbV5u" role="3gmYPZ">
-                                        <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                      </node>
-                                      <node concept="3gn64h" id="At0yqMbV5v" role="3gmYPZ">
-                                        <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="At0yqMbV5w" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:2_NfR5wo4nJ" resolve="merge" />
-                        <node concept="3cmrfG" id="At0yqMbV5x" role="37wK5m">
-                          <property role="3cmrfH" value="0" />
-                          <node concept="17Uvod" id="At0yqMbV5y" role="lGtFl">
-                            <property role="2qtEX9" value="value" />
-                            <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
-                            <node concept="3zFVjK" id="At0yqMbV5z" role="3zH0cK">
-                              <node concept="3clFbS" id="At0yqMbV5$" role="2VODD2">
-                                <node concept="3cpWs8" id="At0yqMbV5_" role="3cqZAp">
-                                  <node concept="3cpWsn" id="At0yqMbV5A" role="3cpWs9">
-                                    <property role="TrG5h" value="i" />
-                                    <node concept="10Oyi0" id="At0yqMbV5B" role="1tU5fm" />
-                                    <node concept="2OqwBi" id="At0yqMbV5C" role="33vP2m">
-                                      <node concept="2OqwBi" id="At0yqMbV5D" role="2Oq$k0">
-                                        <node concept="30H73N" id="At0yqMbV5E" role="2Oq$k0" />
-                                        <node concept="2Xjw5R" id="At0yqMbV5F" role="2OqNvi">
-                                          <node concept="1xMEDy" id="At0yqMbV5G" role="1xVPHs">
-                                            <node concept="chp4Y" id="At0yqMbV5H" role="ri$Ld">
-                                              <ref role="cht4Q" to="wq2x:6E2cNiboHlA" resolve="BodyBlock" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="2bSWHS" id="At0yqMbV5I" role="2OqNvi" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3clFbF" id="At0yqMbV5J" role="3cqZAp">
-                                  <node concept="3K4zz7" id="At0yqMbV5K" role="3clFbG">
-                                    <node concept="37vLTw" id="At0yqMbV5L" role="3K4E3e">
-                                      <ref role="3cqZAo" node="At0yqMbV5A" resolve="i" />
-                                    </node>
-                                    <node concept="3cmrfG" id="At0yqMbV5M" role="3K4GZi">
-                                      <property role="3cmrfH" value="0" />
-                                    </node>
-                                    <node concept="2d3UOw" id="At0yqMbV5N" role="3K4Cdx">
-                                      <node concept="3cmrfG" id="At0yqMbV5O" role="3uHU7w">
-                                        <property role="3cmrfH" value="0" />
-                                      </node>
-                                      <node concept="37vLTw" id="At0yqMbV5P" role="3uHU7B">
-                                        <ref role="3cqZAo" node="At0yqMbV5A" resolve="i" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="At0yqMbV5Q" role="37wK5m">
-                          <node concept="37vLTw" id="At0yqMbV5R" role="2Oq$k0">
-                            <ref role="3cqZAo" node="At0yqMbV4s" resolve="session" />
-                            <node concept="1sPUBX" id="At0yqMbV5S" role="lGtFl">
-                              <ref role="v9R2y" node="1L74NXExmCW" resolve="session_variable" />
-                              <node concept="3NFfHV" id="At0yqMbV5T" role="1sPUBK">
-                                <node concept="3clFbS" id="At0yqMbV5U" role="2VODD2">
-                                  <node concept="3clFbF" id="At0yqMbV5V" role="3cqZAp">
-                                    <node concept="2OqwBi" id="At0yqMbV5W" role="3clFbG">
-                                      <node concept="30H73N" id="At0yqMbV5X" role="2Oq$k0" />
-                                      <node concept="2Xjw5R" id="At0yqMbV5Y" role="2OqNvi">
-                                        <node concept="3gmYPX" id="At0yqMbV5Z" role="1xVPHs">
-                                          <node concept="3gn64h" id="At0yqMbV60" role="3gmYPZ">
-                                            <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                          </node>
-                                          <node concept="3gn64h" id="At0yqMbV61" role="3gmYPZ">
-                                            <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="At0yqMbV62" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:At0yqM7GVe" resolve="expandMacro" />
-                            <node concept="10Nm6u" id="At0yqMbV63" role="37wK5m">
-                              <node concept="29HgVG" id="At0yqMbV64" role="lGtFl">
-                                <node concept="3NFfHV" id="At0yqMbV65" role="3NFExx">
-                                  <node concept="3clFbS" id="At0yqMbV66" role="2VODD2">
-                                    <node concept="3clFbF" id="At0yqMbV67" role="3cqZAp">
-                                      <node concept="2OqwBi" id="At0yqMbV68" role="3clFbG">
-                                        <node concept="30H73N" id="At0yqMbV69" role="2Oq$k0" />
-                                        <node concept="3TrEf2" id="At0yqMbV6a" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="wq2x:5itBwM7GBKT" resolve="input" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="2YIFZM" id="At0yqMbV6b" role="37wK5m">
-                              <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
-                              <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
-                              <node concept="Xl_RD" id="At0yqMbV6c" role="37wK5m">
-                                <property role="Xl_RC" value="" />
-                                <node concept="17Uvod" id="At0yqMbV6d" role="lGtFl">
-                                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                                  <property role="2qtEX9" value="value" />
-                                  <node concept="3zFVjK" id="At0yqMbV6e" role="3zH0cK">
-                                    <node concept="3clFbS" id="At0yqMbV6f" role="2VODD2">
-                                      <node concept="3clFbF" id="At0yqMbV6g" role="3cqZAp">
-                                        <node concept="2OqwBi" id="At0yqMbV6h" role="3clFbG">
-                                          <node concept="2OqwBi" id="At0yqMbV6i" role="2Oq$k0">
-                                            <node concept="liA8E" id="At0yqMbV6j" role="2OqNvi">
-                                              <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                                            </node>
-                                            <node concept="2JrnkZ" id="At0yqMbV6k" role="2Oq$k0">
-                                              <node concept="2OqwBi" id="At0yqMbV6l" role="2JrQYb">
-                                                <node concept="1iwH7S" id="At0yqMbV6m" role="2Oq$k0" />
-                                                <node concept="12$id9" id="At0yqMbV6n" role="2OqNvi">
-                                                  <node concept="2OqwBi" id="At0yqMbV6o" role="12$y8L">
-                                                    <node concept="30H73N" id="At0yqMbV6p" role="2Oq$k0" />
-                                                    <node concept="3TrEf2" id="At0yqMbV6q" role="2OqNvi">
-                                                      <ref role="3Tt5mk" to="wq2x:5itBwM7GBLp" resolve="template" />
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                          <node concept="liA8E" id="At0yqMbV6r" role="2OqNvi">
-                                            <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="1bVj0M" id="At0yqMbV6s" role="37wK5m">
-                              <node concept="3clFbS" id="At0yqMbV6t" role="1bW5cS">
-                                <node concept="3clFbF" id="At0yqMbV6u" role="3cqZAp">
-                                  <node concept="2OqwBi" id="At0yqMbV6v" role="3clFbG">
-                                    <node concept="2OqwBi" id="At0yqMbV6w" role="2Oq$k0">
-                                      <node concept="37vLTw" id="At0yqMbV6x" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="At0yqMbV6G" resolve="tok" />
-                                      </node>
-                                      <node concept="liA8E" id="At0yqMbV6y" role="2OqNvi">
-                                        <ref role="37wK5l" to="i348:5itBwM86qUR" resolve="withLogical" />
-                                        <node concept="10Nm6u" id="At0yqMbV6z" role="37wK5m">
-                                          <node concept="2b32R4" id="At0yqMbV6$" role="lGtFl">
-                                            <node concept="3JmXsc" id="At0yqMbV6_" role="2P8S$">
-                                              <node concept="3clFbS" id="At0yqMbV6A" role="2VODD2">
-                                                <node concept="3clFbF" id="At0yqMbV6B" role="3cqZAp">
-                                                  <node concept="2OqwBi" id="At0yqMbV6C" role="3clFbG">
-                                                    <node concept="30H73N" id="At0yqMbV6D" role="2Oq$k0" />
-                                                    <node concept="3Tsc0h" id="At0yqMbV6E" role="2OqNvi">
-                                                      <ref role="3TtcxE" to="wq2x:5itBwM7GBKR" resolve="logical" />
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="liA8E" id="At0yqMbV6F" role="2OqNvi">
-                                      <ref role="37wK5l" to="i348:5itBwM7bY2d" resolve="apply" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="37vLTG" id="At0yqMbV6G" role="1bW2Oz">
-                                <property role="TrG5h" value="tok" />
-                                <node concept="3uibUv" id="At0yqMbV6H" role="1tU5fm">
-                                  <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
                 </node>
-                <node concept="1wplmZ" id="At0yqMbV6I" role="1zxBo6">
-                  <node concept="3clFbS" id="At0yqMbV6J" role="1wplMD">
-                    <node concept="3clFbF" id="At0yqMbV6K" role="3cqZAp">
-                      <node concept="2OqwBi" id="At0yqMbV6L" role="3clFbG">
-                        <node concept="37vLTw" id="At0yqMbV6M" role="2Oq$k0">
-                          <ref role="3cqZAo" node="At0yqMbV4s" resolve="session" />
-                          <node concept="1sPUBX" id="At0yqMbV6N" role="lGtFl">
-                            <ref role="v9R2y" node="1L74NXExmCW" resolve="session_variable" />
-                            <node concept="3NFfHV" id="At0yqMbV6O" role="1sPUBK">
-                              <node concept="3clFbS" id="At0yqMbV6P" role="2VODD2">
-                                <node concept="3clFbF" id="At0yqMbV6Q" role="3cqZAp">
-                                  <node concept="2OqwBi" id="At0yqMbV6R" role="3clFbG">
-                                    <node concept="30H73N" id="At0yqMbV6S" role="2Oq$k0" />
-                                    <node concept="2Xjw5R" id="At0yqMbV6T" role="2OqNvi">
-                                      <node concept="3gmYPX" id="At0yqMbV6U" role="1xVPHs">
-                                        <node concept="3gn64h" id="At0yqMbV6V" role="3gmYPZ">
-                                          <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                        </node>
-                                        <node concept="3gn64h" id="At0yqMbV6W" role="3gmYPZ">
-                                          <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="At0yqMbV6X" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:7DvO2M9IiMQ" resolve="removeParameter" />
-                          <node concept="Xl_RD" id="At0yqMbV6Y" role="37wK5m">
-                            <node concept="17Uvod" id="At0yqMbV6Z" role="lGtFl">
-                              <property role="2qtEX9" value="value" />
-                              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                              <node concept="3zFVjK" id="At0yqMbV70" role="3zH0cK">
-                                <node concept="3clFbS" id="At0yqMbV71" role="2VODD2">
-                                  <node concept="3clFbF" id="At0yqMbV72" role="3cqZAp">
-                                    <node concept="2OqwBi" id="At0yqMbV73" role="3clFbG">
-                                      <node concept="2OqwBi" id="At0yqMbV74" role="2Oq$k0">
-                                        <node concept="30H73N" id="At0yqMbV75" role="2Oq$k0" />
-                                        <node concept="3TrEf2" id="At0yqMbV76" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="wq2x:5itBwM7QPtQ" resolve="declaration" />
-                                        </node>
-                                      </node>
-                                      <node concept="2qgKlT" id="At0yqMbV77" role="2OqNvi">
-                                        <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1WS0z7" id="At0yqMbV78" role="lGtFl">
-                        <node concept="3JmXsc" id="At0yqMbV79" role="3Jn$fo">
-                          <node concept="3clFbS" id="At0yqMbV7a" role="2VODD2">
-                            <node concept="3clFbF" id="At0yqMbV7b" role="3cqZAp">
-                              <node concept="2OqwBi" id="At0yqMbV7c" role="3clFbG">
-                                <node concept="2OqwBi" id="At0yqMbV7d" role="2Oq$k0">
-                                  <node concept="30H73N" id="At0yqMbV7e" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="At0yqMbV7f" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:5itBwM7QPB1" resolve="arglist" />
-                                  </node>
-                                </node>
-                                <node concept="3Tsc0h" id="At0yqMbV7g" role="2OqNvi">
-                                  <ref role="3TtcxE" to="wq2x:5itBwM7QPw7" resolve="binding" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="raruj" id="At0yqMbV7h" role="lGtFl" />
               </node>
+              <node concept="raruj" id="2TBKto$1hCP" role="lGtFl" />
             </node>
           </node>
         </node>
@@ -15425,6 +14990,22 @@
               <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
             </node>
           </node>
+          <node concept="2tJIrI" id="C1f6iEkUGf" role="jymVt" />
+          <node concept="3clFb_" id="C1f6iEkWAq" role="jymVt">
+            <property role="TrG5h" value="token" />
+            <node concept="3uibUv" id="C1f6iEl2cu" role="3clF45">
+              <ref role="3uigEE" node="5itBwM6XBFY" resolve="__MacroTable._Expand.Token" />
+            </node>
+            <node concept="3Tmbuc" id="C1f6iEkXpf" role="1B3o_S" />
+            <node concept="3clFbS" id="C1f6iEkWAu" role="3clF47">
+              <node concept="3clFbF" id="C1f6iEl4TX" role="3cqZAp">
+                <node concept="Xjq3P" id="C1f6iEl4TW" role="3clFbG" />
+              </node>
+            </node>
+            <node concept="2ZBi8u" id="C1f6iEl7Wb" role="lGtFl">
+              <ref role="2rW$FS" node="C1f6iElasQ" resolve="macro_token_method" />
+            </node>
+          </node>
           <node concept="2tJIrI" id="5itBwM6XBHJ" role="jymVt" />
           <node concept="312cEg" id="5itBwM6XBHK" role="jymVt">
             <property role="TrG5h" value="session" />
@@ -19457,11 +19038,123 @@
         </node>
       </node>
     </node>
-    <node concept="j$LIH" id="2LxIQen0cuD" role="jxRDz">
-      <node concept="1lLz0L" id="2LxIQen0cuE" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
-        <property role="1lLB17" value="invalid usage" />
+    <node concept="3aamgX" id="C1f6iEkTqy" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+      <node concept="30G5F_" id="C1f6iEkTqz" role="30HLyM">
+        <node concept="3clFbS" id="C1f6iEkTq$" role="2VODD2">
+          <node concept="3clFbF" id="C1f6iEkTq_" role="3cqZAp">
+            <node concept="2OqwBi" id="C1f6iEkTqA" role="3clFbG">
+              <node concept="2OqwBi" id="C1f6iEkTqB" role="2Oq$k0">
+                <node concept="30H73N" id="C1f6iEkTqC" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="C1f6iEkTqD" role="2OqNvi">
+                  <node concept="1xMEDy" id="C1f6iEkTqE" role="1xVPHs">
+                    <node concept="chp4Y" id="C1f6iEkTO5" role="ri$Ld">
+                      <ref role="cht4Q" to="wq2x:5itBwM65AQ4" resolve="ExpandMacroTemplate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3x8VRR" id="C1f6iEkTqG" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
       </node>
+      <node concept="1Koe21" id="C1f6iEkTqH" role="1lVwrX">
+        <node concept="312cEu" id="C1f6iEkTqI" role="1Koe22">
+          <property role="2bfB8j" value="true" />
+          <property role="TrG5h" value="Context" />
+          <node concept="3clFb_" id="C1f6iEkTqJ" role="jymVt">
+            <property role="TrG5h" value="token" />
+            <node concept="3uibUv" id="C1f6iElcMY" role="3clF45">
+              <ref role="3uigEE" node="5itBwM6XBFY" resolve="__MacroTable._Expand.Token" />
+            </node>
+            <node concept="3Tm6S6" id="C1f6iEkTqL" role="1B3o_S" />
+            <node concept="3clFbS" id="C1f6iEkTqM" role="3clF47">
+              <node concept="3clFbF" id="C1f6iEkTqN" role="3cqZAp">
+                <node concept="10Nm6u" id="C1f6iEkTqO" role="3clFbG" />
+              </node>
+            </node>
+          </node>
+          <node concept="2tJIrI" id="C1f6iEkTqP" role="jymVt" />
+          <node concept="3clFb_" id="C1f6iEkTqQ" role="jymVt">
+            <property role="TrG5h" value="method" />
+            <node concept="3Tm1VV" id="C1f6iEkTqR" role="1B3o_S" />
+            <node concept="3clFbS" id="C1f6iEkTqS" role="3clF47">
+              <node concept="3clFbF" id="C1f6iEkTqT" role="3cqZAp">
+                <node concept="2OqwBi" id="C1f6iEkTqU" role="3clFbG">
+                  <node concept="2OwXpG" id="C1f6iEkTqV" role="2OqNvi">
+                    <ref role="2Oxat5" node="At0yqLVlwz" resolve="ruleInput" />
+                    <node concept="1ZhdrF" id="C1f6iEkTqW" role="lGtFl">
+                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
+                      <property role="2qtEX8" value="fieldDeclaration" />
+                      <node concept="3$xsQk" id="C1f6iEkTqX" role="3$ytzL">
+                        <node concept="3clFbS" id="C1f6iEkTqY" role="2VODD2">
+                          <node concept="3clFbF" id="C1f6iEkTqZ" role="3cqZAp">
+                            <node concept="2OqwBi" id="C1f6iEkTr0" role="3clFbG">
+                              <node concept="1iwH7S" id="C1f6iEkTr1" role="2Oq$k0" />
+                              <node concept="1iwH70" id="C1f6iEkTr2" role="2OqNvi">
+                                <ref role="1iwH77" node="At0yqLVlmo" resolve="macro_ruleInputNode_field" />
+                                <node concept="2OqwBi" id="C1f6iEkTr3" role="1iwH7V">
+                                  <node concept="30H73N" id="C1f6iEkTr4" role="2Oq$k0" />
+                                  <node concept="2Xjw5R" id="C1f6iEkTr5" role="2OqNvi">
+                                    <node concept="1xMEDy" id="C1f6iEkTr6" role="1xVPHs">
+                                      <node concept="chp4Y" id="C1f6iElfiZ" role="ri$Ld">
+                                        <ref role="cht4Q" to="wq2x:5itBwM65AQ4" resolve="ExpandMacroTemplate" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="raruj" id="C1f6iEkTr8" role="lGtFl" />
+                  <node concept="1rXfSq" id="C1f6iEkTr9" role="2Oq$k0">
+                    <ref role="37wK5l" node="C1f6iEkTqJ" resolve="token" />
+                    <node concept="1ZhdrF" id="C1f6iEkTra" role="lGtFl">
+                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                      <property role="2qtEX8" value="baseMethodDeclaration" />
+                      <node concept="3$xsQk" id="C1f6iEkTrb" role="3$ytzL">
+                        <node concept="3clFbS" id="C1f6iEkTrc" role="2VODD2">
+                          <node concept="3cpWs6" id="C1f6iEkTrd" role="3cqZAp">
+                            <node concept="2OqwBi" id="C1f6iEkTre" role="3cqZAk">
+                              <node concept="1iwH7S" id="C1f6iEkTrf" role="2Oq$k0" />
+                              <node concept="1iwH70" id="C1f6iEkTrg" role="2OqNvi">
+                                <ref role="1iwH77" node="C1f6iElasQ" resolve="macro_token_method" />
+                                <node concept="2OqwBi" id="C1f6iEkTrh" role="1iwH7V">
+                                  <node concept="30H73N" id="C1f6iEkTri" role="2Oq$k0" />
+                                  <node concept="2Xjw5R" id="C1f6iEkTrj" role="2OqNvi">
+                                    <node concept="1xMEDy" id="C1f6iEkTrk" role="1xVPHs">
+                                      <node concept="chp4Y" id="C1f6iEldjo" role="ri$Ld">
+                                        <ref role="cht4Q" to="wq2x:5itBwM65AQ4" resolve="ExpandMacroTemplate" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3uibUv" id="C1f6iEkTrm" role="3clF45">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+          <node concept="3Tm6S6" id="C1f6iEkTrn" role="1B3o_S" />
+        </node>
+      </node>
+    </node>
+    <node concept="gft3U" id="C1f6iElpcW" role="jxRDz">
+      <node concept="10Nm6u" id="C1f6iElplj" role="gfFT$" />
     </node>
   </node>
 </model>
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 a7e6d09e..4ff1d2cf 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
@@ -11495,94 +11495,159 @@
       </node>
       <node concept="3clFbS" id="5itBwMbbLTi" role="3clF47">
         <node concept="3clFbH" id="5itBwMbbRFu" role="3cqZAp" />
-        <node concept="3cpWs8" id="5itBwMbbRFP" role="3cqZAp">
-          <node concept="3cpWsn" id="5itBwMbbRFQ" role="3cpWs9">
+        <node concept="3clFbF" id="C1f6iEyDE_" role="3cqZAp">
+          <node concept="1rXfSq" id="C1f6iEyDEz" role="3clFbG">
+            <ref role="37wK5l" node="C1f6iEy$1j" resolve="expandMacro" />
+            <node concept="10Nm6u" id="C1f6iEyFVn" role="37wK5m" />
+            <node concept="37vLTw" id="C1f6iEyGJJ" role="37wK5m">
+              <ref role="3cqZAo" node="5itBwMbbLT4" resolve="macroConceptInput" />
+            </node>
+            <node concept="37vLTw" id="C1f6iEyIxp" role="37wK5m">
+              <ref role="3cqZAo" node="5itBwMbbLT6" resolve="prototypeTemplateRef" />
+            </node>
+            <node concept="37vLTw" id="C1f6iEyJPL" role="37wK5m">
+              <ref role="3cqZAo" node="5itBwMbbLT8" resolve="proc" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="5itBwMbbLTj" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="C1f6iEyyPX" role="jymVt" />
+    <node concept="3clFb_" id="C1f6iEy$1j" role="jymVt">
+      <property role="TrG5h" value="expandMacro" />
+      <node concept="37vLTG" id="C1f6iEy$1k" role="3clF46">
+        <property role="TrG5h" value="ruleInput" />
+        <node concept="3Tqbb2" id="C1f6iEy$1l" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="C1f6iEy$1m" role="3clF46">
+        <property role="TrG5h" value="macroConceptInput" />
+        <node concept="3bZ5Sz" id="C1f6iEy$1n" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="C1f6iEy$1o" role="3clF46">
+        <property role="TrG5h" value="prototypeTemplateRef" />
+        <node concept="3uibUv" id="C1f6iEy$1p" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="C1f6iEy$1q" role="3clF46">
+        <property role="TrG5h" value="proc" />
+        <node concept="3uibUv" id="C1f6iEy$1r" role="1tU5fm">
+          <ref role="3uigEE" to="82uw:~Function" resolve="Function" />
+          <node concept="3qUtgH" id="C1f6iEy$1s" role="11_B2D">
+            <node concept="16syzq" id="C1f6iEy$1t" role="3qUvdb">
+              <ref role="16sUi3" node="C1f6iEy$1y" resolve="T" />
+            </node>
+          </node>
+          <node concept="3uibUv" id="C1f6iEy$1u" role="11_B2D">
+            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="C1f6iEy$1v" role="3clF45">
+        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+      </node>
+      <node concept="3Tm1VV" id="C1f6iEy$1w" role="1B3o_S" />
+      <node concept="16euLQ" id="C1f6iEy$1y" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="C1f6iEy$1z" role="3ztrMU">
+          <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="C1f6iEy$1$" role="3clF47">
+        <node concept="3clFbH" id="C1f6iEyBgp" role="3cqZAp" />
+        <node concept="3cpWs8" id="C1f6iEyAqx" role="3cqZAp">
+          <node concept="3cpWsn" id="C1f6iEyAqy" role="3cpWs9">
             <property role="TrG5h" value="tpl" />
-            <node concept="3uibUv" id="5itBwMbbRFR" role="1tU5fm">
+            <node concept="3uibUv" id="C1f6iEyAqz" role="1tU5fm">
               <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
-              <node concept="16syzq" id="5itBwMbbRFS" role="11_B2D">
-                <ref role="16sUi3" node="5itBwMbbLTg" resolve="T" />
+              <node concept="16syzq" id="C1f6iEyAq$" role="11_B2D">
+                <ref role="16sUi3" node="C1f6iEy$1y" resolve="T" />
               </node>
             </node>
-            <node concept="2OqwBi" id="5itBwMbbRFT" role="33vP2m">
-              <node concept="2OqwBi" id="zL5ZaNJjx8" role="2Oq$k0">
-                <node concept="37vLTw" id="5itBwMbbRFU" role="2Oq$k0">
+            <node concept="2OqwBi" id="C1f6iEyAq_" role="33vP2m">
+              <node concept="2OqwBi" id="C1f6iEyAqA" role="2Oq$k0">
+                <node concept="37vLTw" id="C1f6iEyAqB" role="2Oq$k0">
                   <ref role="3cqZAo" node="7DvO2Ma0klb" resolve="ruleProcessingSession" />
                 </node>
-                <node concept="liA8E" id="zL5ZaNJk1q" role="2OqNvi">
+                <node concept="liA8E" id="C1f6iEyAqC" role="2OqNvi">
                   <ref role="37wK5l" to="hano:7DvO2M9Icas" resolve="macroTemplates" />
                 </node>
               </node>
-              <node concept="liA8E" id="5itBwMbbRFV" role="2OqNvi">
+              <node concept="liA8E" id="C1f6iEyAqD" role="2OqNvi">
                 <ref role="37wK5l" to="hano:5itBwM7W0ZG" resolve="expandMacroTemplate" />
-                <node concept="37vLTw" id="5itBwMbc0kX" role="37wK5m">
-                  <ref role="3cqZAo" node="5itBwMbbLT4" resolve="macroConceptInput" />
+                <node concept="37vLTw" id="C1f6iEyAqE" role="37wK5m">
+                  <ref role="3cqZAo" node="C1f6iEy$1m" resolve="macroConceptInput" />
                 </node>
-                <node concept="37vLTw" id="5itBwMbbRFZ" role="37wK5m">
-                  <ref role="3cqZAo" node="5itBwMbbLT6" resolve="prototypeTemplateRef" />
+                <node concept="37vLTw" id="C1f6iEyAqF" role="37wK5m">
+                  <ref role="3cqZAo" node="C1f6iEy$1o" resolve="prototypeTemplateRef" />
                 </node>
-                <node concept="16syzq" id="5itBwMbbRG0" role="3PaCim">
-                  <ref role="16sUi3" node="5itBwMbbLTg" resolve="T" />
+                <node concept="16syzq" id="C1f6iEyAqG" role="3PaCim">
+                  <ref role="16sUi3" node="C1f6iEy$1y" resolve="T" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="5itBwMbbRG1" role="3cqZAp">
-          <node concept="3clFbS" id="5itBwMbbRG2" role="3clFbx">
-            <node concept="3cpWs8" id="5itBwMbbRG3" role="3cqZAp">
-              <node concept="3cpWsn" id="5itBwMbbRG4" role="3cpWs9">
+        <node concept="3clFbJ" id="C1f6iEyAqH" role="3cqZAp">
+          <node concept="3clFbS" id="C1f6iEyAqI" role="3clFbx">
+            <node concept="3cpWs8" id="C1f6iEyAqJ" role="3cqZAp">
+              <node concept="3cpWsn" id="C1f6iEyAqK" role="3cpWs9">
                 <property role="TrG5h" value="tok" />
-                <node concept="16syzq" id="5itBwMbbRG5" role="1tU5fm">
-                  <ref role="16sUi3" node="5itBwMbbLTg" resolve="T" />
+                <node concept="16syzq" id="C1f6iEyAqL" role="1tU5fm">
+                  <ref role="16sUi3" node="C1f6iEy$1y" resolve="T" />
                 </node>
-                <node concept="2OqwBi" id="5itBwMbbRG6" role="33vP2m">
-                  <node concept="37vLTw" id="5itBwMbbRG7" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5itBwMbbRFQ" resolve="tpl" />
+                <node concept="2OqwBi" id="C1f6iEyAqM" role="33vP2m">
+                  <node concept="37vLTw" id="C1f6iEyAqN" role="2Oq$k0">
+                    <ref role="3cqZAo" node="C1f6iEyAqy" resolve="tpl" />
                   </node>
-                  <node concept="liA8E" id="5itBwMbbRG8" role="2OqNvi">
+                  <node concept="liA8E" id="C1f6iEyAqO" role="2OqNvi">
                     <ref role="37wK5l" to="i348:5ynGfcflmnr" resolve="createToken" />
-                    <node concept="10Nm6u" id="At0yqLVvgR" role="37wK5m" />
-                    <node concept="10Nm6u" id="5itBwMbc2Mp" role="37wK5m" />
-                    <node concept="Xjq3P" id="5itBwMbbRGa" role="37wK5m" />
+                    <node concept="37vLTw" id="C1f6iEyBXA" role="37wK5m">
+                      <ref role="3cqZAo" node="C1f6iEy$1k" resolve="ruleInput" />
+                    </node>
+                    <node concept="10Nm6u" id="C1f6iEyAqQ" role="37wK5m" />
+                    <node concept="Xjq3P" id="C1f6iEyAqR" role="37wK5m" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3cpWs6" id="5itBwMbbRGb" role="3cqZAp">
-              <node concept="2OqwBi" id="5itBwMbbRGc" role="3cqZAk">
-                <node concept="37vLTw" id="5itBwMbbRGd" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5itBwMbbLT8" resolve="proc" />
+            <node concept="3cpWs6" id="C1f6iEyAqS" role="3cqZAp">
+              <node concept="2OqwBi" id="C1f6iEyAqT" role="3cqZAk">
+                <node concept="37vLTw" id="C1f6iEyAqU" role="2Oq$k0">
+                  <ref role="3cqZAo" node="C1f6iEy$1q" resolve="proc" />
                 </node>
-                <node concept="liA8E" id="5itBwMbbRGe" role="2OqNvi">
+                <node concept="liA8E" id="C1f6iEyAqV" role="2OqNvi">
                   <ref role="37wK5l" to="82uw:~Function.apply(java.lang.Object)" resolve="apply" />
-                  <node concept="37vLTw" id="5itBwMbbRGf" role="37wK5m">
-                    <ref role="3cqZAo" node="5itBwMbbRG4" resolve="tok" />
+                  <node concept="37vLTw" id="C1f6iEyAqW" role="37wK5m">
+                    <ref role="3cqZAo" node="C1f6iEyAqK" resolve="tok" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="5itBwMbbRGg" role="3cqZAp" />
+            <node concept="3clFbH" id="C1f6iEyAqX" role="3cqZAp" />
           </node>
-          <node concept="3y3z36" id="5itBwMbbRGh" role="3clFbw">
-            <node concept="10Nm6u" id="5itBwMbbRGi" role="3uHU7w" />
-            <node concept="37vLTw" id="5itBwMbbRGj" role="3uHU7B">
-              <ref role="3cqZAo" node="5itBwMbbRFQ" resolve="tpl" />
+          <node concept="3y3z36" id="C1f6iEyAqY" role="3clFbw">
+            <node concept="10Nm6u" id="C1f6iEyAqZ" role="3uHU7w" />
+            <node concept="37vLTw" id="C1f6iEyAr0" role="3uHU7B">
+              <ref role="3cqZAo" node="C1f6iEyAqy" resolve="tpl" />
             </node>
           </node>
-          <node concept="9aQIb" id="5itBwMbbRGk" role="9aQIa">
-            <node concept="3clFbS" id="5itBwMbbRGl" role="9aQI4">
-              <node concept="3cpWs6" id="5itBwMbbRGm" role="3cqZAp">
-                <node concept="10M0yZ" id="5itBwMbbRGn" role="3cqZAk">
-                  <ref role="3cqZAo" to="i348:5yr01fDteq2" resolve="EMPTY" />
+          <node concept="9aQIb" id="C1f6iEyAr1" role="9aQIa">
+            <node concept="3clFbS" id="C1f6iEyAr2" role="9aQI4">
+              <node concept="3cpWs6" id="C1f6iEyAr3" role="3cqZAp">
+                <node concept="10M0yZ" id="C1f6iEyAr4" role="3cqZAk">
                   <ref role="1PxDUh" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  <ref role="3cqZAo" to="i348:5yr01fDteq2" resolve="EMPTY" />
                 </node>
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="5itBwMbbLTj" role="2AJF6D">
+      <node concept="2AHcQZ" id="C1f6iEy$1_" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </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 ba15cf22..81d6ceec 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
@@ -2498,6 +2498,15 @@
           <ref role="3uigEE" node="5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
         </node>
       </node>
+      <node concept="2AHcQZ" id="C1f6iEluMz" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+        <node concept="2B6LJw" id="C1f6iEyX7g" role="2B76xF">
+          <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
+          <node concept="3clFbT" id="C1f6iEyXm1" role="2B70Vg">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="At0yqM7GVd" role="jymVt" />
     <node concept="3clFb_" id="At0yqM7GUY" role="jymVt">
@@ -2538,6 +2547,66 @@
           <ref role="3uigEE" node="5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
         </node>
       </node>
+      <node concept="2AHcQZ" id="C1f6iEyM1v" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+        <node concept="2B6LJw" id="C1f6iEyXxQ" role="2B76xF">
+          <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
+          <node concept="3clFbT" id="C1f6iEyXK3" role="2B70Vg">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="C1f6iEysUF" role="jymVt" />
+    <node concept="3clFb_" id="C1f6iEyrah" role="jymVt">
+      <property role="TrG5h" value="expandMacro" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="37vLTG" id="C1f6iEyuh2" role="3clF46">
+        <property role="TrG5h" value="ruleInput" />
+        <node concept="3Tqbb2" id="C1f6iEyvAg" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="C1f6iEyrai" role="3clF46">
+        <property role="TrG5h" value="macroConceptInput" />
+        <node concept="3bZ5Sz" id="C1f6iEyraj" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="C1f6iEyrak" role="3clF46">
+        <property role="TrG5h" value="prototypeTemplateRef" />
+        <node concept="3uibUv" id="C1f6iEyral" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="C1f6iEyram" role="3clF46">
+        <property role="TrG5h" value="proc" />
+        <node concept="3uibUv" id="C1f6iEyran" role="1tU5fm">
+          <ref role="3uigEE" to="82uw:~Function" resolve="Function" />
+          <node concept="3qUtgH" id="C1f6iEyrao" role="11_B2D">
+            <node concept="16syzq" id="C1f6iEyrap" role="3qUvdb">
+              <ref role="16sUi3" node="C1f6iEyrau" resolve="T" />
+            </node>
+          </node>
+          <node concept="3uibUv" id="C1f6iEyraq" role="11_B2D">
+            <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="C1f6iEyrar" role="3clF45">
+        <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
+      </node>
+      <node concept="3Tm1VV" id="C1f6iEyras" role="1B3o_S" />
+      <node concept="3clFbS" id="C1f6iEyrat" role="3clF47" />
+      <node concept="16euLQ" id="C1f6iEyrau" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="C1f6iEyrav" role="3ztrMU">
+          <ref role="3uigEE" node="5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+        </node>
+      </node>
+      <node concept="P$JXv" id="C1f6iEyP_C" role="lGtFl">
+        <node concept="TZ5HA" id="C1f6iEyP_D" role="TZ5H$">
+          <node concept="1dT_AC" id="C1f6iEyP_E" role="1dT_Ay">
+            <property role="1dT_AB" value="Overloaded variant of the default expandMacro method accepting the concept instead of the macro input node." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="At0yqM7GUX" role="jymVt" />
     <node concept="3clFb_" id="5itBwM7V_fy" role="jymVt">