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 55d11e27..79699423 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
@@ -102,9 +102,7 @@
         <child id="1164903359218" name="catchBody" index="TDEfX" />
         <child id="1164903359217" name="throwable" index="TDEfY" />
       </concept>
-      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P">
-        <reference id="1182955020723" name="classConcept" index="1HBi2w" />
-      </concept>
+      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
       <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
@@ -9474,515 +9472,7 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7DvO2Ma0gpD" role="jymVt" />
-    <node concept="3clFb_" id="7DvO2M9IiKQ" role="jymVt">
-      <property role="TrG5h" value="expandMacro" />
-      <node concept="37vLTG" id="7DvO2M9IiKR" role="3clF46">
-        <property role="TrG5h" value="logical" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="7DvO2M9IiKS" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-          <node concept="3uibUv" id="7DvO2M9IiKT" role="11_B2D">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7DvO2M9IiKU" role="3clF46">
-        <property role="TrG5h" value="inputNode" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3Tqbb2" id="7DvO2M9IiKV" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="7DvO2M9IiKW" role="3clF45">
-        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-      </node>
-      <node concept="3Tm1VV" id="7DvO2M9IiKX" role="1B3o_S" />
-      <node concept="3clFbS" id="7DvO2M9IiKY" role="3clF47">
-        <node concept="3SKdUt" id="4pwDyRBzU$N" role="3cqZAp">
-          <node concept="1PaTwC" id="4pwDyRBzU$O" role="3ndbpf">
-            <node concept="3oM_SD" id="4pwDyRBzVbl" role="1PaTwD">
-              <property role="3oM_SC" value="calling" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVbv" role="1PaTwD">
-              <property role="3oM_SC" value="a" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVbE" role="1PaTwD">
-              <property role="3oM_SC" value="macro" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVc6" role="1PaTwD">
-              <property role="3oM_SC" value="on" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVcb" role="1PaTwD">
-              <property role="3oM_SC" value="a" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVcx" role="1PaTwD">
-              <property role="3oM_SC" value="null" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVcK" role="1PaTwD">
-              <property role="3oM_SC" value="node" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVcS" role="1PaTwD">
-              <property role="3oM_SC" value="has" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVd9" role="1PaTwD">
-              <property role="3oM_SC" value="no" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVdr" role="1PaTwD">
-              <property role="3oM_SC" value="effect" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="4pwDyRBzH3C" role="3cqZAp">
-          <node concept="3clFbS" id="4pwDyRBzH3E" role="3clFbx">
-            <node concept="3cpWs6" id="4pwDyRBzHYd" role="3cqZAp">
-              <node concept="10M0yZ" id="5yr01fDt_oo" role="3cqZAk">
-                <ref role="3cqZAo" to="i348:5yr01fDteq2" resolve="EMPTY" />
-                <ref role="1PxDUh" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="4pwDyRBzHH8" role="3clFbw">
-            <node concept="10Nm6u" id="4pwDyRBzHIG" role="3uHU7w" />
-            <node concept="37vLTw" id="4pwDyRBzHg6" role="3uHU7B">
-              <ref role="3cqZAo" node="7DvO2M9IiKU" resolve="inputNode" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="4pwDyRBzX$F" role="3cqZAp" />
-        <node concept="3SKdUt" id="6tPOoeSRfFw" role="3cqZAp">
-          <node concept="1PaTwC" id="589APehYxO$" role="3ndbpf">
-            <node concept="3oM_SD" id="589APehYxO_" role="1PaTwD">
-              <property role="3oM_SC" value="mark" />
-            </node>
-            <node concept="3oM_SD" id="589APehYxOA" role="1PaTwD">
-              <property role="3oM_SC" value="the" />
-            </node>
-            <node concept="3oM_SD" id="589APehYxOB" role="1PaTwD">
-              <property role="3oM_SC" value="input" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzYON" role="1PaTwD">
-              <property role="3oM_SC" value="node" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzYPi" role="1PaTwD">
-              <property role="3oM_SC" value="as" />
-            </node>
-            <node concept="3oM_SD" id="589APehYxOI" role="1PaTwD">
-              <property role="3oM_SC" value="required" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7DvO2M9IiKZ" role="3cqZAp">
-          <node concept="2OqwBi" id="7DvO2M9IiL0" role="3clFbG">
-            <node concept="37vLTw" id="7DvO2M9IiL1" role="2Oq$k0">
-              <ref role="3cqZAo" to="i348:7DvO2M9IiOO" resolve="requireHooks" />
-            </node>
-            <node concept="2es0OD" id="7DvO2M9IiL2" role="2OqNvi">
-              <node concept="1bVj0M" id="7DvO2M9IiL3" role="23t8la">
-                <node concept="3clFbS" id="7DvO2M9IiL4" role="1bW5cS">
-                  <node concept="3clFbF" id="7DvO2M9IiL5" role="3cqZAp">
-                    <node concept="2OqwBi" id="7DvO2M9IiL6" role="3clFbG">
-                      <node concept="37vLTw" id="7DvO2M9IiL7" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7DvO2M9IiLa" resolve="it" />
-                      </node>
-                      <node concept="liA8E" id="7DvO2M9IiL8" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:36tQV5BD$_p" resolve="require" />
-                        <node concept="37vLTw" id="7DvO2M9IiL9" role="37wK5m">
-                          <ref role="3cqZAo" node="7DvO2M9IiKU" resolve="inputNode" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="Rh6nW" id="7DvO2M9IiLa" role="1bW2Oz">
-                  <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7DvO2M9IiLb" role="1tU5fm" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="4pwDyRBzYby" role="3cqZAp" />
-        <node concept="3clFbF" id="7DvO2M9IiLc" role="3cqZAp">
-          <node concept="1rXfSq" id="7DvO2M9IiLd" role="3clFbG">
-            <ref role="37wK5l" node="7DvO2M9IiNu" resolve="withMacroTemplate" />
-            <node concept="2OqwBi" id="7DvO2M9IiLe" role="37wK5m">
-              <node concept="37vLTw" id="7DvO2M9IiLf" role="2Oq$k0">
-                <ref role="3cqZAo" node="7DvO2M9IiKU" resolve="inputNode" />
-              </node>
-              <node concept="2yIwOk" id="7DvO2M9IiLg" role="2OqNvi" />
-            </node>
-            <node concept="2ShNRf" id="7DvO2M9IiLh" role="37wK5m">
-              <node concept="YeOm9" id="7DvO2M9IiLi" role="2ShVmc">
-                <node concept="1Y3b0j" id="7DvO2M9IiLj" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                  <ref role="1Y3XeK" to="psr6:1eKXYsjvSZy" resolve="AbstractMacroTemplate.MacroTemplateAction" />
-                  <node concept="3Tm1VV" id="7DvO2M9IiLk" role="1B3o_S" />
-                  <node concept="3clFb_" id="7DvO2M9IiLl" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="doAction" />
-                    <node concept="37vLTG" id="7DvO2M9IiLm" role="3clF46">
-                      <property role="TrG5h" value="typeTemplate" />
-                      <node concept="3uibUv" id="7DvO2M9IiLn" role="1tU5fm">
-                        <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="MacroTemplate" />
-                        <node concept="16syzq" id="7DvO2M9IiLo" role="11_B2D">
-                          <ref role="16sUi3" node="7DvO2M9IiLz" resolve="Cfg" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3uibUv" id="7DvO2M9IiLp" role="3clF45">
-                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                    </node>
-                    <node concept="3Tm1VV" id="7DvO2M9IiLq" role="1B3o_S" />
-                    <node concept="3clFbS" id="7DvO2M9IiLr" role="3clF47">
-                      <node concept="3clFbF" id="7DvO2M9IiLs" role="3cqZAp">
-                        <node concept="2OqwBi" id="7DvO2M9IiLt" role="3clFbG">
-                          <node concept="37vLTw" id="7DvO2M9IiLu" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7DvO2M9IiLm" resolve="typeTemplate" />
-                          </node>
-                          <node concept="liA8E" id="7DvO2M9IiLv" role="2OqNvi">
-                            <ref role="37wK5l" to="psr6:60NbDCXG$nh" resolve="doExpand" />
-                            <node concept="37vLTw" id="7DvO2M9IiLw" role="37wK5m">
-                              <ref role="3cqZAo" node="7DvO2M9IiKU" resolve="inputNode" />
-                            </node>
-                            <node concept="37vLTw" id="7DvO2M9IiLx" role="37wK5m">
-                              <ref role="3cqZAo" node="7DvO2M9IiKR" resolve="logical" />
-                            </node>
-                            <node concept="Xjq3P" id="7DvO2M9IiLy" role="37wK5m">
-                              <ref role="1HBi2w" node="7DvO2M9IiKB" resolve="MacroProcessing" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="16euLQ" id="7DvO2M9IiLz" role="16eVyc">
-                      <property role="TrG5h" value="Cfg" />
-                      <node concept="3uibUv" id="7DvO2M9IiL$" role="3ztrMU">
-                        <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFb_" id="2Y70AYExTDC" role="jymVt">
-                    <property role="TrG5h" value="defaultValue" />
-                    <node concept="3uibUv" id="2Y70AYExTDD" role="3clF45">
-                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                    </node>
-                    <node concept="3Tm1VV" id="2Y70AYExTDE" role="1B3o_S" />
-                    <node concept="3clFbS" id="2Y70AYExTDF" role="3clF47">
-                      <node concept="3clFbF" id="2Y70AYExTDG" role="3cqZAp">
-                        <node concept="10M0yZ" id="5yr01fDtC9O" role="3clFbG">
-                          <ref role="3cqZAo" to="i348:5yr01fDteq2" resolve="EMPTY" />
-                          <ref role="1PxDUh" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2AHcQZ" id="2Y70AYExTDK" role="2AJF6D">
-                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                    </node>
-                  </node>
-                  <node concept="3uibUv" id="7DvO2M9IiL_" role="2Ghqu4">
-                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="7DvO2M9IiLA" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7DvO2M9IiLB" role="jymVt" />
-    <node concept="3clFb_" id="5DUvKnrzdc3" role="jymVt">
-      <property role="TrG5h" value="expandMacro" />
-      <node concept="37vLTG" id="5DUvKnrzdc4" role="3clF46">
-        <property role="TrG5h" value="logical" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="5DUvKnrzdc5" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-          <node concept="3uibUv" id="5DUvKnrzdc6" role="11_B2D">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="5DUvKnrzdc7" role="3clF46">
-        <property role="TrG5h" value="inputConcept" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3bZ5Sz" id="5DUvKnrzdc8" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="5DUvKnrzdc9" role="3clF45">
-        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-      </node>
-      <node concept="3Tm1VV" id="5DUvKnrzdca" role="1B3o_S" />
-      <node concept="3clFbS" id="5DUvKnrzdcc" role="3clF47">
-        <node concept="3SKdUt" id="4pwDyRBzVpI" role="3cqZAp">
-          <node concept="1PaTwC" id="4pwDyRBzVpJ" role="3ndbpf">
-            <node concept="3oM_SD" id="4pwDyRBzVpK" role="1PaTwD">
-              <property role="3oM_SC" value="calling" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVpL" role="1PaTwD">
-              <property role="3oM_SC" value="a" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVpM" role="1PaTwD">
-              <property role="3oM_SC" value="macro" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVpN" role="1PaTwD">
-              <property role="3oM_SC" value="on" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVpO" role="1PaTwD">
-              <property role="3oM_SC" value="a" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVpP" role="1PaTwD">
-              <property role="3oM_SC" value="null" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVpQ" role="1PaTwD">
-              <property role="3oM_SC" value="node" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVpR" role="1PaTwD">
-              <property role="3oM_SC" value="has" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVpS" role="1PaTwD">
-              <property role="3oM_SC" value="no" />
-            </node>
-            <node concept="3oM_SD" id="4pwDyRBzVpT" role="1PaTwD">
-              <property role="3oM_SC" value="effect" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="4pwDyRBzVpU" role="3cqZAp">
-          <node concept="3clFbS" id="4pwDyRBzVpV" role="3clFbx">
-            <node concept="3cpWs6" id="4pwDyRBzVpW" role="3cqZAp">
-              <node concept="10M0yZ" id="5yr01fDtBsC" role="3cqZAk">
-                <ref role="1PxDUh" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                <ref role="3cqZAo" to="i348:5yr01fDteq2" resolve="EMPTY" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="4pwDyRBzVq0" role="3clFbw">
-            <node concept="10Nm6u" id="4pwDyRBzVq1" role="3uHU7w" />
-            <node concept="37vLTw" id="4pwDyRBzVIP" role="3uHU7B">
-              <ref role="3cqZAo" node="5DUvKnrzdc7" resolve="inputConcept" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="4pwDyRBzWJj" role="3cqZAp" />
-        <node concept="3clFbF" id="5DUvKnrzejC" role="3cqZAp">
-          <node concept="1rXfSq" id="5DUvKnrzejD" role="3clFbG">
-            <ref role="37wK5l" node="7DvO2M9IiNu" resolve="withMacroTemplate" />
-            <node concept="37vLTw" id="5DUvKnrzgVa" role="37wK5m">
-              <ref role="3cqZAo" node="5DUvKnrzdc7" resolve="inputConcept" />
-            </node>
-            <node concept="2ShNRf" id="5DUvKnrzejH" role="37wK5m">
-              <node concept="YeOm9" id="5DUvKnrzejI" role="2ShVmc">
-                <node concept="1Y3b0j" id="5DUvKnrzejJ" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                  <ref role="1Y3XeK" to="psr6:1eKXYsjvSZy" resolve="AbstractMacroTemplate.MacroTemplateAction" />
-                  <node concept="3Tm1VV" id="5DUvKnrzejK" role="1B3o_S" />
-                  <node concept="3clFb_" id="5DUvKnrzejL" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="doAction" />
-                    <node concept="37vLTG" id="5DUvKnrzejM" role="3clF46">
-                      <property role="TrG5h" value="typeTemplate" />
-                      <node concept="3uibUv" id="5DUvKnrzejN" role="1tU5fm">
-                        <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="MacroTemplate" />
-                        <node concept="16syzq" id="5DUvKnrzejO" role="11_B2D">
-                          <ref role="16sUi3" node="5DUvKnrzejZ" resolve="Cfg" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3uibUv" id="5DUvKnrzejP" role="3clF45">
-                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                    </node>
-                    <node concept="3Tm1VV" id="5DUvKnrzejQ" role="1B3o_S" />
-                    <node concept="3clFbS" id="5DUvKnrzejR" role="3clF47">
-                      <node concept="3clFbF" id="5DUvKnrzejS" role="3cqZAp">
-                        <node concept="2OqwBi" id="5DUvKnrzejT" role="3clFbG">
-                          <node concept="37vLTw" id="5DUvKnrzejU" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5DUvKnrzejM" resolve="typeTemplate" />
-                          </node>
-                          <node concept="liA8E" id="5DUvKnrzejV" role="2OqNvi">
-                            <ref role="37wK5l" to="psr6:5DUvKnrzhU$" resolve="doExpand" />
-                            <node concept="37vLTw" id="7Bx7XgE0ZuL" role="37wK5m">
-                              <ref role="3cqZAo" node="5DUvKnrzdc7" resolve="inputConcept" />
-                            </node>
-                            <node concept="37vLTw" id="7Bx7XgE0ZSL" role="37wK5m">
-                              <ref role="3cqZAo" node="5DUvKnrzdc4" resolve="logical" />
-                            </node>
-                            <node concept="Xjq3P" id="5DUvKnrzejY" role="37wK5m">
-                              <ref role="1HBi2w" node="7DvO2M9IiKB" resolve="MacroProcessing" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="16euLQ" id="5DUvKnrzejZ" role="16eVyc">
-                      <property role="TrG5h" value="Cfg" />
-                      <node concept="3uibUv" id="5DUvKnrzek0" role="3ztrMU">
-                        <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3uibUv" id="5DUvKnrzek1" role="2Ghqu4">
-                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                  </node>
-                  <node concept="3clFb_" id="2Y70AYExGTY" role="jymVt">
-                    <property role="TrG5h" value="defaultValue" />
-                    <node concept="3uibUv" id="2Y70AYExGU4" role="3clF45">
-                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                    </node>
-                    <node concept="3Tm1VV" id="2Y70AYExGU0" role="1B3o_S" />
-                    <node concept="3clFbS" id="2Y70AYExGU5" role="3clF47">
-                      <node concept="3clFbF" id="2Y70AYExHfP" role="3cqZAp">
-                        <node concept="10M0yZ" id="5yr01fDtCtM" role="3clFbG">
-                          <ref role="3cqZAo" to="i348:5yr01fDteq2" resolve="EMPTY" />
-                          <ref role="1PxDUh" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2AHcQZ" id="2Y70AYExGU6" role="2AJF6D">
-                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5DUvKnrzdcd" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="5DUvKnrzdJ3" role="jymVt" />
-    <node concept="3clFb_" id="7DvO2M9IiLC" role="jymVt">
-      <property role="TrG5h" value="callMacro" />
-      <node concept="37vLTG" id="7DvO2M9IiLD" role="3clF46">
-        <property role="TrG5h" value="logical" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="7DvO2M9IiLE" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-          <node concept="3uibUv" id="7DvO2M9IiLF" role="11_B2D">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7DvO2M9IiLG" role="3clF46">
-        <property role="TrG5h" value="macroTemplateRef" />
-        <node concept="3uibUv" id="5yr01fDuQLx" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="7DvO2M9IiLI" role="3clF46">
-        <property role="TrG5h" value="args" />
-        <property role="3TUv4t" value="true" />
-        <node concept="8X2XB" id="7DvO2M9IiLJ" role="1tU5fm">
-          <node concept="3uibUv" id="7DvO2M9IiLK" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="7DvO2M9IiLL" role="3clF45">
-        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-      </node>
-      <node concept="3Tm1VV" id="7DvO2M9IiLM" role="1B3o_S" />
-      <node concept="3clFbS" id="7DvO2M9IiLN" role="3clF47">
-        <node concept="3clFbF" id="7DvO2M9IiLO" role="3cqZAp">
-          <node concept="1rXfSq" id="7DvO2M9IiLP" role="3clFbG">
-            <ref role="37wK5l" node="7DvO2M9IiO1" resolve="withMacroTemplate" />
-            <node concept="37vLTw" id="7DvO2M9IiLQ" role="37wK5m">
-              <ref role="3cqZAo" node="7DvO2M9IiLG" resolve="macroTemplateRef" />
-            </node>
-            <node concept="2ShNRf" id="7DvO2M9IiLR" role="37wK5m">
-              <node concept="YeOm9" id="7DvO2M9IiLS" role="2ShVmc">
-                <node concept="1Y3b0j" id="7DvO2M9IiLT" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" to="psr6:1eKXYsjvSZy" resolve="AbstractMacroTemplate.MacroTemplateAction" />
-                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                  <node concept="3Tm1VV" id="7DvO2M9IiLU" role="1B3o_S" />
-                  <node concept="3clFb_" id="7DvO2M9IiLV" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="doAction" />
-                    <node concept="37vLTG" id="7DvO2M9IiLW" role="3clF46">
-                      <property role="TrG5h" value="macroTemplate" />
-                      <node concept="3uibUv" id="7DvO2M9IiLX" role="1tU5fm">
-                        <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="MacroTemplate" />
-                        <node concept="16syzq" id="7DvO2M9IiLY" role="11_B2D">
-                          <ref role="16sUi3" node="7DvO2M9IiMc" resolve="Cfg" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3uibUv" id="7DvO2M9IiLZ" role="3clF45">
-                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                    </node>
-                    <node concept="3Tm1VV" id="7DvO2M9IiM0" role="1B3o_S" />
-                    <node concept="3clFbS" id="7DvO2M9IiM1" role="3clF47">
-                      <node concept="3clFbF" id="7DvO2M9IiM2" role="3cqZAp">
-                        <node concept="2OqwBi" id="7DvO2M9IiM3" role="3clFbG">
-                          <node concept="37vLTw" id="7DvO2M9IiM4" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7DvO2M9IiLW" resolve="macroTemplate" />
-                          </node>
-                          <node concept="liA8E" id="7DvO2M9IiM5" role="2OqNvi">
-                            <ref role="37wK5l" to="psr6:1eKXYsjvsWF" resolve="doCall" />
-                            <node concept="2OqwBi" id="7DvO2M9IiM6" role="37wK5m">
-                              <node concept="37vLTw" id="7DvO2M9IiM7" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7DvO2M9IiLW" resolve="macroTemplate" />
-                              </node>
-                              <node concept="liA8E" id="7DvO2M9IiM8" role="2OqNvi">
-                                <ref role="37wK5l" to="psr6:1eKXYsjvsWn" resolve="withArgs" />
-                                <node concept="37vLTw" id="7DvO2M9IiM9" role="37wK5m">
-                                  <ref role="3cqZAo" node="7DvO2M9IiLI" resolve="args" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="7DvO2M9IiMa" role="37wK5m">
-                              <ref role="3cqZAo" node="7DvO2M9IiLD" resolve="logical" />
-                            </node>
-                            <node concept="Xjq3P" id="7DvO2M9IiMb" role="37wK5m">
-                              <ref role="1HBi2w" node="7DvO2M9IiKB" resolve="MacroProcessing" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="16euLQ" id="7DvO2M9IiMc" role="16eVyc">
-                      <property role="TrG5h" value="Cfg" />
-                      <node concept="3uibUv" id="7DvO2M9IiMd" role="3ztrMU">
-                        <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFb_" id="2Y70AYExHLb" role="jymVt">
-                    <property role="TrG5h" value="defaultValue" />
-                    <node concept="3uibUv" id="2Y70AYExHLc" role="3clF45">
-                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                    </node>
-                    <node concept="3Tm1VV" id="2Y70AYExHLd" role="1B3o_S" />
-                    <node concept="3clFbS" id="2Y70AYExHLe" role="3clF47">
-                      <node concept="3clFbF" id="2Y70AYExHLf" role="3cqZAp">
-                        <node concept="10M0yZ" id="5yr01fDtCLJ" role="3clFbG">
-                          <ref role="3cqZAo" to="i348:5yr01fDteq2" resolve="EMPTY" />
-                          <ref role="1PxDUh" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2AHcQZ" id="2Y70AYExHLj" role="2AJF6D">
-                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                    </node>
-                  </node>
-                  <node concept="3uibUv" id="7DvO2M9IiMe" role="2Ghqu4">
-                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="7DvO2M9IiMf" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7DvO2M9IiMg" role="jymVt" />
     <node concept="3clFb_" id="5itBwM7VEuy" role="jymVt">
       <property role="TrG5h" value="expandMacro" />
       <node concept="37vLTG" id="5itBwM7VEuz" role="3clF46">
@@ -10454,183 +9944,7 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5itBwM7VFqM" role="jymVt" />
-    <node concept="3clFb_" id="7DvO2M9IiNu" role="jymVt">
-      <property role="TrG5h" value="withMacroTemplate" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="7DvO2M9IiNv" role="3clF47">
-        <node concept="3cpWs8" id="7DvO2M9IiNy" role="3cqZAp">
-          <node concept="3cpWsn" id="7DvO2M9IiNz" role="3cpWs9">
-            <property role="TrG5h" value="macroTemplate" />
-            <node concept="3uibUv" id="7DvO2M9IiN$" role="1tU5fm">
-              <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="MacroTemplate" />
-              <node concept="16syzq" id="7DvO2M9IiN_" role="11_B2D">
-                <ref role="16sUi3" node="7DvO2M9IiNW" resolve="Cfg" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="6UWSvq4Qt2a" role="33vP2m">
-              <node concept="37vLTw" id="7DvO2Ma0lZJ" role="2Oq$k0">
-                <ref role="3cqZAo" node="7DvO2Ma0klb" resolve="macroTemplateIndex" />
-              </node>
-              <node concept="liA8E" id="6UWSvq4Qtpf" role="2OqNvi">
-                <ref role="37wK5l" to="hano:4nxCIBqy$vr" resolve="macroTemplate" />
-                <node concept="37vLTw" id="6UWSvq4Qujo" role="37wK5m">
-                  <ref role="3cqZAo" node="7DvO2M9IiNQ" resolve="typeConcept" />
-                </node>
-                <node concept="16syzq" id="7P_FdVPvn_N" role="3PaCim">
-                  <ref role="16sUi3" node="7DvO2M9IiNW" resolve="Cfg" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="6UWSvq4Qx$K" role="3cqZAp">
-          <node concept="3K4zz7" id="6UWSvq4Q$Bf" role="3cqZAk">
-            <node concept="2OqwBi" id="2Y70AYExJ3V" role="3K4GZi">
-              <node concept="37vLTw" id="2Y70AYExIek" role="2Oq$k0">
-                <ref role="3cqZAo" node="7DvO2M9IiNS" resolve="action" />
-              </node>
-              <node concept="liA8E" id="2Y70AYExJU8" role="2OqNvi">
-                <ref role="37wK5l" to="psr6:2Y70AYExG1D" resolve="defaultValue" />
-              </node>
-            </node>
-            <node concept="3y3z36" id="6UWSvq4Qzuq" role="3K4Cdx">
-              <node concept="10Nm6u" id="6UWSvq4Q$6Z" role="3uHU7w" />
-              <node concept="37vLTw" id="6UWSvq4QyJ3" role="3uHU7B">
-                <ref role="3cqZAo" node="7DvO2M9IiNz" resolve="macroTemplate" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="6UWSvq4Q_cH" role="3K4E3e">
-              <node concept="37vLTw" id="6UWSvq4Q_cI" role="2Oq$k0">
-                <ref role="3cqZAo" node="7DvO2M9IiNS" resolve="action" />
-              </node>
-              <node concept="liA8E" id="6UWSvq4Q_cJ" role="2OqNvi">
-                <ref role="37wK5l" to="psr6:1eKXYsjvTXf" resolve="doAction" />
-                <node concept="37vLTw" id="6UWSvq4Q_cK" role="37wK5m">
-                  <ref role="3cqZAo" node="7DvO2M9IiNz" resolve="macroTemplate" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7DvO2M9IiNQ" role="3clF46">
-        <property role="TrG5h" value="typeConcept" />
-        <node concept="3bZ5Sz" id="7DvO2M9IiNR" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7DvO2M9IiNS" role="3clF46">
-        <property role="TrG5h" value="action" />
-        <node concept="3uibUv" id="7DvO2M9IiNT" role="1tU5fm">
-          <ref role="3uigEE" to="psr6:1eKXYsjvSZy" resolve="AbstractMacroTemplate.MacroTemplateAction" />
-          <node concept="16syzq" id="7DvO2M9IiNU" role="11_B2D">
-            <ref role="16sUi3" node="7DvO2M9IiNY" resolve="R" />
-          </node>
-        </node>
-      </node>
-      <node concept="16syzq" id="7DvO2M9IiNV" role="3clF45">
-        <ref role="16sUi3" node="7DvO2M9IiNY" resolve="R" />
-      </node>
-      <node concept="16euLQ" id="7DvO2M9IiNW" role="16eVyc">
-        <property role="TrG5h" value="Cfg" />
-        <node concept="3uibUv" id="7DvO2M9IiNX" role="3ztrMU">
-          <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-        </node>
-      </node>
-      <node concept="16euLQ" id="7DvO2M9IiNY" role="16eVyc">
-        <property role="TrG5h" value="R" />
-      </node>
-      <node concept="3Tm6S6" id="7DvO2M9IiNZ" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="7DvO2M9IiO0" role="jymVt" />
-    <node concept="3clFb_" id="7DvO2M9IiO1" role="jymVt">
-      <property role="TrG5h" value="withMacroTemplate" />
-      <node concept="37vLTG" id="7DvO2M9IiO2" role="3clF46">
-        <property role="TrG5h" value="templateRef" />
-        <node concept="3uibUv" id="5yr01fDuPU0" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="7DvO2M9IiO4" role="3clF46">
-        <property role="TrG5h" value="action" />
-        <node concept="3uibUv" id="7DvO2M9IiO5" role="1tU5fm">
-          <ref role="3uigEE" to="psr6:1eKXYsjvSZy" resolve="AbstractMacroTemplate.MacroTemplateAction" />
-          <node concept="16syzq" id="7DvO2M9IiO6" role="11_B2D">
-            <ref role="16sUi3" node="7DvO2M9IiOy" resolve="R" />
-          </node>
-        </node>
-      </node>
-      <node concept="16syzq" id="7DvO2M9IiO7" role="3clF45">
-        <ref role="16sUi3" node="7DvO2M9IiOy" resolve="R" />
-      </node>
-      <node concept="3Tm6S6" id="7DvO2M9IiO8" role="1B3o_S" />
-      <node concept="3clFbS" id="7DvO2M9IiO9" role="3clF47">
-        <node concept="3cpWs8" id="7DvO2M9IiOc" role="3cqZAp">
-          <node concept="3cpWsn" id="7DvO2M9IiOd" role="3cpWs9">
-            <property role="TrG5h" value="macroTemplate" />
-            <node concept="3uibUv" id="7DvO2M9IiOe" role="1tU5fm">
-              <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="MacroTemplate" />
-              <node concept="16syzq" id="7DvO2M9IiOf" role="11_B2D">
-                <ref role="16sUi3" node="7DvO2M9IiOw" resolve="Cfg" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="6UWSvq4QB3K" role="33vP2m">
-              <node concept="37vLTw" id="7DvO2Ma0mj_" role="2Oq$k0">
-                <ref role="3cqZAo" node="7DvO2Ma0klb" resolve="macroTemplateIndex" />
-              </node>
-              <node concept="liA8E" id="6UWSvq4QBqP" role="2OqNvi">
-                <ref role="37wK5l" to="hano:6UWSvq4Qqe$" resolve="macroTemplate" />
-                <node concept="37vLTw" id="5yr01fDuQDE" role="37wK5m">
-                  <ref role="3cqZAo" node="7DvO2M9IiO2" resolve="templateRef" />
-                </node>
-                <node concept="16syzq" id="7P_FdVPvnni" role="3PaCim">
-                  <ref role="16sUi3" node="7DvO2M9IiOw" resolve="Cfg" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="6UWSvq4QCub" role="3cqZAp">
-          <node concept="3K4zz7" id="6UWSvq4QF6R" role="3cqZAk">
-            <node concept="2OqwBi" id="2Y70AYExKWm" role="3K4GZi">
-              <node concept="37vLTw" id="2Y70AYExK6g" role="2Oq$k0">
-                <ref role="3cqZAo" node="7DvO2M9IiO4" resolve="action" />
-              </node>
-              <node concept="liA8E" id="2Y70AYExLwn" role="2OqNvi">
-                <ref role="37wK5l" to="psr6:2Y70AYExG1D" resolve="defaultValue" />
-              </node>
-            </node>
-            <node concept="3y3z36" id="6UWSvq4QDQy" role="3K4Cdx">
-              <node concept="10Nm6u" id="6UWSvq4QEu_" role="3uHU7w" />
-              <node concept="37vLTw" id="6UWSvq4QCZK" role="3uHU7B">
-                <ref role="3cqZAo" node="7DvO2M9IiOd" resolve="macroTemplate" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="6UWSvq4QHZc" role="3K4E3e">
-              <node concept="37vLTw" id="6UWSvq4QHZd" role="2Oq$k0">
-                <ref role="3cqZAo" node="7DvO2M9IiO4" resolve="action" />
-              </node>
-              <node concept="liA8E" id="6UWSvq4QHZe" role="2OqNvi">
-                <ref role="37wK5l" to="psr6:1eKXYsjvTXf" resolve="doAction" />
-                <node concept="37vLTw" id="6UWSvq4QHZf" role="37wK5m">
-                  <ref role="3cqZAo" node="7DvO2M9IiOd" resolve="macroTemplate" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="16euLQ" id="7DvO2M9IiOw" role="16eVyc">
-        <property role="TrG5h" value="Cfg" />
-        <node concept="3uibUv" id="7DvO2M9IiOx" role="3ztrMU">
-          <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-        </node>
-      </node>
-      <node concept="16euLQ" id="7DvO2M9IiOy" role="16eVyc">
-        <property role="TrG5h" value="R" />
-      </node>
-    </node>
     <node concept="3Tm1VV" id="7DvO2M9IiOz" role="1B3o_S" />
-    <node concept="2tJIrI" id="7DvO2M9IiO$" role="jymVt" />
     <node concept="312cEg" id="7DvO2Ma0klb" role="jymVt">
       <property role="TrG5h" value="macroTemplateIndex" />
       <node concept="3Tm6S6" id="7DvO2Ma0klc" role="1B3o_S" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
index 7f2efea6..d847140c 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
@@ -105,7 +105,6 @@
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
-      <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
@@ -325,27 +324,6 @@
     <node concept="2tJIrI" id="2N2MQGCMNOd" role="jymVt" />
     <node concept="3Tm1VV" id="2N2MQGCMVqE" role="1B3o_S" />
   </node>
-  <node concept="3HP615" id="1hX44vMVmqt">
-    <property role="TrG5h" value="Getter" />
-    <node concept="2tJIrI" id="1hX44vMVmqR" role="jymVt" />
-    <node concept="3clFb_" id="1hX44vMVmr4" role="jymVt">
-      <property role="TrG5h" value="get" />
-      <node concept="37vLTG" id="1hX44vMVmsA" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <node concept="3Tqbb2" id="1hX44vMVmsW" role="1tU5fm" />
-      </node>
-      <node concept="16syzq" id="1hX44vMVmva" role="3clF45">
-        <ref role="16sUi3" node="1hX44vMVmuy" resolve="T" />
-      </node>
-      <node concept="3Tm1VV" id="1hX44vMVmr7" role="1B3o_S" />
-      <node concept="3clFbS" id="1hX44vMVmr8" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="1hX44vMVmqW" role="jymVt" />
-    <node concept="3Tm1VV" id="1hX44vMVmqu" role="1B3o_S" />
-    <node concept="16euLQ" id="1hX44vMVmuy" role="16eVyc">
-      <property role="TrG5h" value="T" />
-    </node>
-  </node>
   <node concept="312cEu" id="1hX44vNlvEV">
     <property role="TrG5h" value="AbstractMacroTemplate" />
     <property role="1sVAO0" value="true" />
@@ -416,190 +394,7 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="5yr01fDEuCz" role="jymVt" />
-    <node concept="3clFb_" id="5itBwM7dCBe" role="jymVt">
-      <property role="TrG5h" value="withArgs" />
-      <node concept="37vLTG" id="5itBwM7dCBf" role="3clF46">
-        <property role="TrG5h" value="args" />
-        <node concept="8X2XB" id="5itBwM7dCBg" role="1tU5fm">
-          <node concept="3uibUv" id="5itBwM7dCBh" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="16syzq" id="5itBwM7dCBm" role="3clF45">
-        <ref role="16sUi3" node="1hX44vNlw2n" resolve="Cfg" />
-      </node>
-      <node concept="3Tm1VV" id="5itBwM7dCBj" role="1B3o_S" />
-      <node concept="2AHcQZ" id="5itBwM7dCBl" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-      <node concept="3clFbS" id="5itBwM7dCBn" role="3clF47">
-        <node concept="YS8fn" id="5itBwM7ccFJ" role="3cqZAp">
-          <node concept="2ShNRf" id="5itBwM7ccI8" role="YScLw">
-            <node concept="1pGfFk" id="5itBwM7cdCa" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7dCBo" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5itBwM7dEa2" role="jymVt" />
-    <node concept="3clFb_" id="5itBwM7dCBp" role="jymVt">
-      <property role="TrG5h" value="doExpand" />
-      <node concept="3uibUv" id="5itBwM7dCBq" role="3clF45">
-        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-      </node>
-      <node concept="3Tm1VV" id="5itBwM7dCBr" role="1B3o_S" />
-      <node concept="37vLTG" id="5itBwM7dCBt" role="3clF46">
-        <property role="TrG5h" value="inputNode" />
-        <node concept="3Tqbb2" id="5itBwM7dCBu" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="5itBwM7dCBv" role="3clF46">
-        <property role="TrG5h" value="logical" />
-        <node concept="3uibUv" id="5itBwM7dCBw" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-          <node concept="3uibUv" id="5itBwM7dCBx" role="11_B2D">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="5itBwM7dCBy" role="3clF46">
-        <property role="TrG5h" value="session" />
-        <node concept="3uibUv" id="5itBwM7dCBz" role="1tU5fm">
-          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7dCB$" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-      <node concept="3clFbS" id="5itBwM7dCB_" role="3clF47">
-        <node concept="YS8fn" id="5itBwM7dEIg" role="3cqZAp">
-          <node concept="2ShNRf" id="5itBwM7dEIh" role="YScLw">
-            <node concept="1pGfFk" id="5itBwM7dEIi" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7dCBA" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5itBwM7dF85" role="jymVt" />
-    <node concept="3clFb_" id="5itBwM7dCBD" role="jymVt">
-      <property role="TrG5h" value="doExpand" />
-      <node concept="3uibUv" id="5itBwM7dCBE" role="3clF45">
-        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-      </node>
-      <node concept="3Tm1VV" id="5itBwM7dCBF" role="1B3o_S" />
-      <node concept="37vLTG" id="5itBwM7dCBH" role="3clF46">
-        <property role="TrG5h" value="inputConcept" />
-        <node concept="3bZ5Sz" id="5itBwM7dCBI" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="5itBwM7dCBJ" role="3clF46">
-        <property role="TrG5h" value="logical" />
-        <node concept="3uibUv" id="5itBwM7dCBK" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-          <node concept="3uibUv" id="5itBwM7dCBL" role="11_B2D">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="5itBwM7dCBM" role="3clF46">
-        <property role="TrG5h" value="session" />
-        <node concept="3uibUv" id="5itBwM7dCBN" role="1tU5fm">
-          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7dCBO" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-      <node concept="3clFbS" id="5itBwM7dCBP" role="3clF47">
-        <node concept="YS8fn" id="5itBwM7dG7M" role="3cqZAp">
-          <node concept="2ShNRf" id="5itBwM7dG7N" role="YScLw">
-            <node concept="1pGfFk" id="5itBwM7dG7O" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7dCBQ" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5itBwM7dG$M" role="jymVt" />
-    <node concept="3clFb_" id="5itBwM7dCBT" role="jymVt">
-      <property role="TrG5h" value="doCall" />
-      <node concept="3uibUv" id="5itBwM7dCBU" role="3clF45">
-        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-      </node>
-      <node concept="3Tm1VV" id="5itBwM7dCBV" role="1B3o_S" />
-      <node concept="37vLTG" id="5itBwM7dCBX" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="16syzq" id="5itBwM7dCC5" role="1tU5fm">
-          <ref role="16sUi3" node="1hX44vNlw2n" resolve="Cfg" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5itBwM7dCBZ" role="3clF46">
-        <property role="TrG5h" value="logical" />
-        <node concept="3uibUv" id="5itBwM7dCC0" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-          <node concept="3uibUv" id="5itBwM7dCC1" role="11_B2D">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="5itBwM7dCC2" role="3clF46">
-        <property role="TrG5h" value="session" />
-        <node concept="3uibUv" id="5itBwM7dCC3" role="1tU5fm">
-          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7dCC4" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-      <node concept="3clFbS" id="5itBwM7dCC6" role="3clF47">
-        <node concept="YS8fn" id="5itBwM7dH9g" role="3cqZAp">
-          <node concept="2ShNRf" id="5itBwM7dH9h" role="YScLw">
-            <node concept="1pGfFk" id="5itBwM7dH9i" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7dCC7" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="5itBwM7dHzn" role="jymVt" />
-    <node concept="3clFb_" id="1eKXYsjvsWg" role="jymVt">
-      <property role="TrG5h" value="withInputNode" />
-      <node concept="37vLTG" id="1eKXYsjvsWh" role="3clF46">
-        <property role="TrG5h" value="inputNode" />
-        <node concept="3Tqbb2" id="1eKXYsjvsWi" role="1tU5fm" />
-      </node>
-      <node concept="16syzq" id="1eKXYsjvtcb" role="3clF45">
-        <ref role="16sUi3" node="1hX44vNlw2n" resolve="Cfg" />
-      </node>
-      <node concept="3Tmbuc" id="60NbDCXHdjy" role="1B3o_S" />
-      <node concept="3clFbS" id="1eKXYsjvsWl" role="3clF47">
-        <node concept="YS8fn" id="5itBwM7fIVq" role="3cqZAp">
-          <node concept="2ShNRf" id="5itBwM7fIVr" role="YScLw">
-            <node concept="1pGfFk" id="5itBwM7fIVs" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7bHmo" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5yr01fDEv10" role="jymVt" />
     <node concept="3clFb_" id="5yr01fDEv3T" role="jymVt">
       <property role="TrG5h" value="getTemplateRef" />
       <node concept="3uibUv" id="5yr01fDEvaQ" role="3clF45">
@@ -666,122 +461,7 @@
       <node concept="3Tm1VV" id="5itBwM9tCq4" role="1B3o_S" />
       <node concept="3clFbS" id="5itBwM9tCq5" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="5itBwM9tBY3" role="jymVt" />
-    <node concept="3clFb_" id="1eKXYsjvsWn" role="jymVt">
-      <property role="TrG5h" value="withArgs" />
-      <node concept="37vLTG" id="1eKXYsjvsWo" role="3clF46">
-        <property role="TrG5h" value="args" />
-        <node concept="8X2XB" id="1eKXYsjvsWp" role="1tU5fm">
-          <node concept="3uibUv" id="1eKXYsjvsWq" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="16syzq" id="1eKXYsjvtmV" role="3clF45">
-        <ref role="16sUi3" node="1eKXYsjvsL$" resolve="T" />
-      </node>
-      <node concept="3Tm1VV" id="1eKXYsjvsWs" role="1B3o_S" />
-      <node concept="3clFbS" id="1eKXYsjvsWt" role="3clF47" />
-      <node concept="2AHcQZ" id="5itBwM7bKJ$" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4MEOIDG7Abc" role="jymVt" />
-    <node concept="3clFb_" id="60NbDCXG$nh" role="jymVt">
-      <property role="TrG5h" value="doExpand" />
-      <node concept="3uibUv" id="60NbDCXG$ni" role="3clF45">
-        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-      </node>
-      <node concept="3Tm1VV" id="60NbDCXG$nj" role="1B3o_S" />
-      <node concept="3clFbS" id="60NbDCXG$nk" role="3clF47" />
-      <node concept="37vLTG" id="60NbDCXG$nl" role="3clF46">
-        <property role="TrG5h" value="inputNode" />
-        <node concept="3Tqbb2" id="60NbDCXGA53" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="60NbDCXG$nn" role="3clF46">
-        <property role="TrG5h" value="logical" />
-        <node concept="3uibUv" id="1HWyn8j9WNN" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-          <node concept="3uibUv" id="1HWyn8j9WQv" role="11_B2D">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="60NbDCXG$np" role="3clF46">
-        <property role="TrG5h" value="session" />
-        <node concept="3uibUv" id="60NbDCXG$nq" role="1tU5fm">
-          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7bLD_" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="5DUvKnrzig5" role="jymVt" />
-    <node concept="3clFb_" id="5DUvKnrzhU$" role="jymVt">
-      <property role="TrG5h" value="doExpand" />
-      <node concept="3uibUv" id="5DUvKnrzhU_" role="3clF45">
-        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-      </node>
-      <node concept="3Tm1VV" id="5DUvKnrzhUA" role="1B3o_S" />
-      <node concept="3clFbS" id="5DUvKnrzhUB" role="3clF47" />
-      <node concept="37vLTG" id="5DUvKnrzhUC" role="3clF46">
-        <property role="TrG5h" value="inputConcept" />
-        <node concept="3bZ5Sz" id="5DUvKnrzin1" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="5DUvKnrzhUE" role="3clF46">
-        <property role="TrG5h" value="logical" />
-        <node concept="3uibUv" id="5DUvKnrzhUF" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-          <node concept="3uibUv" id="5DUvKnrzhUG" role="11_B2D">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="5DUvKnrzhUH" role="3clF46">
-        <property role="TrG5h" value="session" />
-        <node concept="3uibUv" id="5DUvKnrzhUI" role="1tU5fm">
-          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7bM$8" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6DOfTm$eR_X" role="jymVt" />
-    <node concept="3clFb_" id="1eKXYsjvsWF" role="jymVt">
-      <property role="TrG5h" value="doCall" />
-      <node concept="3uibUv" id="1eKXYsjvsWG" role="3clF45">
-        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-      </node>
-      <node concept="3Tm1VV" id="1eKXYsjvsWH" role="1B3o_S" />
-      <node concept="3clFbS" id="1eKXYsjvsWI" role="3clF47" />
-      <node concept="37vLTG" id="1eKXYsjvsWJ" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="16syzq" id="1eKXYsjvtUf" role="1tU5fm">
-          <ref role="16sUi3" node="1eKXYsjvsL$" resolve="T" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="1eKXYsjvsWL" role="3clF46">
-        <property role="TrG5h" value="logical" />
-        <node concept="3uibUv" id="1HWyn8j9WS8" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-          <node concept="3uibUv" id="1HWyn8j9WVd" role="11_B2D">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="1eKXYsjvsWN" role="3clF46">
-        <property role="TrG5h" value="session" />
-        <node concept="3uibUv" id="1eKXYsjvsWO" role="1tU5fm">
-          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7bNSr" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="Ya9Z$kGXv_" role="jymVt" />
     <node concept="3Tm1VV" id="1hX44vNnjJ_" role="1B3o_S" />
     <node concept="16euLQ" id="1eKXYsjvsL$" role="16eVyc">
       <property role="TrG5h" value="T" />
@@ -790,23 +470,6 @@
       </node>
     </node>
   </node>
-  <node concept="3HP615" id="7IysFeAhp4q">
-    <property role="TrG5h" value="Init" />
-    <node concept="2tJIrI" id="7IysFeAhp9G" role="jymVt" />
-    <node concept="3clFb_" id="7IysFeAhp5H" role="jymVt">
-      <property role="TrG5h" value="get" />
-      <node concept="16syzq" id="7IysFeAhp7b" role="3clF45">
-        <ref role="16sUi3" node="7IysFeAhp5y" resolve="T" />
-      </node>
-      <node concept="3Tm1VV" id="7IysFeAhp5K" role="1B3o_S" />
-      <node concept="3clFbS" id="7IysFeAhp5L" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="7IysFeAhp93" role="jymVt" />
-    <node concept="3Tm1VV" id="7IysFeAhp4r" role="1B3o_S" />
-    <node concept="16euLQ" id="7IysFeAhp5y" role="16eVyc">
-      <property role="TrG5h" value="T" />
-    </node>
-  </node>
   <node concept="312cEu" id="4MEOIDFA48I">
     <property role="TrG5h" value="AbstractTermDeclaration" />
     <property role="1sVAO0" value="true" />
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 48570680..e76581f0 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
@@ -2241,92 +2241,7 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="36tQV5B3UL3" role="jymVt" />
-    <node concept="3clFb_" id="18kNIl1wWgU" role="jymVt">
-      <property role="TrG5h" value="expandMacro" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="37vLTG" id="18kNIl1wWhK" role="3clF46">
-        <property role="TrG5h" value="logical" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="1HWyn8j8RX2" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-          <node concept="3uibUv" id="1HWyn8j8S22" role="11_B2D">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="18kNIl1x7Wn" role="3clF46">
-        <property role="TrG5h" value="inputNode" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3Tqbb2" id="18kNIl1x7Z0" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="4JJCDImUub8" role="3clF45">
-        <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
-      </node>
-      <node concept="3Tm1VV" id="18kNIl1wWgX" role="1B3o_S" />
-      <node concept="3clFbS" id="18kNIl1wWgY" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5DUvKnrzbv6" role="jymVt" />
-    <node concept="3clFb_" id="5DUvKnrzaID" role="jymVt">
-      <property role="TrG5h" value="expandMacro" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="37vLTG" id="5DUvKnrzaIE" role="3clF46">
-        <property role="TrG5h" value="logical" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="5DUvKnrzaIF" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-          <node concept="3uibUv" id="5DUvKnrzaIG" role="11_B2D">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="5DUvKnrzaIH" role="3clF46">
-        <property role="TrG5h" value="inputConcept" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3bZ5Sz" id="5DUvKnrzcam" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="5DUvKnrzaIJ" role="3clF45">
-        <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
-      </node>
-      <node concept="3Tm1VV" id="5DUvKnrzaIK" role="1B3o_S" />
-      <node concept="3clFbS" id="5DUvKnrzaIL" role="3clF47" />
-    </node>
     <node concept="2tJIrI" id="4MEOIDFgTKR" role="jymVt" />
-    <node concept="3clFb_" id="4MEOIDFgV3a" role="jymVt">
-      <property role="TrG5h" value="callMacro" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="37vLTG" id="4MEOIDFgV3b" role="3clF46">
-        <property role="TrG5h" value="logical" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="1HWyn8j8S3X" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-          <node concept="3uibUv" id="1HWyn8j8S7p" role="11_B2D">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="4MEOIDFgZnJ" role="3clF46">
-        <property role="TrG5h" value="macroTemplateRef" />
-        <node concept="3uibUv" id="5yr01fDuRRf" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="4MEOIDFgV3f" role="3clF46">
-        <property role="TrG5h" value="args" />
-        <property role="3TUv4t" value="true" />
-        <node concept="8X2XB" id="4MEOIDFgV3g" role="1tU5fm">
-          <node concept="3uibUv" id="4MEOIDFgV3h" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="4MEOIDFgV3i" role="3clF45">
-        <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
-      </node>
-      <node concept="3Tm1VV" id="4MEOIDFgV3j" role="1B3o_S" />
-      <node concept="3clFbS" id="4MEOIDFgV3k" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="oI9YrJ5uv" role="jymVt" />
     <node concept="3clFb_" id="5itBwM7VpML" role="jymVt">
       <property role="TrG5h" value="expandMacro" />
       <property role="1EzhhJ" value="true" />