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 44f632d0..5d356c1e 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
@@ -315,7 +315,6 @@
       <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="ln" index="2b32R4">
         <child id="1168278589236" name="sourceNodesQuery" index="2P8S$" />
       </concept>
-      <concept id="1202776937179" name="jetbrains.mps.lang.generator.structure.AbandonInput_RuleConsequence" flags="lg" index="b5Tf3" />
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
         <child id="1219952894531" name="dropRootRule" index="aQYdv" />
         <child id="1200911492601" name="mappingLabel" index="2rTMjI" />
@@ -638,10 +637,6 @@
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
       <concept id="6870613620390542976" name="jetbrains.mps.lang.smodel.structure.ConceptAliasOperation" flags="ng" index="3n3YKJ" />
-      <concept id="6039268229364358244" name="jetbrains.mps.lang.smodel.structure.ExactConceptCase" flags="ng" index="1pnPoh">
-        <child id="6039268229364358388" name="body" index="1pnPq1" />
-        <child id="6039268229364358387" name="concept" index="1pnPq6" />
-      </concept>
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
@@ -649,10 +644,6 @@
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
       <concept id="1144146199828" name="jetbrains.mps.lang.smodel.structure.Node_CopyOperation" flags="nn" index="1$rogu" />
-      <concept id="5944356402132808749" name="jetbrains.mps.lang.smodel.structure.ConceptSwitchStatement" flags="nn" index="1_3QMa">
-        <child id="5944356402132808753" name="case" index="1_3QMm" />
-        <child id="5944356402132808752" name="expression" index="1_3QMn" />
-      </concept>
       <concept id="1139867745658" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithNewOperation" flags="nn" index="1_qnLN">
         <reference id="1139867957129" name="concept" index="1_rbq0" />
       </concept>
@@ -743,7 +734,6 @@
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
-      <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
@@ -754,7 +744,6 @@
         <child id="1225711182005" name="list" index="1y566C" />
         <child id="1225711191269" name="index" index="1y58nS" />
       </concept>
-      <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -4910,54 +4899,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="7smgEqggfxC" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:7smgEqggf12" resolve="NodeAnchor" />
-      <node concept="1Koe21" id="34$A1MfwUoo" role="1lVwrX">
-        <node concept="3clFb_" id="34$A1MfwUox" role="1Koe22">
-          <property role="TrG5h" value="context" />
-          <node concept="3clFbS" id="34$A1MfwUoF" role="3clF47">
-            <node concept="3cpWs8" id="5yr01fEFrl$" role="3cqZAp">
-              <node concept="3cpWsn" id="5yr01fEFrlB" role="3cpWs9">
-                <property role="TrG5h" value="node" />
-                <node concept="3Tqbb2" id="5yr01fEFrly" role="1tU5fm" />
-                <node concept="10Nm6u" id="5yr01fEFroJ" role="33vP2m" />
-              </node>
-            </node>
-            <node concept="3clFbH" id="5yr01fEFsRa" role="3cqZAp" />
-            <node concept="3clFbF" id="5yr01fEFr3Z" role="3cqZAp">
-              <node concept="2OqwBi" id="5yr01fEFr41" role="3clFbG">
-                <node concept="2JrnkZ" id="5yr01fEFr42" role="2Oq$k0">
-                  <node concept="37vLTw" id="5yr01fEFr43" role="2JrQYb">
-                    <ref role="3cqZAo" node="5yr01fEFrlB" resolve="node" />
-                    <node concept="29HgVG" id="5yr01fEFreL" role="lGtFl">
-                      <node concept="3NFfHV" id="5yr01fEFrvp" role="3NFExx">
-                        <node concept="3clFbS" id="5yr01fEFrvq" role="2VODD2">
-                          <node concept="3clFbF" id="5yr01fEFrxG" role="3cqZAp">
-                            <node concept="2OqwBi" id="5yr01fEFrFD" role="3clFbG">
-                              <node concept="30H73N" id="5yr01fEFrxF" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="5yr01fEFrPN" role="2OqNvi">
-                                <ref role="3Tt5mk" to="wq2x:7smgEqggf13" resolve="node" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="5yr01fEFr44" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                </node>
-                <node concept="raruj" id="5yr01fEFr9N" role="lGtFl" />
-              </node>
-            </node>
-            <node concept="3clFbH" id="5yr01fEFqXh" role="3cqZAp" />
-          </node>
-          <node concept="3Tm6S6" id="34$A1MfwUKw" role="1B3o_S" />
-          <node concept="3cqZAl" id="34$A1MfwUR7" role="3clF45" />
-        </node>
-      </node>
-    </node>
     <node concept="2rT7sh" id="7jC45KceoRk" role="2rTMjI">
       <property role="TrG5h" value="logical_local_declaration" />
       <ref role="2rZz_L" to="tpee:fzcpWvJ" resolve="LocalVariableDeclaration" />
@@ -4986,21 +4927,11 @@
       <ref role="2rTdP9" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
       <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
     </node>
-    <node concept="2rT7sh" id="7IysFeAaXEh" role="2rTMjI">
-      <property role="TrG5h" value="macroParam_field" />
-      <ref role="2rTdP9" to="wq2x:7IysFeA0yb0" resolve="MacroParameterDeclaration" />
-      <ref role="2rZz_L" to="tpee:fz12cDC" resolve="FieldDeclaration" />
-    </node>
     <node concept="2rT7sh" id="7XmdqtdHiM8" role="2rTMjI">
       <property role="TrG5h" value="macro_token_class" />
       <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
       <ref role="2rTdP9" to="wq2x:5itBwM56wgT" resolve="MacroTemplate" />
     </node>
-    <node concept="2rT7sh" id="7IysFeAiAcO" role="2rTMjI">
-      <property role="TrG5h" value="macro_inputNode_variable" />
-      <ref role="2rZz_L" to="tpee:fz3uBXI" resolve="VariableDeclaration" />
-      <ref role="2rTdP9" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-    </node>
     <node concept="2rT7sh" id="6EY0p2x1Uxb" role="2rTMjI">
       <property role="TrG5h" value="macro_inputNode_field" />
       <ref role="2rZz_L" to="tpee:fz12cDC" resolve="FieldDeclaration" />
@@ -5011,11 +4942,6 @@
       <ref role="2rZz_L" to="tpee:fzclF84" resolve="ConstructorDeclaration" />
       <ref role="2rTdP9" to="wq2x:5itBwM56wgT" resolve="MacroTemplate" />
     </node>
-    <node concept="2rT7sh" id="7IysFeAHWd7" role="2rTMjI">
-      <property role="TrG5h" value="macro_template_logical" />
-      <ref role="2rTdP9" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-      <ref role="2rZz_L" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
-    </node>
     <node concept="2rT7sh" id="5itBwM61GZv" role="2rTMjI">
       <property role="TrG5h" value="macro_param_field" />
       <ref role="2rZz_L" to="tpee:fz12cDC" resolve="FieldDeclaration" />
@@ -5053,405 +4979,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="7IysFeAYduU" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:7IysFeA5Lco" resolve="InitBlock" />
-      <node concept="14YyZ8" id="7IysFeB5sdu" role="1lVwrX">
-        <node concept="14ZrTv" id="7IysFeB5sdy" role="14ZwWg">
-          <node concept="30G5F_" id="7IysFeB5sdz" role="150hEN">
-            <node concept="3clFbS" id="7IysFeB5sd$" role="2VODD2">
-              <node concept="3clFbF" id="7IysFeB5skN" role="3cqZAp">
-                <node concept="2OqwBi" id="7IysFeB5tDM" role="3clFbG">
-                  <node concept="2OqwBi" id="7IysFeB5sy0" role="2Oq$k0">
-                    <node concept="30H73N" id="7IysFeB5skM" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="7IysFeB5t9L" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
-                    </node>
-                  </node>
-                  <node concept="2qgKlT" id="7IysFeB5ukJ" role="2OqNvi">
-                    <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1Koe21" id="7IysFeB5wtJ" role="150oIE">
-            <node concept="3clFb_" id="7IysFeB5wGH" role="1Koe22">
-              <property role="TrG5h" value="context" />
-              <node concept="3Tm6S6" id="7IysFeB5wGR" role="1B3o_S" />
-              <node concept="3uibUv" id="7IysFeB5wH1" role="3clF45">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-              <node concept="3clFbS" id="7IysFeB5wNh" role="3clF47">
-                <node concept="3clFbF" id="7IysFeB9OpC" role="3cqZAp">
-                  <node concept="10Nm6u" id="7IysFeB9OpD" role="3clFbG">
-                    <node concept="raruj" id="7IysFeB9OpE" role="lGtFl" />
-                    <node concept="29HgVG" id="7IysFeB9OpF" role="lGtFl">
-                      <node concept="3NFfHV" id="7IysFeB9OpG" role="3NFExx">
-                        <node concept="3clFbS" id="7IysFeB9OpH" role="2VODD2">
-                          <node concept="3clFbF" id="7IysFeB9OpI" role="3cqZAp">
-                            <node concept="2OqwBi" id="7IysFeB9OpJ" role="3clFbG">
-                              <node concept="1PxgMI" id="7IysFeB9OpK" role="2Oq$k0">
-                                <property role="1BlNFB" value="true" />
-                                <node concept="2OqwBi" id="7IysFeB9OpL" role="1m5AlR">
-                                  <node concept="2OqwBi" id="7IysFeB9OpM" role="2Oq$k0">
-                                    <node concept="30H73N" id="7IysFeB9OpN" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="7IysFeB9OOK" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
-                                    </node>
-                                  </node>
-                                  <node concept="2qgKlT" id="7IysFeB9OpP" role="2OqNvi">
-                                    <ref role="37wK5l" to="tpek:4GU1DgEHJ2u" resolve="getFirstStatement" />
-                                  </node>
-                                </node>
-                                <node concept="chp4Y" id="6fXjIfxgnfR" role="3oSUPX">
-                                  <ref role="cht4Q" to="tpee:fzclF8j" resolve="ExpressionStatement" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="7IysFeB9OpQ" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:fzclF8k" resolve="expression" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="gft3U" id="7IysFeAYl_Z" role="14YRTM">
-          <node concept="2OqwBi" id="7IysFeAYlA0" role="gfFT$">
-            <node concept="2ShNRf" id="7IysFeAYlA1" role="2Oq$k0">
-              <node concept="YeOm9" id="7IysFeAYlA2" role="2ShVmc">
-                <node concept="1Y3b0j" id="7IysFeAYlA3" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                  <ref role="1Y3XeK" to="psr6:7IysFeAhp4q" resolve="Init" />
-                  <node concept="3Tm1VV" id="7IysFeAYlA4" role="1B3o_S" />
-                  <node concept="3clFb_" id="7IysFeAYlA5" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="get" />
-                    <node concept="3Tm1VV" id="7IysFeAYlA7" role="1B3o_S" />
-                    <node concept="3clFbS" id="7IysFeAYlA8" role="3clF47">
-                      <node concept="3clFbF" id="7IysFeAYlA9" role="3cqZAp">
-                        <node concept="10Nm6u" id="7IysFeAYlAa" role="3clFbG" />
-                        <node concept="2b32R4" id="7IysFeAYlAb" role="lGtFl">
-                          <node concept="3JmXsc" id="7IysFeAYlAc" role="2P8S$">
-                            <node concept="3clFbS" id="7IysFeAYlAd" role="2VODD2">
-                              <node concept="3clFbF" id="7IysFeAYlAe" role="3cqZAp">
-                                <node concept="2OqwBi" id="7IysFeAYlAf" role="3clFbG">
-                                  <node concept="2OqwBi" id="7IysFeAYlAg" role="2Oq$k0">
-                                    <node concept="30H73N" id="7IysFeAYlAh" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="7IysFeAYnqm" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
-                                    </node>
-                                  </node>
-                                  <node concept="3Tsc0h" id="7IysFeAYlAj" role="2OqNvi">
-                                    <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbH" id="7IysFeAYlAk" role="3cqZAp" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3uibUv" id="7IysFeAYttC" role="3clF45">
-                      <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                      <node concept="29HgVG" id="7IysFeAYttD" role="lGtFl">
-                        <node concept="3NFfHV" id="7IysFeAYttE" role="3NFExx">
-                          <node concept="3clFbS" id="7IysFeAYttF" role="2VODD2">
-                            <node concept="3clFbF" id="7IysFeAYttG" role="3cqZAp">
-                              <node concept="2OqwBi" id="7IysFeAYttH" role="3clFbG">
-                                <node concept="2OqwBi" id="7IysFeAYttI" role="2Oq$k0">
-                                  <node concept="30H73N" id="7IysFeAYttJ" role="2Oq$k0" />
-                                  <node concept="2Xjw5R" id="7IysFeAYttK" role="2OqNvi">
-                                    <node concept="1xMEDy" id="7IysFeAYttL" role="1xVPHs">
-                                      <node concept="chp4Y" id="7IysFeAYttM" role="ri$Ld">
-                                        <ref role="cht4Q" to="wq2x:7IysFeA0yb0" resolve="MacroParameterDeclaration" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3TrEf2" id="7IysFeAYttN" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:7IysFeA0ybI" resolve="type" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3uibUv" id="7IysFeAYm50" role="2Ghqu4">
-                    <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                    <node concept="29HgVG" id="7IysFeAYodG" role="lGtFl">
-                      <node concept="3NFfHV" id="7IysFeAYorg" role="3NFExx">
-                        <node concept="3clFbS" id="7IysFeAYorh" role="2VODD2">
-                          <node concept="3clFbF" id="7IysFeAYoKh" role="3cqZAp">
-                            <node concept="2OqwBi" id="7IysFeAYrti" role="3clFbG">
-                              <node concept="2OqwBi" id="7IysFeAYp1b" role="2Oq$k0">
-                                <node concept="30H73N" id="7IysFeAYoKg" role="2Oq$k0" />
-                                <node concept="2Xjw5R" id="7IysFeAYpIH" role="2OqNvi">
-                                  <node concept="1xMEDy" id="7IysFeAYpIJ" role="1xVPHs">
-                                    <node concept="chp4Y" id="7IysFeAYqa4" role="ri$Ld">
-                                      <ref role="cht4Q" to="wq2x:7IysFeA0yb0" resolve="MacroParameterDeclaration" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="7IysFeAYsji" role="2OqNvi">
-                                <ref role="3Tt5mk" to="wq2x:7IysFeA0ybI" resolve="type" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="liA8E" id="7IysFeAYlAm" role="2OqNvi">
-              <ref role="37wK5l" node="7IysFeAYlA5" resolve="get" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="6DOfTm$$E65" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:6DOfTm$$CHj" resolve="MacroInputReference" />
-      <node concept="14YyZ8" id="6EY0p2x1XUi" role="1lVwrX">
-        <node concept="14ZrTv" id="6EY0p2x1XUm" role="14ZwWg">
-          <node concept="30G5F_" id="6EY0p2x1XUn" role="150hEN">
-            <node concept="3clFbS" id="6EY0p2x1XUo" role="2VODD2">
-              <node concept="3clFbF" id="6EY0p2x1XUC" role="3cqZAp">
-                <node concept="2OqwBi" id="6EY0p2x204T" role="3clFbG">
-                  <node concept="2OqwBi" id="6EY0p2x1Ztt" role="2Oq$k0">
-                    <node concept="30H73N" id="6EY0p2x1XUB" role="2Oq$k0" />
-                    <node concept="2Xjw5R" id="6EY0p2x1ZLA" role="2OqNvi">
-                      <node concept="1xMEDy" id="6EY0p2x1ZLC" role="1xVPHs">
-                        <node concept="chp4Y" id="6EY0p2x1ZLQ" role="ri$Ld">
-                          <ref role="cht4Q" to="wq2x:7IysFeA0yb0" resolve="MacroParameterDeclaration" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="6EY0p2x20zZ" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1Koe21" id="6DOfTm$$I_M" role="150oIE">
-            <node concept="3clFb_" id="6DOfTm$$I_N" role="1Koe22">
-              <property role="TrG5h" value="context" />
-              <node concept="37vLTG" id="6DOfTm$$I_O" role="3clF46">
-                <property role="TrG5h" value="inputNode" />
-                <node concept="3Tqbb2" id="6DOfTm$$I_P" role="1tU5fm" />
-              </node>
-              <node concept="3Tm6S6" id="6DOfTm$$I_Q" role="1B3o_S" />
-              <node concept="3uibUv" id="6DOfTm$$I_R" role="3clF45">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-              <node concept="3clFbS" id="6DOfTm$$I_S" role="3clF47">
-                <node concept="3clFbF" id="6DOfTm$$I_T" role="3cqZAp">
-                  <node concept="37vLTw" id="6DOfTm$$I_U" role="3clFbG">
-                    <ref role="3cqZAo" node="6DOfTm$$I_O" resolve="inputNode" />
-                    <node concept="raruj" id="6DOfTm$$I_V" role="lGtFl" />
-                    <node concept="1ZhdrF" id="6DOfTm$$I_W" role="lGtFl">
-                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                      <property role="2qtEX8" value="variableDeclaration" />
-                      <node concept="3$xsQk" id="6DOfTm$$I_X" role="3$ytzL">
-                        <node concept="3clFbS" id="6DOfTm$$I_Y" role="2VODD2">
-                          <node concept="3clFbF" id="6DOfTm$$I_Z" role="3cqZAp">
-                            <node concept="2OqwBi" id="6DOfTm$$IA0" role="3clFbG">
-                              <node concept="1iwH7S" id="6DOfTm$$IA1" role="2Oq$k0" />
-                              <node concept="1iwH70" id="6DOfTm$$IA2" role="2OqNvi">
-                                <ref role="1iwH77" node="7IysFeAiAcO" resolve="macro_inputNode_variable" />
-                                <node concept="2OqwBi" id="6DOfTm$$IA3" role="1iwH7V">
-                                  <node concept="30H73N" id="6DOfTm$$IA4" role="2Oq$k0" />
-                                  <node concept="2Xjw5R" id="6DOfTm$$IA5" role="2OqNvi">
-                                    <node concept="1xMEDy" id="6DOfTm$$IA6" role="1xVPHs">
-                                      <node concept="chp4Y" id="6DOfTm$$IA7" role="ri$Ld">
-                                        <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1Koe21" id="6EY0p2x20$x" role="14YRTM">
-          <node concept="312cEu" id="6EY0p2x20IG" role="1Koe22">
-            <property role="TrG5h" value="Context" />
-            <node concept="3clFb_" id="6EY0p2x20$y" role="jymVt">
-              <property role="TrG5h" value="context" />
-              <node concept="3Tm6S6" id="6EY0p2x20$_" role="1B3o_S" />
-              <node concept="3uibUv" id="6EY0p2x20$A" role="3clF45">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-              <node concept="3clFbS" id="6EY0p2x20$B" role="3clF47">
-                <node concept="3clFbF" id="6EY0p2x20LD" role="3cqZAp">
-                  <node concept="37vLTw" id="6EY0p2x20LB" role="3clFbG">
-                    <ref role="3cqZAo" node="6EY0p2x20JX" resolve="inputNode" />
-                    <node concept="raruj" id="6EY0p2x20LW" role="lGtFl" />
-                    <node concept="1ZhdrF" id="6EY0p2x20LY" role="lGtFl">
-                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                      <property role="2qtEX8" value="variableDeclaration" />
-                      <node concept="3$xsQk" id="6EY0p2x20LZ" role="3$ytzL">
-                        <node concept="3clFbS" id="6EY0p2x20M0" role="2VODD2">
-                          <node concept="3clFbF" id="6EY0p2x22r$" role="3cqZAp">
-                            <node concept="2OqwBi" id="6EY0p2x22r_" role="3clFbG">
-                              <node concept="1iwH7S" id="6EY0p2x22rA" role="2Oq$k0" />
-                              <node concept="1iwH70" id="6EY0p2x22rB" role="2OqNvi">
-                                <ref role="1iwH77" node="6EY0p2x1Uxb" resolve="macro_inputNode_field" />
-                                <node concept="2OqwBi" id="6EY0p2x22rC" role="1iwH7V">
-                                  <node concept="30H73N" id="6EY0p2x22rD" role="2Oq$k0" />
-                                  <node concept="2Xjw5R" id="6EY0p2x22rE" role="2OqNvi">
-                                    <node concept="1xMEDy" id="6EY0p2x22rF" role="1xVPHs">
-                                      <node concept="chp4Y" id="6EY0p2x22rG" role="ri$Ld">
-                                        <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="312cEg" id="6EY0p2x20JX" role="jymVt">
-              <property role="TrG5h" value="inputNode" />
-              <node concept="3Tm6S6" id="6EY0p2x20JY" role="1B3o_S" />
-              <node concept="3Tqbb2" id="6EY0p2x20KB" role="1tU5fm" />
-            </node>
-            <node concept="3Tm6S6" id="6EY0p2x20IK" role="1B3o_S" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="7IysFeAI2sm" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:7IysFeA99oR" resolve="MacroLogicalExpression" />
-      <node concept="1Koe21" id="7IysFeAI4Hr" role="1lVwrX">
-        <node concept="3clFb_" id="7IysFeAI4Hx" role="1Koe22">
-          <property role="TrG5h" value="context" />
-          <node concept="37vLTG" id="7IysFeAI4JL" role="3clF46">
-            <property role="TrG5h" value="logical" />
-            <node concept="3uibUv" id="7IysFeAI4Ka" role="1tU5fm">
-              <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
-            </node>
-          </node>
-          <node concept="3Tm6S6" id="7IysFeAI4HF" role="1B3o_S" />
-          <node concept="3uibUv" id="7IysFeAI4HP" role="3clF45">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-          <node concept="3clFbS" id="7IysFeAI4KI" role="3clF47">
-            <node concept="3clFbF" id="7IysFeAI4KT" role="3cqZAp">
-              <node concept="37vLTw" id="7IysFeAI4KS" role="3clFbG">
-                <ref role="3cqZAo" node="7IysFeAI4JL" resolve="logical" />
-                <node concept="raruj" id="7IysFeAI4LL" role="lGtFl" />
-                <node concept="1ZhdrF" id="7IysFeAI4NT" role="lGtFl">
-                  <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                  <property role="2qtEX8" value="variableDeclaration" />
-                  <node concept="3$xsQk" id="7IysFeAI4NU" role="3$ytzL">
-                    <node concept="3clFbS" id="7IysFeAI4NV" role="2VODD2">
-                      <node concept="3clFbF" id="7IysFeAI5qr" role="3cqZAp">
-                        <node concept="2OqwBi" id="7IysFeAI5$v" role="3clFbG">
-                          <node concept="1iwH7S" id="7IysFeAI5qq" role="2Oq$k0" />
-                          <node concept="1iwH70" id="7IysFeAI5KD" role="2OqNvi">
-                            <ref role="1iwH77" node="7IysFeAHWd7" resolve="macro_template_logical" />
-                            <node concept="2OqwBi" id="7IysFeAI66T" role="1iwH7V">
-                              <node concept="30H73N" id="7IysFeAI5VU" role="2Oq$k0" />
-                              <node concept="2Xjw5R" id="7IysFeAI6qK" role="2OqNvi">
-                                <node concept="1xMEDy" id="7IysFeAI6qM" role="1xVPHs">
-                                  <node concept="chp4Y" id="7IysFeAI6up" role="ri$Ld">
-                                    <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="7IysFeAs4x0" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:7IysFeA1uPa" resolve="MacroParameterReference" />
-      <node concept="1Koe21" id="7IysFeAs6Cn" role="1lVwrX">
-        <node concept="312cEu" id="7IysFeAs6Ct" role="1Koe22">
-          <property role="TrG5h" value="Context" />
-          <node concept="312cEg" id="7IysFeAs6Dy" role="jymVt">
-            <property role="TrG5h" value="field" />
-            <node concept="3Tm6S6" id="7IysFeAs6Dz" role="1B3o_S" />
-            <node concept="3uibUv" id="7IysFeAs6DS" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-          <node concept="3clFb_" id="7IysFeAs6FZ" role="jymVt">
-            <property role="TrG5h" value="context" />
-            <node concept="3uibUv" id="7IysFeAs6GN" role="3clF45">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-            <node concept="3Tm6S6" id="7IysFeAs6G2" role="1B3o_S" />
-            <node concept="3clFbS" id="7IysFeAs6G3" role="3clF47">
-              <node concept="3clFbF" id="7IysFeAs6K8" role="3cqZAp">
-                <node concept="37vLTw" id="7IysFeAs6K7" role="3clFbG">
-                  <ref role="3cqZAo" node="7IysFeAs6Dy" resolve="field" />
-                  <node concept="raruj" id="7IysFeAs6Ky" role="lGtFl" />
-                  <node concept="1ZhdrF" id="7IysFeAs6XS" role="lGtFl">
-                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                    <property role="2qtEX8" value="variableDeclaration" />
-                    <node concept="3$xsQk" id="7IysFeAs6XT" role="3$ytzL">
-                      <node concept="3clFbS" id="7IysFeAs6XU" role="2VODD2">
-                        <node concept="3clFbF" id="7IysFeAs7xv" role="3cqZAp">
-                          <node concept="2OqwBi" id="7IysFeAs7Ff" role="3clFbG">
-                            <node concept="1iwH7S" id="7IysFeAs7xu" role="2Oq$k0" />
-                            <node concept="1iwH70" id="7IysFeAs7QL" role="2OqNvi">
-                              <ref role="1iwH77" node="7IysFeAaXEh" resolve="macroParam_field" />
-                              <node concept="2OqwBi" id="7IysFeAs8cl" role="1iwH7V">
-                                <node concept="30H73N" id="7IysFeAs80s" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="7IysFeAs8y8" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:7IysFeA1uTj" resolve="parameter" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3Tm6S6" id="7IysFeAs6CL" role="1B3o_S" />
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="5itBwM7K1kc" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:5itBwM7J4Oh" resolve="ExpandMacroInputReference" />
       <node concept="1Koe21" id="5itBwM7K9HW" role="1lVwrX">
@@ -5847,710 +5374,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="10IUAVUq92w" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
-      <node concept="1Koe21" id="10IUAVUqcHp" role="1lVwrX">
-        <node concept="3clFb_" id="10IUAVUqcHv" role="1Koe22">
-          <property role="TrG5h" value="context" />
-          <node concept="37vLTG" id="10IUAVUqcIK" role="3clF46">
-            <property role="TrG5h" value="session" />
-            <node concept="3uibUv" id="10IUAVUqcJD" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-            </node>
-          </node>
-          <node concept="3Tm6S6" id="10IUAVUqcHD" role="1B3o_S" />
-          <node concept="3cqZAl" id="10IUAVUqcHN" role="3clF45" />
-          <node concept="3clFbS" id="10IUAVUqcKT" role="3clF47">
-            <node concept="3clFbF" id="10IUAVUqcL4" role="3cqZAp">
-              <node concept="2OqwBi" id="10IUAVUqcPH" role="3clFbG">
-                <node concept="37vLTw" id="10IUAVUqcL3" role="2Oq$k0">
-                  <ref role="3cqZAo" node="10IUAVUqcIK" resolve="session" />
-                  <node concept="1ZhdrF" id="10IUAVUry99" role="lGtFl">
-                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                    <property role="2qtEX8" value="variableDeclaration" />
-                    <node concept="3$xsQk" id="10IUAVUry9a" role="3$ytzL">
-                      <node concept="3clFbS" id="10IUAVUry9b" role="2VODD2">
-                        <node concept="3clFbF" id="10IUAVUrzgl" role="3cqZAp">
-                          <node concept="2OqwBi" id="10IUAVUrzgm" role="3clFbG">
-                            <node concept="1iwH7S" id="10IUAVUrzgn" role="2Oq$k0" />
-                            <node concept="1iwH70" id="10IUAVUrzgo" role="2OqNvi">
-                              <ref role="1iwH77" node="429xoypVg6q" resolve="apply_session_parameter" />
-                              <node concept="2OqwBi" id="10IUAVUrzgp" role="1iwH7V">
-                                <node concept="30H73N" id="10IUAVUrzgq" role="2Oq$k0" />
-                                <node concept="2Xjw5R" id="10IUAVUrzgr" role="2OqNvi">
-                                  <node concept="1xMEDy" id="10IUAVUrzgs" role="1xVPHs">
-                                    <node concept="chp4Y" id="10IUAVUrzgt" role="ri$Ld">
-                                      <ref role="cht4Q" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="10IUAVUqcWJ" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7DvO2M9IiMz" resolve="getParameter" />
-                  <node concept="Xl_RD" id="10IUAVUx60p" role="37wK5m">
-                    <property role="Xl_RC" value="" />
-                    <node concept="17Uvod" id="10IUAVUx60q" role="lGtFl">
-                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                      <property role="2qtEX9" value="value" />
-                      <node concept="3zFVjK" id="10IUAVUx60r" role="3zH0cK">
-                        <node concept="3clFbS" id="10IUAVUx60s" role="2VODD2">
-                          <node concept="3clFbF" id="10IUAVUx60t" role="3cqZAp">
-                            <node concept="2OqwBi" id="10IUAVUx60u" role="3clFbG">
-                              <node concept="2OqwBi" id="10IUAVUx60v" role="2Oq$k0">
-                                <node concept="30H73N" id="10IUAVUx60w" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="10IUAVUx60x" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:3TnYLtqfh$T" resolve="parameter" />
-                                </node>
-                              </node>
-                              <node concept="2qgKlT" id="10IUAVUx60y" role="2OqNvi">
-                                <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3VsKOn" id="10IUAVUqdfy" role="37wK5m">
-                    <ref role="3VsUkX" to="wyt6:~Object" resolve="Object" />
-                    <node concept="1ZhdrF" id="10IUAVUqdt1" role="lGtFl">
-                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1116615150612/1116615189566" />
-                      <property role="2qtEX8" value="classifier" />
-                      <node concept="3$xsQk" id="10IUAVUqdt2" role="3$ytzL">
-                        <node concept="3clFbS" id="10IUAVUqdt3" role="2VODD2">
-                          <node concept="3clFbF" id="10IUAVUqeWh" role="3cqZAp">
-                            <node concept="2OqwBi" id="10IUAVUqh16" role="3clFbG">
-                              <node concept="1UaxmW" id="10IUAVUqeWe" role="2Oq$k0">
-                                <node concept="1YaCAy" id="10IUAVUqgkV" role="1Ub_4A">
-                                  <property role="TrG5h" value="ct" />
-                                  <ref role="1YaFvo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                                </node>
-                                <node concept="2OqwBi" id="10IUAVUqfPf" role="1Ub_4B">
-                                  <node concept="2OqwBi" id="10IUAVUqfcv" role="2Oq$k0">
-                                    <node concept="30H73N" id="10IUAVUqeXy" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="10IUAVUqfwN" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:3TnYLtqfh$T" resolve="parameter" />
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="10IUAVUqgfj" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:3TnYLtqfhzO" resolve="type" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="10IUAVUqhwo" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="raruj" id="10IUAVUqdrc" role="lGtFl" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="10IUAVUrB5g" role="30HLyM">
-        <node concept="3clFbS" id="10IUAVUrB5h" role="2VODD2">
-          <node concept="3clFbF" id="10IUAVUrBm$" role="3cqZAp">
-            <node concept="2OqwBi" id="10IUAVUrBm_" role="3clFbG">
-              <node concept="2OqwBi" id="10IUAVUrBmA" role="2Oq$k0">
-                <node concept="30H73N" id="10IUAVUrBmB" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="10IUAVUrBmC" role="2OqNvi">
-                  <node concept="3gmYPX" id="10IUAVUrBmD" role="1xVPHs">
-                    <node concept="3gn64h" id="10IUAVUrBmE" role="3gmYPZ">
-                      <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                    </node>
-                    <node concept="3gn64h" id="10IUAVUrBmF" role="3gmYPZ">
-                      <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1mIQ4w" id="10IUAVUrBmG" role="2OqNvi">
-                <node concept="chp4Y" id="10IUAVUrBmH" role="cj9EA">
-                  <ref role="cht4Q" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="10IUAVUr$OA" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
-      <node concept="1Koe21" id="10IUAVUr$OB" role="1lVwrX">
-        <node concept="3clFb_" id="10IUAVUr$OC" role="1Koe22">
-          <property role="TrG5h" value="context" />
-          <node concept="37vLTG" id="10IUAVUr$OD" role="3clF46">
-            <property role="TrG5h" value="session" />
-            <node concept="3uibUv" id="10IUAVUr$OE" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-            </node>
-          </node>
-          <node concept="3Tm6S6" id="10IUAVUr$OF" role="1B3o_S" />
-          <node concept="3cqZAl" id="10IUAVUr$OG" role="3clF45" />
-          <node concept="3clFbS" id="10IUAVUr$OH" role="3clF47">
-            <node concept="3clFbF" id="10IUAVUr$OI" role="3cqZAp">
-              <node concept="2OqwBi" id="10IUAVUr$OJ" role="3clFbG">
-                <node concept="37vLTw" id="10IUAVUr$OK" role="2Oq$k0">
-                  <ref role="3cqZAo" node="10IUAVUr$OD" resolve="session" />
-                  <node concept="1ZhdrF" id="10IUAVUr$OL" role="lGtFl">
-                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                    <property role="2qtEX8" value="variableDeclaration" />
-                    <node concept="3$xsQk" id="10IUAVUr$OM" role="3$ytzL">
-                      <node concept="3clFbS" id="10IUAVUr$ON" role="2VODD2">
-                        <node concept="3clFbF" id="10IUAVUrDQT" role="3cqZAp">
-                          <node concept="2OqwBi" id="10IUAVUrDQU" role="3clFbG">
-                            <node concept="1iwH7S" id="10IUAVUrDQV" role="2Oq$k0" />
-                            <node concept="1iwH70" id="10IUAVUrDQW" role="2OqNvi">
-                              <ref role="1iwH77" node="1yw2nYxUwhm" resolve="rulemethod_session_parameter" />
-                              <node concept="2OqwBi" id="10IUAVUrDQX" role="1iwH7V">
-                                <node concept="30H73N" id="10IUAVUrDQY" role="2Oq$k0" />
-                                <node concept="2Xjw5R" id="10IUAVUrDQZ" role="2OqNvi">
-                                  <node concept="1xMEDy" id="10IUAVUrDR0" role="1xVPHs">
-                                    <node concept="chp4Y" id="10IUAVUrDR1" role="ri$Ld">
-                                      <ref role="cht4Q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="10IUAVUr$OX" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7DvO2M9IiMz" resolve="getParameter" />
-                  <node concept="Xl_RD" id="10IUAVUuiHW" role="37wK5m">
-                    <property role="Xl_RC" value="" />
-                    <node concept="17Uvod" id="10IUAVUujA1" role="lGtFl">
-                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                      <property role="2qtEX9" value="value" />
-                      <node concept="3zFVjK" id="10IUAVUujA2" role="3zH0cK">
-                        <node concept="3clFbS" id="10IUAVUujA3" role="2VODD2">
-                          <node concept="3clFbF" id="10IUAVUulvs" role="3cqZAp">
-                            <node concept="2OqwBi" id="10IUAVUumsT" role="3clFbG">
-                              <node concept="2OqwBi" id="10IUAVUulGB" role="2Oq$k0">
-                                <node concept="30H73N" id="10IUAVUulvr" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="10IUAVUulYW" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:3TnYLtqfh$T" resolve="parameter" />
-                                </node>
-                              </node>
-                              <node concept="2qgKlT" id="10IUAVUunxv" role="2OqNvi">
-                                <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3VsKOn" id="10IUAVUr$OZ" role="37wK5m">
-                    <ref role="3VsUkX" to="wyt6:~Object" resolve="Object" />
-                    <node concept="1ZhdrF" id="10IUAVUr$P0" role="lGtFl">
-                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1116615150612/1116615189566" />
-                      <property role="2qtEX8" value="classifier" />
-                      <node concept="3$xsQk" id="10IUAVUr$P1" role="3$ytzL">
-                        <node concept="3clFbS" id="10IUAVUr$P2" role="2VODD2">
-                          <node concept="3clFbF" id="10IUAVUr$P3" role="3cqZAp">
-                            <node concept="2OqwBi" id="10IUAVUr$P4" role="3clFbG">
-                              <node concept="1UaxmW" id="10IUAVUr$P5" role="2Oq$k0">
-                                <node concept="1YaCAy" id="10IUAVUr$P6" role="1Ub_4A">
-                                  <property role="TrG5h" value="ct" />
-                                  <ref role="1YaFvo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                                </node>
-                                <node concept="2OqwBi" id="10IUAVUr$P7" role="1Ub_4B">
-                                  <node concept="2OqwBi" id="10IUAVUr$P8" role="2Oq$k0">
-                                    <node concept="30H73N" id="10IUAVUr$P9" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="10IUAVUr$Pa" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:3TnYLtqfh$T" resolve="parameter" />
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="10IUAVUr$Pb" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:3TnYLtqfhzO" resolve="type" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="10IUAVUr$Pc" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="raruj" id="10IUAVUr$Pd" role="lGtFl" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="10IUAVUrBPM" role="30HLyM">
-        <node concept="3clFbS" id="10IUAVUrBPN" role="2VODD2">
-          <node concept="3clFbF" id="10IUAVUrC73" role="3cqZAp">
-            <node concept="2OqwBi" id="10IUAVUrC74" role="3clFbG">
-              <node concept="2OqwBi" id="10IUAVUrC75" role="2Oq$k0">
-                <node concept="30H73N" id="10IUAVUrC76" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="10IUAVUrC77" role="2OqNvi">
-                  <node concept="3gmYPX" id="10IUAVUrC78" role="1xVPHs">
-                    <node concept="3gn64h" id="10IUAVUrC79" role="3gmYPZ">
-                      <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                    </node>
-                    <node concept="3gn64h" id="10IUAVUrC7a" role="3gmYPZ">
-                      <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1mIQ4w" id="10IUAVUrC7b" role="2OqNvi">
-                <node concept="chp4Y" id="10IUAVUrC7c" role="cj9EA">
-                  <ref role="cht4Q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="7kTeLbPGeli" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:3TnYLtqgQYU" resolve="WithContextStatement" />
-      <node concept="14YyZ8" id="7kTeLbPGhAy" role="1lVwrX">
-        <node concept="14ZrTv" id="7kTeLbPGhIs" role="14ZwWg">
-          <node concept="30G5F_" id="7kTeLbPGhIt" role="150hEN">
-            <node concept="3clFbS" id="7kTeLbPGhIu" role="2VODD2">
-              <node concept="3clFbF" id="7kTeLbPGhPD" role="3cqZAp">
-                <node concept="2OqwBi" id="7kTeLbPGhPE" role="3clFbG">
-                  <node concept="2OqwBi" id="7kTeLbPGhPF" role="2Oq$k0">
-                    <node concept="30H73N" id="7kTeLbPGhPG" role="2Oq$k0" />
-                    <node concept="2Xjw5R" id="7kTeLbPGhPH" role="2OqNvi">
-                      <node concept="3gmYPX" id="7kTeLbPGhPI" role="1xVPHs">
-                        <node concept="3gn64h" id="7kTeLbPGhPJ" role="3gmYPZ">
-                          <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                        </node>
-                        <node concept="3gn64h" id="7kTeLbPGhPK" role="3gmYPZ">
-                          <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="1mIQ4w" id="7kTeLbPGhPL" role="2OqNvi">
-                    <node concept="chp4Y" id="7kTeLbPGhPM" role="cj9EA">
-                      <ref role="cht4Q" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1Koe21" id="7kTeLbPGiid" role="150oIE">
-            <node concept="3clFb_" id="7kTeLbPGiie" role="1Koe22">
-              <property role="TrG5h" value="context" />
-              <node concept="37vLTG" id="7kTeLbPGiif" role="3clF46">
-                <property role="TrG5h" value="session" />
-                <node concept="3uibUv" id="7kTeLbPGiig" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-                </node>
-              </node>
-              <node concept="3Tm6S6" id="7kTeLbPGiih" role="1B3o_S" />
-              <node concept="3cqZAl" id="7kTeLbPGiii" role="3clF45" />
-              <node concept="3clFbS" id="7kTeLbPGiij" role="3clF47">
-                <node concept="9aQIb" id="7kTeLbPGiik" role="3cqZAp">
-                  <node concept="3clFbS" id="7kTeLbPGiil" role="9aQI4">
-                    <node concept="3clFbF" id="7kTeLbPGiim" role="3cqZAp">
-                      <node concept="2OqwBi" id="7kTeLbPGiin" role="3clFbG">
-                        <node concept="37vLTw" id="7kTeLbPGiio" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7kTeLbPGiif" resolve="session" />
-                          <node concept="1ZhdrF" id="7kTeLbPGiip" role="lGtFl">
-                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                            <property role="2qtEX8" value="variableDeclaration" />
-                            <node concept="3$xsQk" id="7kTeLbPGiiq" role="3$ytzL">
-                              <node concept="3clFbS" id="7kTeLbPGiir" role="2VODD2">
-                                <node concept="3clFbF" id="7kTeLbPGiis" role="3cqZAp">
-                                  <node concept="2OqwBi" id="7kTeLbPGiit" role="3clFbG">
-                                    <node concept="1iwH7S" id="7kTeLbPGiiu" role="2Oq$k0" />
-                                    <node concept="1iwH70" id="7kTeLbPGiiv" role="2OqNvi">
-                                      <ref role="1iwH77" node="429xoypVg6q" resolve="apply_session_parameter" />
-                                      <node concept="2OqwBi" id="7kTeLbPGiiw" role="1iwH7V">
-                                        <node concept="30H73N" id="7kTeLbPGiix" role="2Oq$k0" />
-                                        <node concept="2Xjw5R" id="7kTeLbPGiiy" role="2OqNvi">
-                                          <node concept="1xMEDy" id="7kTeLbPGiiz" role="1xVPHs">
-                                            <node concept="chp4Y" id="7kTeLbPGii$" role="ri$Ld">
-                                              <ref role="cht4Q" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="7kTeLbPGii_" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:7DvO2M9IiMh" resolve="putParameter" />
-                          <node concept="Xl_RD" id="7kTeLbPGiiA" role="37wK5m">
-                            <node concept="17Uvod" id="7kTeLbPGiiB" role="lGtFl">
-                              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                              <property role="2qtEX9" value="value" />
-                              <node concept="3zFVjK" id="7kTeLbPGiiC" role="3zH0cK">
-                                <node concept="3clFbS" id="7kTeLbPGiiD" role="2VODD2">
-                                  <node concept="3clFbF" id="7kTeLbPGiiE" role="3cqZAp">
-                                    <node concept="2OqwBi" id="7kTeLbPGiiF" role="3clFbG">
-                                      <node concept="2OqwBi" id="7kTeLbPGiiG" role="2Oq$k0">
-                                        <node concept="30H73N" id="7kTeLbPGiiH" role="2Oq$k0" />
-                                        <node concept="3TrEf2" id="7kTeLbPGiiI" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="wq2x:3TnYLtqgRY3" resolve="parameter" />
-                                        </node>
-                                      </node>
-                                      <node concept="2qgKlT" id="7kTeLbPGiiJ" role="2OqNvi">
-                                        <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="10Nm6u" id="7kTeLbPGiiK" role="37wK5m">
-                            <node concept="29HgVG" id="7kTeLbPGiiL" role="lGtFl">
-                              <node concept="3NFfHV" id="7kTeLbPGiiM" role="3NFExx">
-                                <node concept="3clFbS" id="7kTeLbPGiiN" role="2VODD2">
-                                  <node concept="3clFbF" id="7kTeLbPGiiO" role="3cqZAp">
-                                    <node concept="2OqwBi" id="7kTeLbPGiiP" role="3clFbG">
-                                      <node concept="3TrEf2" id="7kTeLbPGiiQ" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="wq2x:3TnYLtqgQZ0" resolve="init" />
-                                      </node>
-                                      <node concept="30H73N" id="7kTeLbPGiiR" role="2Oq$k0" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2GUZhq" id="7kTeLbPGiiS" role="3cqZAp">
-                      <node concept="3clFbS" id="7kTeLbPGiiT" role="2GV8ay">
-                        <node concept="3clFbH" id="7kTeLbPGiiU" role="3cqZAp">
-                          <node concept="2b32R4" id="7kTeLbPGiiV" role="lGtFl">
-                            <node concept="3JmXsc" id="7kTeLbPGiiW" role="2P8S$">
-                              <node concept="3clFbS" id="7kTeLbPGiiX" role="2VODD2">
-                                <node concept="3clFbF" id="7kTeLbPGiiY" role="3cqZAp">
-                                  <node concept="2OqwBi" id="7kTeLbPGiiZ" role="3clFbG">
-                                    <node concept="2OqwBi" id="7kTeLbPGij0" role="2Oq$k0">
-                                      <node concept="30H73N" id="7kTeLbPGij1" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="7kTeLbPGij2" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="wq2x:3TnYLtqgQYV" resolve="body" />
-                                      </node>
-                                    </node>
-                                    <node concept="3Tsc0h" id="7kTeLbPGij3" role="2OqNvi">
-                                      <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbS" id="7kTeLbPGij4" role="2GVbov">
-                        <node concept="3clFbF" id="7kTeLbPGij5" role="3cqZAp">
-                          <node concept="2OqwBi" id="7kTeLbPGij6" role="3clFbG">
-                            <node concept="37vLTw" id="7kTeLbPGij7" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7kTeLbPGiif" resolve="session" />
-                              <node concept="1ZhdrF" id="7kTeLbPGij8" role="lGtFl">
-                                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                                <property role="2qtEX8" value="variableDeclaration" />
-                                <node concept="3$xsQk" id="7kTeLbPGij9" role="3$ytzL">
-                                  <node concept="3clFbS" id="7kTeLbPGija" role="2VODD2">
-                                    <node concept="3clFbF" id="7kTeLbPGijb" role="3cqZAp">
-                                      <node concept="2OqwBi" id="7kTeLbPGijc" role="3clFbG">
-                                        <node concept="1iwH7S" id="7kTeLbPGijd" role="2Oq$k0" />
-                                        <node concept="1iwH70" id="7kTeLbPGije" role="2OqNvi">
-                                          <ref role="1iwH77" node="429xoypVg6q" resolve="apply_session_parameter" />
-                                          <node concept="2OqwBi" id="7kTeLbPGijf" role="1iwH7V">
-                                            <node concept="30H73N" id="7kTeLbPGijg" role="2Oq$k0" />
-                                            <node concept="2Xjw5R" id="7kTeLbPGijh" role="2OqNvi">
-                                              <node concept="1xMEDy" id="7kTeLbPGiji" role="1xVPHs">
-                                                <node concept="chp4Y" id="7kTeLbPGijj" role="ri$Ld">
-                                                  <ref role="cht4Q" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="7kTeLbPGijk" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:7DvO2M9IiMQ" resolve="removeParameter" />
-                              <node concept="Xl_RD" id="7kTeLbPGijl" role="37wK5m">
-                                <node concept="17Uvod" id="7kTeLbPGijm" role="lGtFl">
-                                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                                  <property role="2qtEX9" value="value" />
-                                  <node concept="3zFVjK" id="7kTeLbPGijn" role="3zH0cK">
-                                    <node concept="3clFbS" id="7kTeLbPGijo" role="2VODD2">
-                                      <node concept="3clFbF" id="7kTeLbPGijp" role="3cqZAp">
-                                        <node concept="2OqwBi" id="7kTeLbPGijq" role="3clFbG">
-                                          <node concept="2OqwBi" id="7kTeLbPGijr" role="2Oq$k0">
-                                            <node concept="30H73N" id="7kTeLbPGijs" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="7kTeLbPGijt" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="wq2x:3TnYLtqgRY3" resolve="parameter" />
-                                            </node>
-                                          </node>
-                                          <node concept="2qgKlT" id="7kTeLbPGiju" role="2OqNvi">
-                                            <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="raruj" id="7kTeLbPGijv" role="lGtFl" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="14ZrTv" id="7kTeLbPGjbb" role="14ZwWg">
-          <node concept="30G5F_" id="7kTeLbPGjbc" role="150hEN">
-            <node concept="3clFbS" id="7kTeLbPGjbd" role="2VODD2">
-              <node concept="3clFbF" id="7kTeLbPGjSX" role="3cqZAp">
-                <node concept="2OqwBi" id="7kTeLbPGjSY" role="3clFbG">
-                  <node concept="2OqwBi" id="7kTeLbPGjSZ" role="2Oq$k0">
-                    <node concept="30H73N" id="7kTeLbPGjT0" role="2Oq$k0" />
-                    <node concept="2Xjw5R" id="7kTeLbPGjT1" role="2OqNvi">
-                      <node concept="3gmYPX" id="7kTeLbPGjT2" role="1xVPHs">
-                        <node concept="3gn64h" id="7kTeLbPGjT3" role="3gmYPZ">
-                          <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                        </node>
-                        <node concept="3gn64h" id="7kTeLbPGjT4" role="3gmYPZ">
-                          <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="1mIQ4w" id="7kTeLbPGjT5" role="2OqNvi">
-                    <node concept="chp4Y" id="7kTeLbPGjT6" role="cj9EA">
-                      <ref role="cht4Q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1Koe21" id="7kTeLbPGkr9" role="150oIE">
-            <node concept="3clFb_" id="7kTeLbPGkra" role="1Koe22">
-              <property role="TrG5h" value="context" />
-              <node concept="37vLTG" id="7kTeLbPGkrb" role="3clF46">
-                <property role="TrG5h" value="session" />
-                <node concept="3uibUv" id="7kTeLbPGkrc" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-                </node>
-              </node>
-              <node concept="3Tm6S6" id="7kTeLbPGkrd" role="1B3o_S" />
-              <node concept="3cqZAl" id="7kTeLbPGkre" role="3clF45" />
-              <node concept="3clFbS" id="7kTeLbPGkrf" role="3clF47">
-                <node concept="9aQIb" id="7kTeLbPGkrg" role="3cqZAp">
-                  <node concept="3clFbS" id="7kTeLbPGkrh" role="9aQI4">
-                    <node concept="3clFbF" id="7kTeLbPGkri" role="3cqZAp">
-                      <node concept="2OqwBi" id="7kTeLbPGkrj" role="3clFbG">
-                        <node concept="37vLTw" id="7kTeLbPGkrk" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7kTeLbPGkrb" resolve="session" />
-                          <node concept="1ZhdrF" id="7kTeLbPGkrl" role="lGtFl">
-                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                            <property role="2qtEX8" value="variableDeclaration" />
-                            <node concept="3$xsQk" id="7kTeLbPGkrm" role="3$ytzL">
-                              <node concept="3clFbS" id="7kTeLbPGkrn" role="2VODD2">
-                                <node concept="3clFbF" id="7kTeLbPGkro" role="3cqZAp">
-                                  <node concept="2OqwBi" id="7kTeLbPGkrp" role="3clFbG">
-                                    <node concept="1iwH7S" id="7kTeLbPGkrq" role="2Oq$k0" />
-                                    <node concept="1iwH70" id="7kTeLbPGkrr" role="2OqNvi">
-                                      <ref role="1iwH77" node="1yw2nYxUwhm" resolve="rulemethod_session_parameter" />
-                                      <node concept="2OqwBi" id="7kTeLbPGkrs" role="1iwH7V">
-                                        <node concept="30H73N" id="7kTeLbPGkrt" role="2Oq$k0" />
-                                        <node concept="2Xjw5R" id="7kTeLbPGkru" role="2OqNvi">
-                                          <node concept="1xMEDy" id="7kTeLbPGkrv" role="1xVPHs">
-                                            <node concept="chp4Y" id="7kTeLbPGkrw" role="ri$Ld">
-                                              <ref role="cht4Q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="7kTeLbPGkrx" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:7DvO2M9IiMh" resolve="putParameter" />
-                          <node concept="Xl_RD" id="7kTeLbPGkry" role="37wK5m">
-                            <node concept="17Uvod" id="7kTeLbPGkrz" role="lGtFl">
-                              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                              <property role="2qtEX9" value="value" />
-                              <node concept="3zFVjK" id="7kTeLbPGkr$" role="3zH0cK">
-                                <node concept="3clFbS" id="7kTeLbPGkr_" role="2VODD2">
-                                  <node concept="3clFbF" id="7kTeLbPGkrA" role="3cqZAp">
-                                    <node concept="2OqwBi" id="7kTeLbPGkrB" role="3clFbG">
-                                      <node concept="2OqwBi" id="7kTeLbPGkrC" role="2Oq$k0">
-                                        <node concept="30H73N" id="7kTeLbPGkrD" role="2Oq$k0" />
-                                        <node concept="3TrEf2" id="7kTeLbPGkrE" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="wq2x:3TnYLtqgRY3" resolve="parameter" />
-                                        </node>
-                                      </node>
-                                      <node concept="2qgKlT" id="7kTeLbPGkrF" role="2OqNvi">
-                                        <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="10Nm6u" id="7kTeLbPGkrG" role="37wK5m">
-                            <node concept="29HgVG" id="7kTeLbPGkrH" role="lGtFl">
-                              <node concept="3NFfHV" id="7kTeLbPGkrI" role="3NFExx">
-                                <node concept="3clFbS" id="7kTeLbPGkrJ" role="2VODD2">
-                                  <node concept="3clFbF" id="7kTeLbPGkrK" role="3cqZAp">
-                                    <node concept="2OqwBi" id="7kTeLbPGkrL" role="3clFbG">
-                                      <node concept="3TrEf2" id="7kTeLbPGkrM" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="wq2x:3TnYLtqgQZ0" resolve="init" />
-                                      </node>
-                                      <node concept="30H73N" id="7kTeLbPGkrN" role="2Oq$k0" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2GUZhq" id="7kTeLbPGkrO" role="3cqZAp">
-                      <node concept="3clFbS" id="7kTeLbPGkrP" role="2GV8ay">
-                        <node concept="3clFbH" id="7kTeLbPGkrQ" role="3cqZAp">
-                          <node concept="2b32R4" id="7kTeLbPGkrR" role="lGtFl">
-                            <node concept="3JmXsc" id="7kTeLbPGkrS" role="2P8S$">
-                              <node concept="3clFbS" id="7kTeLbPGkrT" role="2VODD2">
-                                <node concept="3clFbF" id="7kTeLbPGkrU" role="3cqZAp">
-                                  <node concept="2OqwBi" id="7kTeLbPGkrV" role="3clFbG">
-                                    <node concept="2OqwBi" id="7kTeLbPGkrW" role="2Oq$k0">
-                                      <node concept="30H73N" id="7kTeLbPGkrX" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="7kTeLbPGkrY" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="wq2x:3TnYLtqgQYV" resolve="body" />
-                                      </node>
-                                    </node>
-                                    <node concept="3Tsc0h" id="7kTeLbPGkrZ" role="2OqNvi">
-                                      <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbS" id="7kTeLbPGks0" role="2GVbov">
-                        <node concept="3clFbF" id="7kTeLbPGks1" role="3cqZAp">
-                          <node concept="2OqwBi" id="7kTeLbPGks2" role="3clFbG">
-                            <node concept="37vLTw" id="7kTeLbPGks3" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7kTeLbPGkrb" resolve="session" />
-                              <node concept="1ZhdrF" id="7kTeLbPGks4" role="lGtFl">
-                                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                                <property role="2qtEX8" value="variableDeclaration" />
-                                <node concept="3$xsQk" id="7kTeLbPGks5" role="3$ytzL">
-                                  <node concept="3clFbS" id="7kTeLbPGks6" role="2VODD2">
-                                    <node concept="3clFbF" id="7kTeLbPGks7" role="3cqZAp">
-                                      <node concept="2OqwBi" id="7kTeLbPGks8" role="3clFbG">
-                                        <node concept="1iwH7S" id="7kTeLbPGks9" role="2Oq$k0" />
-                                        <node concept="1iwH70" id="7kTeLbPGksa" role="2OqNvi">
-                                          <ref role="1iwH77" node="1yw2nYxUwhm" resolve="rulemethod_session_parameter" />
-                                          <node concept="2OqwBi" id="7kTeLbPGksb" role="1iwH7V">
-                                            <node concept="30H73N" id="7kTeLbPGksc" role="2Oq$k0" />
-                                            <node concept="2Xjw5R" id="7kTeLbPGksd" role="2OqNvi">
-                                              <node concept="1xMEDy" id="7kTeLbPGkse" role="1xVPHs">
-                                                <node concept="chp4Y" id="7kTeLbPGksf" role="ri$Ld">
-                                                  <ref role="cht4Q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="7kTeLbPGksg" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:7DvO2M9IiMQ" resolve="removeParameter" />
-                              <node concept="Xl_RD" id="7kTeLbPGksh" role="37wK5m">
-                                <node concept="17Uvod" id="7kTeLbPGksi" role="lGtFl">
-                                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                                  <property role="2qtEX9" value="value" />
-                                  <node concept="3zFVjK" id="7kTeLbPGksj" role="3zH0cK">
-                                    <node concept="3clFbS" id="7kTeLbPGksk" role="2VODD2">
-                                      <node concept="3clFbF" id="7kTeLbPGksl" role="3cqZAp">
-                                        <node concept="2OqwBi" id="7kTeLbPGksm" role="3clFbG">
-                                          <node concept="2OqwBi" id="7kTeLbPGksn" role="2Oq$k0">
-                                            <node concept="30H73N" id="7kTeLbPGkso" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="7kTeLbPGksp" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="wq2x:3TnYLtqgRY3" resolve="parameter" />
-                                            </node>
-                                          </node>
-                                          <node concept="2qgKlT" id="7kTeLbPGksq" role="2OqNvi">
-                                            <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="raruj" id="7kTeLbPGksr" role="lGtFl" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="b5Tf3" id="7kTeLbPGlpY" role="14YRTM" />
-      </node>
-    </node>
   </node>
   <node concept="312cEu" id="2N2MQGCMHqo">
     <property role="TrG5h" value="_MacroTable" />
@@ -6721,290 +5544,6 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="4U$Q3dLroOy" role="jymVt" />
-    <node concept="3clFb_" id="1GNw78$a430" role="jymVt">
-      <property role="TrG5h" value="macroTemplate" />
-      <node concept="37vLTG" id="1GNw78$a431" role="3clF46">
-        <property role="TrG5h" value="concept" />
-        <node concept="3bZ5Sz" id="1GNw78$a432" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="1GNw78$afCG" role="3clF45">
-        <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="MacroTemplate" />
-        <node concept="16syzq" id="4KRwoem1VN0" role="11_B2D">
-          <ref role="16sUi3" node="4KRwoem1TFX" resolve="T" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="4KRwoelAz6d" role="1B3o_S" />
-      <node concept="3clFbS" id="1GNw78$a435" role="3clF47">
-        <node concept="3clFbJ" id="3OHEjDeJDLQ" role="3cqZAp">
-          <node concept="3clFbS" id="3OHEjDeJDLS" role="3clFbx">
-            <node concept="YS8fn" id="3OHEjDeJFga" role="3cqZAp">
-              <node concept="2ShNRf" id="3OHEjDeJFkh" role="YScLw">
-                <node concept="1pGfFk" id="3OHEjDeJLa_" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~NullPointerException.&lt;init&gt;()" resolve="NullPointerException" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="3OHEjDeJF0e" role="3clFbw">
-            <node concept="10Nm6u" id="3OHEjDeJF12" role="3uHU7w" />
-            <node concept="37vLTw" id="3OHEjDeJEBr" role="3uHU7B">
-              <ref role="3cqZAo" node="1GNw78$a431" resolve="concept" />
-            </node>
-          </node>
-        </node>
-        <node concept="1_3QMa" id="1GNw78$a436" role="3cqZAp">
-          <node concept="1pnPoh" id="1GNw78$a437" role="1_3QMm">
-            <node concept="3gn64h" id="1GNw78$a438" role="1pnPq6">
-              <ref role="3gnhBz" to="tpck:gw2VY9q" resolve="BaseConcept" />
-              <node concept="1ZhdrF" id="1GNw78$a439" role="lGtFl">
-                <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/1154546950173/1154546997487" />
-                <property role="2qtEX8" value="concept" />
-                <node concept="3$xsQk" id="1GNw78$a43a" role="3$ytzL">
-                  <node concept="3clFbS" id="1GNw78$a43b" role="2VODD2">
-                    <node concept="3clFbF" id="1GNw78$a43c" role="3cqZAp">
-                      <node concept="2OqwBi" id="6DOfTm$CAJQ" role="3clFbG">
-                        <node concept="2OqwBi" id="6DOfTm$C_Ex" role="2Oq$k0">
-                          <node concept="2OqwBi" id="1GNw78$a43d" role="2Oq$k0">
-                            <node concept="30H73N" id="1GNw78$a43e" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="6DOfTm$C_53" role="2OqNvi">
-                              <ref role="3Tt5mk" to="wq2x:6DOfTm$zUE3" resolve="input" />
-                            </node>
-                          </node>
-                          <node concept="3TrEf2" id="6DOfTm$CAbS" role="2OqNvi">
-                            <ref role="3Tt5mk" to="wq2x:6DOfTm$zVok" resolve="type" />
-                          </node>
-                        </node>
-                        <node concept="3TrEf2" id="6DOfTm$CB5y" role="2OqNvi">
-                          <ref role="3Tt5mk" to="tp25:g$ehGDh" resolve="concept" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbS" id="1GNw78$a43g" role="1pnPq1">
-              <node concept="3cpWs6" id="1GNw78$a43h" role="3cqZAp">
-                <node concept="10QFUN" id="4KRwoem42xQ" role="3cqZAk">
-                  <node concept="3uibUv" id="4KRwoem42xD" role="10QFUM">
-                    <ref role="3uigEE" to="psr6:1hX44vNlvEV" resolve="AbstractMacroTemplate" />
-                    <node concept="16syzq" id="4KRwoem42xE" role="11_B2D">
-                      <ref role="16sUi3" node="4KRwoem1TFX" resolve="T" />
-                    </node>
-                  </node>
-                  <node concept="2ShNRf" id="4KRwoem42xF" role="10QFUP">
-                    <node concept="1pGfFk" id="4KRwoem42xG" role="2ShVmc">
-                      <ref role="37wK5l" node="4JJCDIm$QjW" resolve="__MacroTable._Template" />
-                      <node concept="1ZhdrF" id="4KRwoem42xI" role="lGtFl">
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                        <property role="2qtEX8" value="baseMethodDeclaration" />
-                        <node concept="3$xsQk" id="4KRwoem42xJ" role="3$ytzL">
-                          <node concept="3clFbS" id="4KRwoem42xK" role="2VODD2">
-                            <node concept="3clFbF" id="4KRwoem42xL" role="3cqZAp">
-                              <node concept="2OqwBi" id="4KRwoem42xM" role="3clFbG">
-                                <node concept="1iwH7S" id="4KRwoem42xN" role="2Oq$k0" />
-                                <node concept="1iwH70" id="4KRwoem42xO" role="2OqNvi">
-                                  <ref role="1iwH77" node="4JJCDIm$O$I" resolve="macro_template_constructor" />
-                                  <node concept="30H73N" id="4KRwoem42xP" role="1iwH7V" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1WS0z7" id="1GNw78$a43t" role="lGtFl">
-              <node concept="3JmXsc" id="1GNw78$a43u" role="3Jn$fo">
-                <node concept="3clFbS" id="1GNw78$a43v" role="2VODD2">
-                  <node concept="3clFbF" id="1GNw78$a43w" role="3cqZAp">
-                    <node concept="2OqwBi" id="5itBwM5CsXG" role="3clFbG">
-                      <node concept="2OqwBi" id="1GNw78$a43x" role="2Oq$k0">
-                        <node concept="3Tsc0h" id="1GNw78$a43y" role="2OqNvi">
-                          <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
-                        </node>
-                        <node concept="30H73N" id="1GNw78$a43z" role="2Oq$k0" />
-                      </node>
-                      <node concept="v3k3i" id="5itBwM5CvAy" role="2OqNvi">
-                        <node concept="chp4Y" id="5itBwM5Cw95" role="v3oSu">
-                          <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="1GNw78$a43$" role="1_3QMn">
-            <ref role="3cqZAo" node="1GNw78$a431" resolve="concept" />
-          </node>
-        </node>
-        <node concept="3cpWs6" id="6UWSvq58rmf" role="3cqZAp">
-          <node concept="10Nm6u" id="6UWSvq58rny" role="3cqZAk" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="4KRwoelABg8" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-      <node concept="16euLQ" id="4KRwoem1TFX" role="16eVyc">
-        <property role="TrG5h" value="T" />
-        <node concept="3uibUv" id="1eKXYsj$2kU" role="3ztrMU">
-          <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4MEOIDEgrjY" role="jymVt" />
-    <node concept="3clFb_" id="5itBwM8SMQ9" role="jymVt">
-      <property role="TrG5h" value="macroTemplate" />
-      <node concept="3uibUv" id="5itBwM8SMQa" role="3clF45">
-        <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="MacroTemplate" />
-        <node concept="16syzq" id="5itBwM8SMQb" role="11_B2D">
-          <ref role="16sUi3" node="5itBwM8SMQg" resolve="T" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5itBwM8SMQc" role="1B3o_S" />
-      <node concept="37vLTG" id="5itBwM8SMQe" role="3clF46">
-        <property role="TrG5h" value="templateRef" />
-        <node concept="3uibUv" id="5itBwM8SMQf" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="16euLQ" id="5itBwM8SMQg" role="16eVyc">
-        <property role="TrG5h" value="T" />
-        <node concept="3uibUv" id="5itBwM8SMQh" role="3ztrMU">
-          <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="5itBwM8SMQj" role="3clF47">
-        <node concept="3clFbJ" id="5itBwM8SPT1" role="3cqZAp">
-          <node concept="3clFbS" id="5itBwM8SPT2" role="3clFbx">
-            <node concept="YS8fn" id="5itBwM8SPT3" role="3cqZAp">
-              <node concept="2ShNRf" id="5itBwM8SPT4" role="YScLw">
-                <node concept="1pGfFk" id="5itBwM8SPT5" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~NullPointerException.&lt;init&gt;()" resolve="NullPointerException" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="5itBwM8SPT6" role="3clFbw">
-            <node concept="10Nm6u" id="5itBwM8SPT7" role="3uHU7w" />
-            <node concept="37vLTw" id="5itBwM8SPT8" role="3uHU7B">
-              <ref role="3cqZAo" node="5itBwM8SMQe" resolve="templateRef" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="5itBwM8SPT9" role="3cqZAp" />
-        <node concept="2ignYC" id="5itBwM8SPTa" role="3cqZAp">
-          <node concept="2OqwBi" id="5itBwM8SPTb" role="3KbGdf">
-            <node concept="2OqwBi" id="5itBwM8SPTc" role="2Oq$k0">
-              <node concept="37vLTw" id="5itBwM8SPTd" role="2Oq$k0">
-                <ref role="3cqZAo" node="5itBwM8SMQe" resolve="templateRef" />
-              </node>
-              <node concept="liA8E" id="5itBwM8SPTe" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
-              </node>
-            </node>
-            <node concept="liA8E" id="5itBwM8SPTf" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-            </node>
-          </node>
-          <node concept="3KbdKl" id="5itBwM8SPTg" role="3KbHQx">
-            <node concept="Xl_RD" id="5itBwM8SPTh" role="3Kbmr1">
-              <property role="Xl_RC" value="" />
-              <node concept="17Uvod" id="5itBwM8SPTi" role="lGtFl">
-                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                <property role="2qtEX9" value="value" />
-                <node concept="3zFVjK" id="5itBwM8SPTj" role="3zH0cK">
-                  <node concept="3clFbS" id="5itBwM8SPTk" role="2VODD2">
-                    <node concept="3clFbF" id="5itBwM8SPTl" role="3cqZAp">
-                      <node concept="2OqwBi" id="5itBwM8SPTm" role="3clFbG">
-                        <node concept="2OqwBi" id="5itBwM8SPTn" role="2Oq$k0">
-                          <node concept="2JrnkZ" id="5itBwM8SPTo" role="2Oq$k0">
-                            <node concept="30H73N" id="5itBwM8SPTp" role="2JrQYb" />
-                          </node>
-                          <node concept="liA8E" id="5itBwM8SPTq" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="5itBwM8SPTr" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbS" id="5itBwM8SPTs" role="3Kbo56">
-              <node concept="3cpWs6" id="5itBwM8SPTt" role="3cqZAp">
-                <node concept="10QFUN" id="5itBwM8SPTu" role="3cqZAk">
-                  <node concept="3uibUv" id="5itBwM8SPTv" role="10QFUM">
-                    <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="MacroTemplate" />
-                    <node concept="16syzq" id="5itBwM8SPTw" role="11_B2D">
-                      <ref role="16sUi3" node="5itBwM8SMQg" resolve="T" />
-                    </node>
-                  </node>
-                  <node concept="2ShNRf" id="5itBwM8SPTx" role="10QFUP">
-                    <node concept="1pGfFk" id="5itBwM8SPTy" role="2ShVmc">
-                      <ref role="37wK5l" node="4JJCDIm$QjW" resolve="__MacroTable._Template" />
-                      <node concept="1ZhdrF" id="5itBwM8SPTz" role="lGtFl">
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                        <property role="2qtEX8" value="baseMethodDeclaration" />
-                        <node concept="3$xsQk" id="5itBwM8SPT$" role="3$ytzL">
-                          <node concept="3clFbS" id="5itBwM8SPT_" role="2VODD2">
-                            <node concept="3clFbF" id="5itBwM8SPTA" role="3cqZAp">
-                              <node concept="2OqwBi" id="5itBwM8SPTB" role="3clFbG">
-                                <node concept="1iwH7S" id="5itBwM8SPTC" role="2Oq$k0" />
-                                <node concept="1iwH70" id="5itBwM8SPTD" role="2OqNvi">
-                                  <ref role="1iwH77" node="4JJCDIm$O$I" resolve="macro_template_constructor" />
-                                  <node concept="30H73N" id="5itBwM8SPTE" role="1iwH7V" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1WS0z7" id="5itBwM8SPTF" role="lGtFl">
-              <node concept="3JmXsc" id="5itBwM8SPTG" role="3Jn$fo">
-                <node concept="3clFbS" id="5itBwM8SPTH" role="2VODD2">
-                  <node concept="3clFbF" id="5itBwM8SPTI" role="3cqZAp">
-                    <node concept="2OqwBi" id="5itBwM8SPTJ" role="3clFbG">
-                      <node concept="2OqwBi" id="5itBwM8SPTK" role="2Oq$k0">
-                        <node concept="30H73N" id="5itBwM8SPTL" role="2Oq$k0" />
-                        <node concept="3Tsc0h" id="5itBwM8SPTM" role="2OqNvi">
-                          <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
-                        </node>
-                      </node>
-                      <node concept="v3k3i" id="5itBwM8SPTN" role="2OqNvi">
-                        <node concept="chp4Y" id="5itBwM8SQOp" role="v3oSu">
-                          <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="5itBwM8SPTP" role="3cqZAp">
-          <node concept="10Nm6u" id="5itBwM8SPTQ" role="3cqZAk" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM8SMQk" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="5itBwM8SNzQ" role="jymVt" />
     <node concept="3clFb_" id="5itBwM7reGY" role="jymVt">
       <property role="TrG5h" value="expandMacroTemplate" />
@@ -7198,28 +5737,28 @@
               </node>
             </node>
             <node concept="3clFbS" id="4MEOIDEhN1T" role="3Kbo56">
-              <node concept="3cpWs6" id="4MEOIDEi0CD" role="3cqZAp">
-                <node concept="10QFUN" id="4MEOIDEkrJU" role="3cqZAk">
-                  <node concept="3uibUv" id="4MEOIDEkrJI" role="10QFUM">
+              <node concept="3cpWs6" id="631nQp3ZFze" role="3cqZAp">
+                <node concept="10QFUN" id="631nQp3ZFzf" role="3cqZAk">
+                  <node concept="3uibUv" id="631nQp3ZFzg" role="10QFUM">
                     <ref role="3uigEE" to="psr6:5itBwM7auSJ" resolve="CallMacroTemplate" />
-                    <node concept="16syzq" id="4MEOIDEkrJJ" role="11_B2D">
+                    <node concept="16syzq" id="631nQp3ZFzh" role="11_B2D">
                       <ref role="16sUi3" node="4MEOIDEgqco" resolve="T" />
                     </node>
                   </node>
-                  <node concept="2ShNRf" id="4MEOIDEkrJK" role="10QFUP">
-                    <node concept="1pGfFk" id="4MEOIDEkrJL" role="2ShVmc">
-                      <ref role="37wK5l" node="4JJCDIm$QjW" resolve="__MacroTable._Template" />
-                      <node concept="1ZhdrF" id="4MEOIDEkrJM" role="lGtFl">
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                  <node concept="2ShNRf" id="631nQp3ZFzi" role="10QFUP">
+                    <node concept="1pGfFk" id="631nQp3ZHNl" role="2ShVmc">
+                      <ref role="37wK5l" node="5itBwM7icrH" resolve="__MacroTable._Call" />
+                      <node concept="1ZhdrF" id="631nQp3ZK7D" role="lGtFl">
                         <property role="2qtEX8" value="baseMethodDeclaration" />
-                        <node concept="3$xsQk" id="4MEOIDEkrJN" role="3$ytzL">
-                          <node concept="3clFbS" id="4MEOIDEkrJO" role="2VODD2">
-                            <node concept="3clFbF" id="4MEOIDEkrJP" role="3cqZAp">
-                              <node concept="2OqwBi" id="4MEOIDEkrJQ" role="3clFbG">
-                                <node concept="1iwH7S" id="4MEOIDEkrJR" role="2Oq$k0" />
-                                <node concept="1iwH70" id="4MEOIDEkrJS" role="2OqNvi">
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                        <node concept="3$xsQk" id="631nQp3ZK7E" role="3$ytzL">
+                          <node concept="3clFbS" id="631nQp3ZK7F" role="2VODD2">
+                            <node concept="3clFbF" id="631nQp3ZKM$" role="3cqZAp">
+                              <node concept="2OqwBi" id="631nQp3ZKM_" role="3clFbG">
+                                <node concept="1iwH7S" id="631nQp3ZKMA" role="2Oq$k0" />
+                                <node concept="1iwH70" id="631nQp3ZKMB" role="2OqNvi">
                                   <ref role="1iwH77" node="4JJCDIm$O$I" resolve="macro_template_constructor" />
-                                  <node concept="30H73N" id="4MEOIDEkrJT" role="1iwH7V" />
+                                  <node concept="30H73N" id="631nQp3ZKMC" role="1iwH7V" />
                                 </node>
                               </node>
                             </node>
@@ -7268,99 +5807,6 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="4nxCIBqost0" role="jymVt" />
-    <node concept="3clFb_" id="6UWSvq4Vrn3" role="jymVt">
-      <property role="TrG5h" value="allMacroConcepts" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="3vKaQO" id="6UWSvq4Vrn4" role="3clF45">
-        <node concept="3bZ5Sz" id="6UWSvq4Vrn5" role="3O5elw" />
-      </node>
-      <node concept="3Tm1VV" id="6UWSvq4Vrn6" role="1B3o_S" />
-      <node concept="3clFbS" id="6UWSvq4Vrn8" role="3clF47">
-        <node concept="3cpWs8" id="6UWSvq4VxX_" role="3cqZAp">
-          <node concept="3cpWsn" id="6UWSvq4VxXC" role="3cpWs9">
-            <property role="TrG5h" value="macroConcepts" />
-            <node concept="_YKpA" id="6UWSvq4VxXz" role="1tU5fm">
-              <node concept="3bZ5Sz" id="6UWSvq4VxY7" role="_ZDj9" />
-            </node>
-            <node concept="2ShNRf" id="6UWSvq4Vy2S" role="33vP2m">
-              <node concept="Tc6Ow" id="6UWSvq4Vy2l" role="2ShVmc">
-                <node concept="3bZ5Sz" id="6UWSvq4Vy2m" role="HW$YZ" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6UWSvq4VFi3" role="3cqZAp" />
-        <node concept="3clFbF" id="6UWSvq4Vy5B" role="3cqZAp">
-          <node concept="2OqwBi" id="6UWSvq4VyIT" role="3clFbG">
-            <node concept="37vLTw" id="6UWSvq4Vy5_" role="2Oq$k0">
-              <ref role="3cqZAo" node="6UWSvq4VxXC" resolve="macroConcepts" />
-            </node>
-            <node concept="TSZUe" id="6UWSvq4VzM6" role="2OqNvi">
-              <node concept="35c_gC" id="6UWSvq4VzQq" role="25WWJ7">
-                <ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                <node concept="1ZhdrF" id="6UWSvq4VAzd" role="lGtFl">
-                  <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474300074836/2644386474300074837" />
-                  <property role="2qtEX8" value="conceptDeclaration" />
-                  <node concept="3$xsQk" id="6UWSvq4VAze" role="3$ytzL">
-                    <node concept="3clFbS" id="6UWSvq4VAzf" role="2VODD2">
-                      <node concept="3clFbF" id="6UWSvq4VB1h" role="3cqZAp">
-                        <node concept="2OqwBi" id="6UWSvq4VDFV" role="3clFbG">
-                          <node concept="2OqwBi" id="6UWSvq4VCcc" role="2Oq$k0">
-                            <node concept="2OqwBi" id="6UWSvq4VBiq" role="2Oq$k0">
-                              <node concept="30H73N" id="6UWSvq4VB1g" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="6UWSvq4VBAZ" role="2OqNvi">
-                                <ref role="3Tt5mk" to="wq2x:6DOfTm$zUE3" resolve="input" />
-                              </node>
-                            </node>
-                            <node concept="3TrEf2" id="6UWSvq4VD98" role="2OqNvi">
-                              <ref role="3Tt5mk" to="wq2x:6DOfTm$zVok" resolve="type" />
-                            </node>
-                          </node>
-                          <node concept="3TrEf2" id="6UWSvq4VE6j" role="2OqNvi">
-                            <ref role="3Tt5mk" to="tp25:g$ehGDh" resolve="concept" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1WS0z7" id="6UWSvq4V$zt" role="lGtFl">
-            <node concept="3JmXsc" id="6UWSvq4V$zv" role="3Jn$fo">
-              <node concept="3clFbS" id="6UWSvq4V$zx" role="2VODD2">
-                <node concept="3clFbF" id="6UWSvq4V_wP" role="3cqZAp">
-                  <node concept="2OqwBi" id="5itBwM5CfeV" role="3clFbG">
-                    <node concept="2OqwBi" id="6UWSvq4V_J_" role="2Oq$k0">
-                      <node concept="30H73N" id="6UWSvq4V_wO" role="2Oq$k0" />
-                      <node concept="3Tsc0h" id="6UWSvq4V_ZJ" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
-                      </node>
-                    </node>
-                    <node concept="v3k3i" id="5itBwM5CibQ" role="2OqNvi">
-                      <node concept="chp4Y" id="5itBwM5CjQg" role="v3oSu">
-                        <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6UWSvq4VF$G" role="3cqZAp" />
-        <node concept="3clFbF" id="6UWSvq4VEZr" role="3cqZAp">
-          <node concept="37vLTw" id="6UWSvq4VEZp" role="3clFbG">
-            <ref role="3cqZAo" node="6UWSvq4VxXC" resolve="macroConcepts" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="6UWSvq4Vrn9" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="6UWSvq4Vt1Z" role="jymVt" />
     <node concept="3clFb_" id="4MEOIDEWLFp" role="jymVt">
       <property role="TrG5h" value="allMacroTemplateRefs" />
@@ -7465,11 +5911,6 @@
         <ref role="v9R2y" node="5itBwM6OLaP" resolve="frag_MacroTable_ExpandMacroTemplate" />
       </node>
     </node>
-    <node concept="2tJIrI" id="1GNw78$IsA6" role="jymVt">
-      <node concept="5jKBG" id="1GKPrS22e71" role="lGtFl">
-        <ref role="v9R2y" node="1GNw78$HcGL" resolve="frag_MacroTable_MacroTemplate" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="1GNw78$IwZE" role="jymVt">
       <node concept="5jKBG" id="5itBwM5KGOr" role="lGtFl">
         <ref role="v9R2y" node="5itBwM5DDFP" resolve="frag_MacroTable_CallMacroTemplate" />
@@ -10878,964 +9319,6 @@
       </node>
     </node>
   </node>
-  <node concept="13MO4I" id="1GNw78$HcGL">
-    <property role="3GE5qa" value="macro" />
-    <property role="TrG5h" value="frag_MacroTable_MacroTemplate" />
-    <ref role="3gUMe" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
-    <node concept="312cEu" id="1GNw78$HcGN" role="13RCb5">
-      <property role="TrG5h" value="__MacroTable" />
-      <node concept="2tJIrI" id="1GNw78$HcHb" role="jymVt" />
-      <node concept="312cEu" id="4JJCDIm$yLt" role="jymVt">
-        <property role="2bfB8j" value="false" />
-        <property role="TrG5h" value="_Template" />
-        <node concept="2tJIrI" id="4JJCDIm$Llo" role="jymVt" />
-        <node concept="312cEu" id="1GNw78$gMhl" role="jymVt">
-          <property role="2bfB8j" value="false" />
-          <property role="TrG5h" value="Token" />
-          <node concept="2tJIrI" id="1GNw78$khpO" role="jymVt" />
-          <node concept="2YIFZL" id="4MEOIDGH8rn" role="jymVt">
-            <property role="TrG5h" value="forInputNode" />
-            <node concept="37vLTG" id="4MEOIDGHboL" role="3clF46">
-              <property role="TrG5h" value="inputNode" />
-              <node concept="3Tqbb2" id="4MEOIDGHbsQ" role="1tU5fm" />
-              <node concept="2ZBi8u" id="4MEOIDGHmbS" role="lGtFl">
-                <ref role="2rW$FS" node="7IysFeAiAcO" resolve="macro_inputNode_variable" />
-              </node>
-              <node concept="17Uvod" id="6DOfTm$$QLH" role="lGtFl">
-                <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-                <property role="2qtEX9" value="name" />
-                <node concept="3zFVjK" id="6DOfTm$$QLI" role="3zH0cK">
-                  <node concept="3clFbS" id="6DOfTm$$QLJ" role="2VODD2">
-                    <node concept="3clFbF" id="6DOfTm$$Tby" role="3cqZAp">
-                      <node concept="2OqwBi" id="6DOfTm$$UEf" role="3clFbG">
-                        <node concept="2OqwBi" id="6DOfTm$$Ts2" role="2Oq$k0">
-                          <node concept="30H73N" id="6DOfTm$$Tbx" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="6DOfTm$$TUR" role="2OqNvi">
-                            <ref role="3Tt5mk" to="wq2x:6DOfTm$zUE3" resolve="input" />
-                          </node>
-                        </node>
-                        <node concept="3TrcHB" id="6DOfTm$$Vah" role="2OqNvi">
-                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3uibUv" id="20Ay2Ve9uJe" role="3clF45">
-              <ref role="3uigEE" node="1GNw78$gMhl" resolve="__MacroTable._Template.Token" />
-            </node>
-            <node concept="3Tmbuc" id="5yr01fDFjUP" role="1B3o_S" />
-            <node concept="3clFbS" id="4MEOIDGH8rr" role="3clF47">
-              <node concept="3clFbF" id="4MEOIDGHbyZ" role="3cqZAp">
-                <node concept="2ShNRf" id="4MEOIDGHbyX" role="3clFbG">
-                  <node concept="1pGfFk" id="4MEOIDGHc5A" role="2ShVmc">
-                    <ref role="37wK5l" node="1GNw78$kUFK" resolve="__MacroTable._Template.Token" />
-                    <node concept="37vLTw" id="6EY0p2x1U_O" role="37wK5m">
-                      <ref role="3cqZAo" node="4MEOIDGHboL" resolve="inputNode" />
-                    </node>
-                    <node concept="2OqwBi" id="4MEOIDGHc9G" role="37wK5m">
-                      <node concept="2ShNRf" id="4MEOIDGHc9H" role="2Oq$k0">
-                        <node concept="YeOm9" id="4MEOIDGHc9I" role="2ShVmc">
-                          <node concept="1Y3b0j" id="4MEOIDGHc9J" role="YeSDq">
-                            <property role="2bfB8j" value="true" />
-                            <ref role="1Y3XeK" to="psr6:7IysFeAhp4q" resolve="Init" />
-                            <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                            <node concept="3Tm1VV" id="4MEOIDGHc9K" role="1B3o_S" />
-                            <node concept="3clFb_" id="4MEOIDGHc9L" role="jymVt">
-                              <property role="1EzhhJ" value="false" />
-                              <property role="TrG5h" value="get" />
-                              <node concept="3Tm1VV" id="4MEOIDGHc9M" role="1B3o_S" />
-                              <node concept="3uibUv" id="4MEOIDGHc9N" role="3clF45">
-                                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                                <node concept="29HgVG" id="4MEOIDGHc9O" role="lGtFl">
-                                  <node concept="3NFfHV" id="4MEOIDGHc9P" role="3NFExx">
-                                    <node concept="3clFbS" id="4MEOIDGHc9Q" role="2VODD2">
-                                      <node concept="3clFbF" id="4MEOIDGHc9R" role="3cqZAp">
-                                        <node concept="2OqwBi" id="4MEOIDGHc9S" role="3clFbG">
-                                          <node concept="3TrEf2" id="4MEOIDGHc9T" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="wq2x:7IysFeA0ybI" resolve="type" />
-                                          </node>
-                                          <node concept="30H73N" id="4MEOIDGHc9U" role="2Oq$k0" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbS" id="4MEOIDGHc9V" role="3clF47">
-                                <node concept="3clFbF" id="4MEOIDGHc9W" role="3cqZAp">
-                                  <node concept="10Nm6u" id="4MEOIDGHc9X" role="3clFbG" />
-                                  <node concept="2b32R4" id="4MEOIDGHc9Y" role="lGtFl">
-                                    <node concept="3JmXsc" id="4MEOIDGHc9Z" role="2P8S$">
-                                      <node concept="3clFbS" id="4MEOIDGHca0" role="2VODD2">
-                                        <node concept="3clFbF" id="4MEOIDGHca1" role="3cqZAp">
-                                          <node concept="2OqwBi" id="4MEOIDGHca2" role="3clFbG">
-                                            <node concept="2OqwBi" id="4MEOIDGHca3" role="2Oq$k0">
-                                              <node concept="2OqwBi" id="4MEOIDGHca4" role="2Oq$k0">
-                                                <node concept="30H73N" id="4MEOIDGHca5" role="2Oq$k0" />
-                                                <node concept="3TrEf2" id="4MEOIDGHca6" role="2OqNvi">
-                                                  <ref role="3Tt5mk" to="wq2x:7IysFeA5xBQ" resolve="init" />
-                                                </node>
-                                              </node>
-                                              <node concept="3TrEf2" id="4MEOIDGHca7" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
-                                              </node>
-                                            </node>
-                                            <node concept="3Tsc0h" id="4MEOIDGHca8" role="2OqNvi">
-                                              <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3uibUv" id="4MEOIDGHca9" role="2Ghqu4">
-                              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                              <node concept="29HgVG" id="4MEOIDGHcaa" role="lGtFl">
-                                <node concept="3NFfHV" id="4MEOIDGHcab" role="3NFExx">
-                                  <node concept="3clFbS" id="4MEOIDGHcac" role="2VODD2">
-                                    <node concept="3clFbF" id="4MEOIDGHcad" role="3cqZAp">
-                                      <node concept="2OqwBi" id="4MEOIDGHcae" role="3clFbG">
-                                        <node concept="3TrEf2" id="4MEOIDGHcaf" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="wq2x:7IysFeA0ybI" resolve="type" />
-                                        </node>
-                                        <node concept="30H73N" id="4MEOIDGHcag" role="2Oq$k0" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="1W57fq" id="4MEOIDGHA0Q" role="lGtFl">
-                          <node concept="3IZrLx" id="4MEOIDGHA0S" role="3IZSJc">
-                            <node concept="3clFbS" id="4MEOIDGHA0U" role="2VODD2">
-                              <node concept="3clFbF" id="4MEOIDGHBiY" role="3cqZAp">
-                                <node concept="2OqwBi" id="4MEOIDGHCNw" role="3clFbG">
-                                  <node concept="2OqwBi" id="4MEOIDGHByX" role="2Oq$k0">
-                                    <node concept="30H73N" id="4MEOIDGHBiX" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="4MEOIDGHCix" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:7IysFeA5xBQ" resolve="init" />
-                                    </node>
-                                  </node>
-                                  <node concept="3x8VRR" id="4MEOIDGHDmN" role="2OqNvi" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="gft3U" id="4MEOIDGHDFj" role="UU_$l">
-                            <node concept="10Nm6u" id="4MEOIDGHEtU" role="gfFT$" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="4MEOIDGHcah" role="2OqNvi">
-                        <ref role="37wK5l" node="4MEOIDGHc9L" resolve="get" />
-                      </node>
-                      <node concept="1WS0z7" id="4MEOIDGHsEN" role="lGtFl">
-                        <node concept="3JmXsc" id="4MEOIDGHsEP" role="3Jn$fo">
-                          <node concept="3clFbS" id="4MEOIDGHsER" role="2VODD2">
-                            <node concept="3clFbF" id="4MEOIDGHtH6" role="3cqZAp">
-                              <node concept="2OqwBi" id="4MEOIDGHulc" role="3clFbG">
-                                <node concept="30H73N" id="4MEOIDGHtH5" role="2Oq$k0" />
-                                <node concept="3Tsc0h" id="4MEOIDGHviP" role="2OqNvi">
-                                  <ref role="3TtcxE" to="wq2x:7IysFeA0yca" resolve="parameter" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2tJIrI" id="4MEOIDGH5Ef" role="jymVt" />
-          <node concept="3clFbW" id="1GNw78$kUFK" role="jymVt">
-            <node concept="3cqZAl" id="1GNw78$kUFN" role="3clF45" />
-            <node concept="3Tmbuc" id="5yr01fDFlgM" role="1B3o_S" />
-            <node concept="3clFbS" id="1GNw78$kUFP" role="3clF47">
-              <node concept="3clFbF" id="6EY0p2x1UB4" role="3cqZAp">
-                <node concept="37vLTI" id="6EY0p2x1UB6" role="3clFbG">
-                  <node concept="2OqwBi" id="6EY0p2x1W5Y" role="37vLTJ">
-                    <node concept="Xjq3P" id="6EY0p2x1W7T" role="2Oq$k0" />
-                    <node concept="2OwXpG" id="6EY0p2x1W61" role="2OqNvi">
-                      <ref role="2Oxat5" node="6EY0p2x1UB0" resolve="input" />
-                    </node>
-                  </node>
-                  <node concept="37vLTw" id="6EY0p2x1UBa" role="37vLTx">
-                    <ref role="3cqZAo" node="6EY0p2x1Uw4" resolve="input" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbJ" id="1GNw78$lynN" role="3cqZAp">
-                <node concept="3clFbS" id="1GNw78$lynO" role="3clFbx">
-                  <node concept="3clFbF" id="1GNw78$lynP" role="3cqZAp">
-                    <node concept="37vLTI" id="1GNw78$lynQ" role="3clFbG">
-                      <node concept="10QFUN" id="1GNw78$lynR" role="37vLTx">
-                        <node concept="3uibUv" id="1GNw78$lynS" role="10QFUM">
-                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                          <node concept="29HgVG" id="1GNw78$lynT" role="lGtFl">
-                            <node concept="3NFfHV" id="1GNw78$lynU" role="3NFExx">
-                              <node concept="3clFbS" id="1GNw78$lynV" role="2VODD2">
-                                <node concept="3clFbF" id="1GNw78$lynW" role="3cqZAp">
-                                  <node concept="2OqwBi" id="1GNw78$lynX" role="3clFbG">
-                                    <node concept="3TrEf2" id="1GNw78$lynY" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:7IysFeA0ybI" resolve="type" />
-                                    </node>
-                                    <node concept="30H73N" id="1GNw78$lynZ" role="2Oq$k0" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="AH0OO" id="1GNw78$lyo0" role="10QFUP">
-                          <node concept="3cmrfG" id="1GNw78$lyo1" role="AHEQo">
-                            <property role="3cmrfH" value="0" />
-                            <node concept="17Uvod" id="1GNw78$lyo2" role="lGtFl">
-                              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
-                              <property role="2qtEX9" value="value" />
-                              <node concept="3zFVjK" id="1GNw78$lyo3" role="3zH0cK">
-                                <node concept="3clFbS" id="1GNw78$lyo4" role="2VODD2">
-                                  <node concept="3clFbF" id="1GNw78$lyo5" role="3cqZAp">
-                                    <node concept="2OqwBi" id="1GNw78$lyo6" role="3clFbG">
-                                      <node concept="30H73N" id="1GNw78$lyo7" role="2Oq$k0" />
-                                      <node concept="2bSWHS" id="1GNw78$lyo8" role="2OqNvi" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="37vLTw" id="1GNw78$lyo9" role="AHHXb">
-                            <ref role="3cqZAo" node="1GNw78$l3fp" resolve="args" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="1GNw78$lyoa" role="37vLTJ">
-                        <node concept="Xjq3P" id="1GNw78$lyob" role="2Oq$k0" />
-                        <node concept="2OwXpG" id="1GNw78$lyoc" role="2OqNvi">
-                          <ref role="2Oxat5" node="1GNw78$lpLZ" resolve="param" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="1WS0z7" id="1GNw78$lyod" role="lGtFl">
-                      <node concept="3JmXsc" id="1GNw78$lyoe" role="3Jn$fo">
-                        <node concept="3clFbS" id="1GNw78$lyof" role="2VODD2">
-                          <node concept="3clFbF" id="1GNw78$lyog" role="3cqZAp">
-                            <node concept="2OqwBi" id="1GNw78$lyoh" role="3clFbG">
-                              <node concept="3Tsc0h" id="1GNw78$lyoi" role="2OqNvi">
-                                <ref role="3TtcxE" to="wq2x:7IysFeA0yca" resolve="parameter" />
-                              </node>
-                              <node concept="30H73N" id="1GNw78$lyoj" role="2Oq$k0" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="4KRwoelXrz7" role="3cqZAp" />
-                </node>
-                <node concept="1Wc70l" id="4KRwoelUs5Y" role="3clFbw">
-                  <node concept="3y3z36" id="4KRwoelUt2L" role="3uHU7B">
-                    <node concept="10Nm6u" id="4KRwoelUt9L" role="3uHU7w" />
-                    <node concept="37vLTw" id="4KRwoelUs_p" role="3uHU7B">
-                      <ref role="3cqZAo" node="1GNw78$l3fp" resolve="args" />
-                    </node>
-                  </node>
-                  <node concept="3eOSWO" id="4KRwoelSn2A" role="3uHU7w">
-                    <node concept="3cmrfG" id="4KRwoelSn4g" role="3uHU7w">
-                      <property role="3cmrfH" value="0" />
-                    </node>
-                    <node concept="2OqwBi" id="4KRwoelSjUL" role="3uHU7B">
-                      <node concept="37vLTw" id="4KRwoelSjqW" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1GNw78$l3fp" resolve="args" />
-                      </node>
-                      <node concept="1Rwk04" id="4KRwoelSkRh" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="1GNw78$rx0u" role="3cqZAp">
-                <node concept="1rXfSq" id="1GNw78$rx0s" role="3clFbG">
-                  <ref role="37wK5l" node="1GNw78$ri7u" resolve="init" />
-                </node>
-              </node>
-            </node>
-            <node concept="37vLTG" id="6EY0p2x1Uw4" role="3clF46">
-              <property role="TrG5h" value="input" />
-              <node concept="3Tqbb2" id="6EY0p2x1UwW" role="1tU5fm" />
-            </node>
-            <node concept="37vLTG" id="1GNw78$l3fp" role="3clF46">
-              <property role="TrG5h" value="args" />
-              <node concept="8X2XB" id="1GNw78$l3N7" role="1tU5fm">
-                <node concept="3uibUv" id="1GNw78$l3fo" role="8Xvag">
-                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2tJIrI" id="4KRwoem6ilI" role="jymVt" />
-          <node concept="3clFb_" id="1GNw78$ri7u" role="jymVt">
-            <property role="TrG5h" value="init" />
-            <node concept="3cqZAl" id="1GNw78$ri7v" role="3clF45" />
-            <node concept="3Tm6S6" id="1GNw78$ri7w" role="1B3o_S" />
-            <node concept="3clFbS" id="1GNw78$ri7x" role="3clF47">
-              <node concept="3clFbF" id="1GNw78$ri7y" role="3cqZAp">
-                <node concept="37vLTI" id="1GNw78$ri7z" role="3clFbG">
-                  <node concept="10Nm6u" id="1GNw78$ri7$" role="37vLTx" />
-                  <node concept="2OqwBi" id="1GNw78$ri7_" role="37vLTJ">
-                    <node concept="Xjq3P" id="1GNw78$ri7A" role="2Oq$k0" />
-                    <node concept="2OwXpG" id="4KRwoeml1wB" role="2OqNvi">
-                      <ref role="2Oxat5" node="4KRwoemkfTN" resolve="logical" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="1W57fq" id="1GNw78$ri7C" role="lGtFl">
-                  <node concept="3IZrLx" id="1GNw78$ri7D" role="3IZSJc">
-                    <node concept="3clFbS" id="1GNw78$ri7E" role="2VODD2">
-                      <node concept="3clFbF" id="1GNw78$ri7F" role="3cqZAp">
-                        <node concept="2OqwBi" id="1GNw78$ri7G" role="3clFbG">
-                          <node concept="2OqwBi" id="1GNw78$ri7H" role="2Oq$k0">
-                            <node concept="30H73N" id="1GNw78$ri7I" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="1GNw78$ri7J" role="2OqNvi">
-                              <ref role="3Tt5mk" to="wq2x:7IysFe_ZQc2" resolve="body" />
-                            </node>
-                          </node>
-                          <node concept="3x8VRR" id="1GNw78$ri7K" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1WS0z7" id="1GNw78$ri7L" role="lGtFl">
-                  <node concept="3JmXsc" id="1GNw78$ri7M" role="3Jn$fo">
-                    <node concept="3clFbS" id="1GNw78$ri7N" role="2VODD2">
-                      <node concept="3clFbF" id="1GNw78$ri7O" role="3cqZAp">
-                        <node concept="2OqwBi" id="1GNw78$ri7P" role="3clFbG">
-                          <node concept="2OqwBi" id="1GNw78$ri7Q" role="2Oq$k0">
-                            <node concept="30H73N" id="1GNw78$ri7R" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="1GNw78$ri7S" role="2OqNvi">
-                              <ref role="3Tt5mk" to="wq2x:7IysFe_ZQc2" resolve="body" />
-                            </node>
-                          </node>
-                          <node concept="2qgKlT" id="2J$kxDI0SNz" role="2OqNvi">
-                            <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1sPUBX" id="1GNw78$ri7U" role="lGtFl">
-                  <ref role="v9R2y" node="452KZTbs$z9" resolve="contextName_field_init" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2tJIrI" id="5itBwM7chAV" role="jymVt" />
-          <node concept="3clFb_" id="5itBwM7c9t1" role="jymVt">
-            <property role="TrG5h" value="apply" />
-            <node concept="3uibUv" id="5itBwM7c9t2" role="3clF45">
-              <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-            </node>
-            <node concept="3Tm1VV" id="5itBwM7c9t3" role="1B3o_S" />
-            <node concept="3clFbS" id="5itBwM7c9t5" role="3clF47">
-              <node concept="YS8fn" id="5itBwM7cjto" role="3cqZAp">
-                <node concept="2ShNRf" id="5itBwM7cjtp" role="YScLw">
-                  <node concept="1pGfFk" id="5itBwM7cjtq" role="2ShVmc">
-                    <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2AHcQZ" id="5itBwM7c9t6" role="2AJF6D">
-              <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-            </node>
-          </node>
-          <node concept="2tJIrI" id="5itBwM7cju2" role="jymVt" />
-          <node concept="3clFb_" id="4KRwoelnc3p" role="jymVt">
-            <property role="TrG5h" value="applyMacro" />
-            <node concept="37vLTG" id="4KRwoelnkwd" role="3clF46">
-              <property role="TrG5h" value="logical" />
-              <node concept="3uibUv" id="1HWyn8jfWs7" role="1tU5fm">
-                <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-                <node concept="3uibUv" id="1HWyn8jfWVu" role="11_B2D">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-                </node>
-              </node>
-              <node concept="2ZBi8u" id="4KRwoel$60G" role="lGtFl">
-                <ref role="2rW$FS" node="7IysFeAHWd7" resolve="macro_template_logical" />
-              </node>
-            </node>
-            <node concept="37vLTG" id="4KRwoelnkwf" role="3clF46">
-              <property role="TrG5h" value="session" />
-              <node concept="3uibUv" id="4KRwoelnkwg" role="1tU5fm">
-                <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-              </node>
-            </node>
-            <node concept="3uibUv" id="4KRwoelneiV" role="3clF45">
-              <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-            </node>
-            <node concept="3Tmbuc" id="Ya9Z$kTESR" role="1B3o_S" />
-            <node concept="3clFbS" id="4KRwoelnc3t" role="3clF47">
-              <node concept="3cpWs8" id="4KRwoelno2_" role="3cqZAp">
-                <node concept="3cpWsn" id="4KRwoelno2A" role="3cpWs9">
-                  <property role="TrG5h" value="_session" />
-                  <node concept="3uibUv" id="4KRwoelno2B" role="1tU5fm">
-                    <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-                  </node>
-                  <node concept="37vLTw" id="4KRwoelno2C" role="33vP2m">
-                    <ref role="3cqZAo" node="4KRwoelnkwf" resolve="session" />
-                  </node>
-                  <node concept="2ZBi8u" id="4KRwoelno2D" role="lGtFl">
-                    <ref role="2rW$FS" node="429xoypVg6q" resolve="apply_session_parameter" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="4KRwoelno2E" role="3cqZAp">
-                <node concept="3cpWsn" id="4KRwoelno2F" role="3cpWs9">
-                  <property role="TrG5h" value="builder" />
-                  <node concept="3uibUv" id="4KRwoelno2G" role="1tU5fm">
-                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                  </node>
-                  <node concept="2ShNRf" id="4KRwoelno2H" role="33vP2m">
-                    <node concept="1pGfFk" id="4KRwoelno2I" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
-                      <node concept="37vLTw" id="5yr01fE26tX" role="37wK5m">
-                        <ref role="3cqZAo" node="4KRwoelnkwf" resolve="session" />
-                      </node>
-                      <node concept="Xl_RD" id="4KRwoelno2J" role="37wK5m">
-                        <property role="Xl_RC" value="" />
-                        <node concept="17Uvod" id="4KRwoelno2K" role="lGtFl">
-                          <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                          <property role="2qtEX9" value="value" />
-                          <node concept="3zFVjK" id="4KRwoelno2L" role="3zH0cK">
-                            <node concept="3clFbS" id="4KRwoelno2M" role="2VODD2">
-                              <node concept="3clFbF" id="4KRwoelno2N" role="3cqZAp">
-                                <node concept="2OqwBi" id="4KRwoelno2O" role="3clFbG">
-                                  <node concept="30H73N" id="4KRwoelno2P" role="2Oq$k0" />
-                                  <node concept="2qgKlT" id="4KRwoelno2Q" role="2OqNvi">
-                                    <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2ZBi8u" id="4KRwoelno2R" role="lGtFl">
-                    <ref role="2rW$FS" node="4vbeH84GUyf" resolve="builder_variable" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="4MEOIDEEkJ_" role="3cqZAp" />
-              <node concept="3clFbH" id="4KRwoelno2T" role="3cqZAp">
-                <node concept="2b32R4" id="4KRwoelno2U" role="lGtFl">
-                  <node concept="3JmXsc" id="4KRwoelno2V" role="2P8S$">
-                    <node concept="3clFbS" id="4KRwoelno2W" role="2VODD2">
-                      <node concept="3clFbF" id="4KRwoelno2X" role="3cqZAp">
-                        <node concept="2OqwBi" id="4KRwoelno2Y" role="3clFbG">
-                          <node concept="2OqwBi" id="4KRwoelno2Z" role="2Oq$k0">
-                            <node concept="2OqwBi" id="4KRwoelno30" role="2Oq$k0">
-                              <node concept="30H73N" id="4KRwoelno31" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="4KRwoelno32" role="2OqNvi">
-                                <ref role="3Tt5mk" to="wq2x:7IysFe_ZQc2" resolve="body" />
-                              </node>
-                            </node>
-                            <node concept="3TrEf2" id="4KRwoelno33" role="2OqNvi">
-                              <ref role="3Tt5mk" to="wq2x:7IysFe_ZPXC" resolve="code" />
-                            </node>
-                          </node>
-                          <node concept="3Tsc0h" id="4KRwoelno34" role="2OqNvi">
-                            <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="4KRwoelno4_" role="3cqZAp" />
-              <node concept="3clFbF" id="6ZznG7qCnyY" role="3cqZAp">
-                <node concept="2OqwBi" id="6ZznG7qCnKh" role="3clFbG">
-                  <node concept="37vLTw" id="6ZznG7qCnyW" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4KRwoelno2F" resolve="builder" />
-                  </node>
-                  <node concept="liA8E" id="6ZznG7qCnV8" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:6ZznG7qAAZS" resolve="processMacroApp" />
-                    <node concept="37vLTw" id="6ZznG7qCo9m" role="37wK5m">
-                      <ref role="3cqZAo" node="6EY0p2x1UB0" resolve="input" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="4KRwoelno4A" role="3cqZAp">
-                <node concept="37vLTw" id="4KRwoelno4B" role="3clFbG">
-                  <ref role="3cqZAo" node="4KRwoelno2F" resolve="builder" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2tJIrI" id="4KRwoeln9Hk" role="jymVt" />
-          <node concept="312cEg" id="1GNw78$lpLZ" role="jymVt">
-            <property role="TrG5h" value="param" />
-            <node concept="3Tmbuc" id="1GNw78$rryt" role="1B3o_S" />
-            <node concept="3uibUv" id="1GNw78$lpM1" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              <node concept="29HgVG" id="1GNw78$lpM2" role="lGtFl">
-                <node concept="3NFfHV" id="1GNw78$lpM3" role="3NFExx">
-                  <node concept="3clFbS" id="1GNw78$lpM4" role="2VODD2">
-                    <node concept="3clFbF" id="1GNw78$lpM5" role="3cqZAp">
-                      <node concept="2OqwBi" id="1GNw78$lpM6" role="3clFbG">
-                        <node concept="3TrEf2" id="1GNw78$lpM7" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:7IysFeA0ybI" resolve="type" />
-                        </node>
-                        <node concept="30H73N" id="1GNw78$lpM8" role="2Oq$k0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1WS0z7" id="1GNw78$lpM9" role="lGtFl">
-              <ref role="2rW$FS" node="7IysFeAaXEh" resolve="macroParam_field" />
-              <node concept="3JmXsc" id="1GNw78$lpMa" role="3Jn$fo">
-                <node concept="3clFbS" id="1GNw78$lpMb" role="2VODD2">
-                  <node concept="3clFbF" id="1GNw78$lpMc" role="3cqZAp">
-                    <node concept="2OqwBi" id="1GNw78$lpMd" role="3clFbG">
-                      <node concept="3Tsc0h" id="1GNw78$lpMe" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:7IysFeA0yca" resolve="parameter" />
-                      </node>
-                      <node concept="30H73N" id="1GNw78$lpMf" role="2Oq$k0" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="17Uvod" id="1GNw78$lpMg" role="lGtFl">
-              <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-              <property role="2qtEX9" value="name" />
-              <node concept="3zFVjK" id="1GNw78$lpMh" role="3zH0cK">
-                <node concept="3clFbS" id="1GNw78$lpMi" role="2VODD2">
-                  <node concept="3clFbF" id="1GNw78$lpMj" role="3cqZAp">
-                    <node concept="2OqwBi" id="1GNw78$lpMk" role="3clFbG">
-                      <node concept="3TrcHB" id="1GNw78$lpMl" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                      </node>
-                      <node concept="30H73N" id="1GNw78$lpMm" role="2Oq$k0" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="312cEg" id="4KRwoemkfTN" role="jymVt">
-            <property role="TrG5h" value="logical" />
-            <node concept="3Tmbuc" id="4KRwoemkyyc" role="1B3o_S" />
-            <node concept="3uibUv" id="4KRwoemkjYJ" role="1tU5fm">
-              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-            </node>
-            <node concept="1W57fq" id="4KRwoemkpLo" role="lGtFl">
-              <node concept="3IZrLx" id="4KRwoemkpLq" role="3IZSJc">
-                <node concept="3clFbS" id="4KRwoemkpLs" role="2VODD2">
-                  <node concept="3clFbF" id="4KRwoemkqgs" role="3cqZAp">
-                    <node concept="2OqwBi" id="4KRwoemkqgt" role="3clFbG">
-                      <node concept="2OqwBi" id="4KRwoemkqgu" role="2Oq$k0">
-                        <node concept="30H73N" id="4KRwoemkqgv" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="4KRwoemkqgw" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:7IysFe_ZQc2" resolve="body" />
-                        </node>
-                      </node>
-                      <node concept="3x8VRR" id="4KRwoemkqgx" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1WS0z7" id="4KRwoemkneR" role="lGtFl">
-              <node concept="3JmXsc" id="4KRwoemkneT" role="3Jn$fo">
-                <node concept="3clFbS" id="4KRwoemkneV" role="2VODD2">
-                  <node concept="3clFbF" id="4KRwoemkpfk" role="3cqZAp">
-                    <node concept="2OqwBi" id="4KRwoemkpfl" role="3clFbG">
-                      <node concept="2OqwBi" id="4KRwoemkpfm" role="2Oq$k0">
-                        <node concept="3TrEf2" id="4KRwoemkpfn" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:7IysFe_ZQc2" resolve="body" />
-                        </node>
-                        <node concept="30H73N" id="4KRwoemkpfo" role="2Oq$k0" />
-                      </node>
-                      <node concept="2qgKlT" id="2J$kxDI4jHC" role="2OqNvi">
-                        <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1sPUBX" id="4KRwoemkndt" role="lGtFl">
-              <ref role="v9R2y" node="452KZTbxEFE" resolve="contextName_field_declaration" />
-            </node>
-          </node>
-          <node concept="312cEg" id="6EY0p2x1UB0" role="jymVt">
-            <property role="TrG5h" value="input" />
-            <node concept="3Tm6S6" id="6EY0p2x1UB1" role="1B3o_S" />
-            <node concept="3Tqbb2" id="6EY0p2x1UB3" role="1tU5fm" />
-            <node concept="2ZBi8u" id="6EY0p2x1XTP" role="lGtFl">
-              <ref role="2rW$FS" node="6EY0p2x1Uxb" resolve="macro_inputNode_field" />
-            </node>
-          </node>
-          <node concept="3Tm1VV" id="1GNw78$gMhm" role="1B3o_S" />
-          <node concept="3uibUv" id="1eKXYsjDeaP" role="EKbjA">
-            <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-          </node>
-          <node concept="2ZBi8u" id="7XmdqtdNdU0" role="lGtFl">
-            <ref role="2rW$FS" node="7XmdqtdHiM8" resolve="macro_token_class" />
-          </node>
-        </node>
-        <node concept="2tJIrI" id="1GNw78$gI1a" role="jymVt" />
-        <node concept="2tJIrI" id="1GNw78$gI1L" role="jymVt" />
-        <node concept="3clFbW" id="4JJCDIm$QjW" role="jymVt">
-          <node concept="3cqZAl" id="4JJCDIm$QjY" role="3clF45" />
-          <node concept="3Tm1VV" id="4JJCDIm$QjZ" role="1B3o_S" />
-          <node concept="3clFbS" id="4JJCDIm$Qk0" role="3clF47">
-            <node concept="XkiVB" id="5yr01fDEzsd" role="3cqZAp">
-              <ref role="37wK5l" to="psr6:5yr01fDEuEm" resolve="AbstractMacroTemplate" />
-              <node concept="2YIFZM" id="5yr01fDEzPy" role="37wK5m">
-                <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
-                <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
-                <node concept="Xl_RD" id="5yr01fDEzRV" role="37wK5m">
-                  <property role="Xl_RC" value="" />
-                  <node concept="17Uvod" id="5yr01fDEzVr" role="lGtFl">
-                    <property role="2qtEX9" value="value" />
-                    <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                    <node concept="3zFVjK" id="5yr01fDEzVs" role="3zH0cK">
-                      <node concept="3clFbS" id="5yr01fDEzVt" role="2VODD2">
-                        <node concept="3clFbF" id="5yr01fDE$4W" role="3cqZAp">
-                          <node concept="2OqwBi" id="5yr01fDE$4X" role="3clFbG">
-                            <node concept="2OqwBi" id="5yr01fDE$4Y" role="2Oq$k0">
-                              <node concept="2JrnkZ" id="5yr01fDE$4Z" role="2Oq$k0">
-                                <node concept="2OqwBi" id="5yr01fDE$50" role="2JrQYb">
-                                  <node concept="1iwH7S" id="5yr01fDE$51" role="2Oq$k0" />
-                                  <node concept="12$id9" id="5yr01fDE$52" role="2OqNvi">
-                                    <node concept="30H73N" id="5yr01fDE$53" role="12$y8L" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="liA8E" id="5yr01fDE$54" role="2OqNvi">
-                                <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="5yr01fDE$55" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2ZBi8u" id="4JJCDIm_tMI" role="lGtFl">
-            <ref role="2rW$FS" node="4JJCDIm$O$I" resolve="macro_template_constructor" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="4JJCDIm$yLu" role="1B3o_S" />
-        <node concept="17Uvod" id="4JJCDIm$JE9" role="lGtFl">
-          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-          <property role="2qtEX9" value="name" />
-          <node concept="3zFVjK" id="4JJCDIm$JEc" role="3zH0cK">
-            <node concept="3clFbS" id="4JJCDIm$JEd" role="2VODD2">
-              <node concept="3clFbF" id="4JJCDIm$KJI" role="3cqZAp">
-                <node concept="3cpWs3" id="4JJCDIm$KJJ" role="3clFbG">
-                  <node concept="3zGtF$" id="4JJCDIm$KJK" role="3uHU7w" />
-                  <node concept="2OqwBi" id="4JJCDIm$KJL" role="3uHU7B">
-                    <node concept="3TrcHB" id="4JJCDIm$KJM" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                    <node concept="30H73N" id="4JJCDIm$KJN" role="2Oq$k0" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3uibUv" id="4JJCDIm$SaN" role="1zkMxy">
-          <ref role="3uigEE" to="psr6:1hX44vNlvEV" resolve="AbstractMacroTemplate" />
-          <node concept="3uibUv" id="1GNw78$kyyL" role="11_B2D">
-            <ref role="3uigEE" node="1GNw78$gMhl" resolve="__MacroTable._Template.Token" />
-          </node>
-        </node>
-        <node concept="2tJIrI" id="60NbDCXHpqs" role="jymVt" />
-        <node concept="3clFb_" id="4KRwoelAK4g" role="jymVt">
-          <property role="TrG5h" value="withArgs" />
-          <property role="1EzhhJ" value="false" />
-          <node concept="37vLTG" id="4KRwoelAK4h" role="3clF46">
-            <property role="TrG5h" value="args" />
-            <node concept="8X2XB" id="4KRwoelAK4i" role="1tU5fm">
-              <node concept="3uibUv" id="4KRwoelAK4j" role="8Xvag">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-            </node>
-          </node>
-          <node concept="3uibUv" id="4KRwoelAK4n" role="3clF45">
-            <ref role="3uigEE" node="1GNw78$gMhl" resolve="__MacroTable._Template.Token" />
-          </node>
-          <node concept="3Tm1VV" id="4KRwoelAK4l" role="1B3o_S" />
-          <node concept="3clFbS" id="4KRwoelAK4o" role="3clF47">
-            <node concept="3clFbF" id="4KRwoelAVUv" role="3cqZAp">
-              <node concept="2ShNRf" id="4KRwoelAVUw" role="3clFbG">
-                <node concept="1pGfFk" id="4KRwoelAVUx" role="2ShVmc">
-                  <ref role="37wK5l" node="1GNw78$kUFK" resolve="__MacroTable._Template.Token" />
-                  <node concept="10Nm6u" id="6EY0p2x1Wqz" role="37wK5m" />
-                  <node concept="37vLTw" id="4KRwoelAWIE" role="37wK5m">
-                    <ref role="3cqZAo" node="4KRwoelAK4h" resolve="args" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="4KRwoelAK4p" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="2tJIrI" id="4KRwoelAXy6" role="jymVt" />
-        <node concept="3clFb_" id="4KRwoelAK47" role="jymVt">
-          <property role="TrG5h" value="withInputNode" />
-          <property role="1EzhhJ" value="false" />
-          <node concept="37vLTG" id="4KRwoelAK48" role="3clF46">
-            <property role="TrG5h" value="inputNode" />
-            <node concept="3Tqbb2" id="4KRwoelAK49" role="1tU5fm" />
-          </node>
-          <node concept="3uibUv" id="4KRwoelAK4d" role="3clF45">
-            <ref role="3uigEE" node="1GNw78$gMhl" resolve="__MacroTable._Template.Token" />
-          </node>
-          <node concept="3Tmbuc" id="60NbDCXHfR8" role="1B3o_S" />
-          <node concept="3clFbS" id="4KRwoelAK4e" role="3clF47">
-            <node concept="3cpWs6" id="20Ay2Ve9Vq_" role="3cqZAp">
-              <node concept="2YIFZM" id="20Ay2Ve9VqA" role="3cqZAk">
-                <ref role="37wK5l" node="4MEOIDGH8rn" resolve="forInputNode" />
-                <ref role="1Pybhc" node="1GNw78$gMhl" resolve="__MacroTable._Template.Token" />
-                <node concept="37vLTw" id="20Ay2Ve9VqB" role="37wK5m">
-                  <ref role="3cqZAo" node="4KRwoelAK48" resolve="inputNode" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="4KRwoelAK4f" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="2tJIrI" id="4MEOIDG_fi5" role="jymVt" />
-        <node concept="3clFb_" id="1GNw78$ryBl" role="jymVt">
-          <property role="TrG5h" value="doCall" />
-          <property role="1EzhhJ" value="false" />
-          <node concept="3uibUv" id="1GNw78$XT$v" role="3clF45">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-          </node>
-          <node concept="3Tm1VV" id="1GNw78$ryBn" role="1B3o_S" />
-          <node concept="37vLTG" id="1GNw78$ryBp" role="3clF46">
-            <property role="TrG5h" value="token" />
-            <node concept="3uibUv" id="1GNw78$ryBv" role="1tU5fm">
-              <ref role="3uigEE" node="1GNw78$gMhl" resolve="__MacroTable._Template.Token" />
-            </node>
-          </node>
-          <node concept="37vLTG" id="1GNw78$ryBr" role="3clF46">
-            <property role="TrG5h" value="logical" />
-            <node concept="3uibUv" id="1HWyn8j9XjC" role="1tU5fm">
-              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-              <node concept="3uibUv" id="1HWyn8j9XLl" role="11_B2D">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTG" id="1GNw78$ryBt" role="3clF46">
-            <property role="TrG5h" value="session" />
-            <node concept="3uibUv" id="1GNw78$ryBu" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="1GNw78$ryBw" role="3clF47">
-            <node concept="3clFbF" id="4KRwoelnqUQ" role="3cqZAp">
-              <node concept="2OqwBi" id="4KRwoelnr0s" role="3clFbG">
-                <node concept="37vLTw" id="4KRwoelnqUP" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1GNw78$ryBp" resolve="token" />
-                </node>
-                <node concept="liA8E" id="4KRwoelnrgZ" role="2OqNvi">
-                  <ref role="37wK5l" node="4KRwoelnc3p" resolve="applyMacro" />
-                  <node concept="37vLTw" id="4KRwoelnrkZ" role="37wK5m">
-                    <ref role="3cqZAo" node="1GNw78$ryBr" resolve="logical" />
-                  </node>
-                  <node concept="37vLTw" id="4KRwoelnrts" role="37wK5m">
-                    <ref role="3cqZAo" node="1GNw78$ryBt" resolve="session" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="1GNw78$ryBx" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="2tJIrI" id="4nxCIBqkjot" role="jymVt" />
-        <node concept="3clFb_" id="60NbDCXGBZH" role="jymVt">
-          <property role="TrG5h" value="doExpand" />
-          <property role="1EzhhJ" value="false" />
-          <node concept="3uibUv" id="60NbDCXGBZI" role="3clF45">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-          </node>
-          <node concept="3Tm1VV" id="60NbDCXGBZJ" role="1B3o_S" />
-          <node concept="37vLTG" id="60NbDCXGBZK" role="3clF46">
-            <property role="TrG5h" value="inputNode" />
-            <node concept="3Tqbb2" id="60NbDCXGG6D" role="1tU5fm" />
-          </node>
-          <node concept="37vLTG" id="60NbDCXGBZM" role="3clF46">
-            <property role="TrG5h" value="logical" />
-            <node concept="3uibUv" id="1HWyn8j9Y13" role="1tU5fm">
-              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-              <node concept="3uibUv" id="1HWyn8j9YyT" role="11_B2D">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTG" id="60NbDCXGBZO" role="3clF46">
-            <property role="TrG5h" value="session" />
-            <node concept="3uibUv" id="60NbDCXGBZP" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="60NbDCXGBZQ" role="3clF47">
-            <node concept="3clFbF" id="60NbDCXGBZR" role="3cqZAp">
-              <node concept="2OqwBi" id="60NbDCXGBZS" role="3clFbG">
-                <node concept="liA8E" id="60NbDCXGBZU" role="2OqNvi">
-                  <ref role="37wK5l" node="4KRwoelnc3p" resolve="applyMacro" />
-                  <node concept="37vLTw" id="60NbDCXGBZV" role="37wK5m">
-                    <ref role="3cqZAo" node="60NbDCXGBZM" resolve="logical" />
-                  </node>
-                  <node concept="37vLTw" id="60NbDCXGBZW" role="37wK5m">
-                    <ref role="3cqZAo" node="60NbDCXGBZO" resolve="session" />
-                  </node>
-                </node>
-                <node concept="1rXfSq" id="60NbDCXGHSJ" role="2Oq$k0">
-                  <ref role="37wK5l" node="4KRwoelAK47" resolve="withInputNode" />
-                  <node concept="37vLTw" id="60NbDCXGIOi" role="37wK5m">
-                    <ref role="3cqZAo" node="60NbDCXGBZK" resolve="inputNode" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="60NbDCXGBZX" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="2tJIrI" id="60NbDCXGBZG" role="jymVt" />
-        <node concept="raruj" id="1GNw78$HYGg" role="lGtFl" />
-        <node concept="1WS0z7" id="4JJCDIm$BmK" role="lGtFl">
-          <node concept="3JmXsc" id="4JJCDIm$BmN" role="3Jn$fo">
-            <node concept="3clFbS" id="4JJCDIm$BmO" role="2VODD2">
-              <node concept="3clFbF" id="4JJCDIm$BmU" role="3cqZAp">
-                <node concept="2OqwBi" id="5itBwM5CDiL" role="3clFbG">
-                  <node concept="2OqwBi" id="4JJCDIm$BmP" role="2Oq$k0">
-                    <node concept="3Tsc0h" id="4JJCDIm$BmS" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
-                    </node>
-                    <node concept="30H73N" id="4JJCDIm$BmT" role="2Oq$k0" />
-                  </node>
-                  <node concept="v3k3i" id="5itBwM5CFAg" role="2OqNvi">
-                    <node concept="chp4Y" id="5itBwM5CI6B" role="v3oSu">
-                      <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFb_" id="5DUvKnrzkxX" role="jymVt">
-          <property role="TrG5h" value="doExpand" />
-          <property role="1EzhhJ" value="false" />
-          <node concept="3uibUv" id="5DUvKnrzkxY" role="3clF45">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-          </node>
-          <node concept="3Tm1VV" id="5DUvKnrzkxZ" role="1B3o_S" />
-          <node concept="37vLTG" id="5DUvKnrzky0" role="3clF46">
-            <property role="TrG5h" value="inpuConcept" />
-            <node concept="3bZ5Sz" id="5DUvKnrzmWk" role="1tU5fm" />
-          </node>
-          <node concept="37vLTG" id="5DUvKnrzky2" role="3clF46">
-            <property role="TrG5h" value="logical" />
-            <node concept="3uibUv" id="5DUvKnrzky3" role="1tU5fm">
-              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-              <node concept="3uibUv" id="5DUvKnrzky4" role="11_B2D">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTG" id="5DUvKnrzky5" role="3clF46">
-            <property role="TrG5h" value="session" />
-            <node concept="3uibUv" id="5DUvKnrzky6" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="5DUvKnrzky7" role="3clF47">
-            <node concept="3clFbF" id="5DUvKnrzpNn" role="3cqZAp">
-              <node concept="2OqwBi" id="5DUvKnrzwNg" role="3clFbG">
-                <node concept="2ShNRf" id="5DUvKnrzpNo" role="2Oq$k0">
-                  <node concept="1pGfFk" id="5DUvKnrzpNp" role="2ShVmc">
-                    <ref role="37wK5l" node="1GNw78$kUFK" resolve="__MacroTable._Template.Token" />
-                    <node concept="10Nm6u" id="5DUvKnrzsyG" role="37wK5m" />
-                    <node concept="10Nm6u" id="5DUvKnrzuCI" role="37wK5m">
-                      <node concept="1WS0z7" id="5DUvKnrzvpi" role="lGtFl">
-                        <node concept="3JmXsc" id="5DUvKnrzvpj" role="3Jn$fo">
-                          <node concept="3clFbS" id="5DUvKnrzvpk" role="2VODD2">
-                            <node concept="3clFbF" id="5DUvKnrzvUj" role="3cqZAp">
-                              <node concept="2OqwBi" id="5DUvKnrzvUk" role="3clFbG">
-                                <node concept="30H73N" id="5DUvKnrzvUl" role="2Oq$k0" />
-                                <node concept="3Tsc0h" id="5DUvKnrzvUm" role="2OqNvi">
-                                  <ref role="3TtcxE" to="wq2x:7IysFeA0yca" resolve="parameter" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="5DUvKnrzx3l" role="2OqNvi">
-                  <ref role="37wK5l" node="4KRwoelnc3p" resolve="applyMacro" />
-                  <node concept="37vLTw" id="5DUvKnrzxil" role="37wK5m">
-                    <ref role="3cqZAo" node="5DUvKnrzky2" resolve="logical" />
-                  </node>
-                  <node concept="37vLTw" id="5DUvKnrzxId" role="37wK5m">
-                    <ref role="3cqZAo" node="5DUvKnrzky5" resolve="session" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="5DUvKnrzkyf" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="2tJIrI" id="5DUvKnrzkxW" role="jymVt" />
-      </node>
-      <node concept="2tJIrI" id="1GNw78$HcHg" role="jymVt" />
-      <node concept="3Tm1VV" id="1GNw78$HcGO" role="1B3o_S" />
-    </node>
-  </node>
   <node concept="jVnub" id="4KRwoemr_Es">
     <property role="3GE5qa" value="context" />
     <property role="TrG5h" value="contextName_variable_init" />
@@ -12504,462 +9987,9 @@
       </node>
     </node>
   </node>
-  <node concept="jVnub" id="7kTeLbPxG6M">
-    <property role="3GE5qa" value="constraint" />
-    <property role="TrG5h" value="typeParameterBinding_extractAnchor" />
-    <node concept="3aamgX" id="7kTeLbPxG7z" role="3aUrZf">
-      <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="wq2x:1L74NXEmF9s" resolve="MacroParameterBinding" />
-      <node concept="14YyZ8" id="7kTeLbPxGkj" role="1lVwrX">
-        <node concept="14ZrTv" id="7kTeLbPxGkp" role="14ZwWg">
-          <node concept="30G5F_" id="7kTeLbPxGkq" role="150hEN">
-            <node concept="3clFbS" id="7kTeLbPxGkr" role="2VODD2">
-              <node concept="3clFbF" id="7kTeLbQ4qG0" role="3cqZAp">
-                <node concept="2OqwBi" id="7kTeLbQ4qG2" role="3clFbG">
-                  <node concept="2OqwBi" id="7kTeLbQ4qG3" role="2Oq$k0">
-                    <node concept="2OqwBi" id="7kTeLbQ4qG4" role="2Oq$k0">
-                      <node concept="30H73N" id="7kTeLbQ4qG5" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="7kTeLbQ4qG6" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:1L74NXEmG0t" resolve="parameter" />
-                      </node>
-                    </node>
-                    <node concept="3TrEf2" id="7kTeLbQ4qG7" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:7IysFeA0ybI" resolve="type" />
-                    </node>
-                  </node>
-                  <node concept="1mIQ4w" id="7kTeLbQ4qG8" role="2OqNvi">
-                    <node concept="chp4Y" id="7kTeLbQ4qG9" role="cj9EA">
-                      <ref role="cht4Q" to="tp25:gzTqbfa" resolve="SNodeType" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1Koe21" id="7kTeLbPxGrA" role="150oIE">
-            <node concept="3clFb_" id="7kTeLbPxGrB" role="1Koe22">
-              <property role="TrG5h" value="method" />
-              <node concept="37vLTG" id="7kTeLbPxGrC" role="3clF46">
-                <property role="TrG5h" value="required" />
-                <node concept="2I9FWS" id="7kTeLbPxGrD" role="1tU5fm" />
-              </node>
-              <node concept="3Tm6S6" id="7kTeLbPxGrE" role="1B3o_S" />
-              <node concept="3cqZAl" id="7kTeLbPxGrF" role="3clF45" />
-              <node concept="3clFbS" id="7kTeLbPxGrG" role="3clF47">
-                <node concept="3clFbF" id="7kTeLbPxGrH" role="3cqZAp">
-                  <node concept="2OqwBi" id="7kTeLbPxGrI" role="3clFbG">
-                    <node concept="37vLTw" id="7kTeLbPxGrJ" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7kTeLbPxGrC" resolve="required" />
-                    </node>
-                    <node concept="TSZUe" id="7kTeLbPxGrK" role="2OqNvi">
-                      <node concept="10Nm6u" id="7kTeLbPxGrL" role="25WWJ7">
-                        <node concept="29HgVG" id="7kTeLbPxGrM" role="lGtFl">
-                          <node concept="3NFfHV" id="7kTeLbPxGrN" role="3NFExx">
-                            <node concept="3clFbS" id="7kTeLbPxGrO" role="2VODD2">
-                              <node concept="3clFbF" id="7kTeLbPxGrP" role="3cqZAp">
-                                <node concept="2OqwBi" id="7kTeLbPxGrQ" role="3clFbG">
-                                  <node concept="30H73N" id="7kTeLbPxGrS" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="7kTeLbPxKMJ" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:1L74NXGK1G1" resolve="code" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="raruj" id="7kTeLbPxGrV" role="lGtFl" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="14ZrTv" id="7kTeLbPxL78" role="14ZwWg">
-          <node concept="30G5F_" id="7kTeLbPxL79" role="150hEN">
-            <node concept="3clFbS" id="7kTeLbPxL7a" role="2VODD2">
-              <node concept="3clFbF" id="7kTeLbPxL7b" role="3cqZAp">
-                <node concept="2OqwBi" id="7kTeLbPxL7c" role="3clFbG">
-                  <node concept="2OqwBi" id="7kTeLbPxL7d" role="2Oq$k0">
-                    <node concept="2OqwBi" id="7kTeLbPxL7e" role="2Oq$k0">
-                      <node concept="30H73N" id="7kTeLbPxL7f" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="7kTeLbPxL7g" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:1L74NXEmG0t" resolve="parameter" />
-                      </node>
-                    </node>
-                    <node concept="3TrEf2" id="7kTeLbPxL7h" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:7IysFeA0ybI" resolve="type" />
-                    </node>
-                  </node>
-                  <node concept="1mIQ4w" id="7kTeLbPxL7i" role="2OqNvi">
-                    <node concept="chp4Y" id="7kTeLbPxNT9" role="cj9EA">
-                      <ref role="cht4Q" to="tp25:gEI9FSM" resolve="SNodeListType" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1Koe21" id="7kTeLbPxL7k" role="150oIE">
-            <node concept="3clFb_" id="7kTeLbPxL7l" role="1Koe22">
-              <property role="TrG5h" value="method" />
-              <node concept="37vLTG" id="7kTeLbPxL7m" role="3clF46">
-                <property role="TrG5h" value="required" />
-                <node concept="2I9FWS" id="7kTeLbPxL7n" role="1tU5fm" />
-              </node>
-              <node concept="3Tm6S6" id="7kTeLbPxL7o" role="1B3o_S" />
-              <node concept="3cqZAl" id="7kTeLbPxL7p" role="3clF45" />
-              <node concept="3clFbS" id="7kTeLbPxL7q" role="3clF47">
-                <node concept="3clFbF" id="7kTeLbPxL7r" role="3cqZAp">
-                  <node concept="2OqwBi" id="7kTeLbPxL7s" role="3clFbG">
-                    <node concept="37vLTw" id="7kTeLbPxL7t" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7kTeLbPxL7m" resolve="required" />
-                    </node>
-                    <node concept="X8dFx" id="7kTeLbPxMDC" role="2OqNvi">
-                      <node concept="10Nm6u" id="7kTeLbPxMDE" role="25WWJ7">
-                        <node concept="29HgVG" id="7kTeLbPxMDF" role="lGtFl">
-                          <node concept="3NFfHV" id="7kTeLbPxMDG" role="3NFExx">
-                            <node concept="3clFbS" id="7kTeLbPxMDH" role="2VODD2">
-                              <node concept="3clFbF" id="7kTeLbPxMDI" role="3cqZAp">
-                                <node concept="2OqwBi" id="7kTeLbPxMDJ" role="3clFbG">
-                                  <node concept="30H73N" id="7kTeLbPxMDK" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="7kTeLbPxMDL" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:1L74NXGK1G1" resolve="code" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="raruj" id="7kTeLbPxL7B" role="lGtFl" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="b5Tf3" id="7kTeLbPxLzd" role="14YRTM" />
-      </node>
-    </node>
-    <node concept="j$LIH" id="7kTeLbPxOdr" role="jxRDz">
-      <node concept="1lLz0L" id="7kTeLbPxOxM" role="1lHHLF">
-        <property role="1lMjX7" value="h1lM37o/error" />
-        <property role="1lLB17" value="invalid usage" />
-      </node>
-    </node>
-  </node>
   <node concept="jVnub" id="7kTeLbPzUJ4">
     <property role="3GE5qa" value="constraint" />
     <property role="TrG5h" value="constraint_buildRule" />
-    <node concept="3aamgX" id="7kTeLbPzUJ5" role="3aUrZf">
-      <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="wq2x:18kNIl0jL2T" resolve="ExpandPseudoConstraint" />
-      <node concept="1Koe21" id="7kTeLbPzUJ6" role="1lVwrX">
-        <node concept="3clFb_" id="7kTeLbPzUJ7" role="1Koe22">
-          <property role="TrG5h" value="method" />
-          <node concept="37vLTG" id="7kTeLbPzUJ8" role="3clF46">
-            <property role="TrG5h" value="session" />
-            <node concept="3uibUv" id="7kTeLbPzUJ9" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-            </node>
-          </node>
-          <node concept="3cqZAl" id="7kTeLbPzUJa" role="3clF45" />
-          <node concept="3Tm1VV" id="7kTeLbPzUJb" role="1B3o_S" />
-          <node concept="3clFbS" id="7kTeLbPzUJc" role="3clF47">
-            <node concept="3cpWs8" id="7kTeLbPzUJd" role="3cqZAp">
-              <node concept="3cpWsn" id="7kTeLbPzUJe" role="3cpWs9">
-                <property role="TrG5h" value="builder" />
-                <node concept="3uibUv" id="7kTeLbPzUJf" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                </node>
-                <node concept="2ShNRf" id="5yr01fDtVwT" role="33vP2m">
-                  <node concept="1pGfFk" id="5yr01fDtVwU" role="2ShVmc">
-                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
-                    <node concept="10Nm6u" id="5yr01fE22aB" role="37wK5m" />
-                    <node concept="Xl_RD" id="5yr01fDtVwV" role="37wK5m">
-                      <property role="Xl_RC" value="" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="7Bx7XgEfGwO" role="3cqZAp" />
-            <node concept="3clFbF" id="7kTeLbPzUJk" role="3cqZAp">
-              <node concept="2OqwBi" id="7kTeLbPzUJl" role="3clFbG">
-                <node concept="37vLTw" id="7kTeLbPzUJm" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7kTeLbPzUJe" resolve="builder" />
-                  <node concept="1sPUBX" id="7kTeLbPzUJn" role="lGtFl">
-                    <ref role="v9R2y" node="1L74NXE_$78" resolve="builder_variable" />
-                    <node concept="3NFfHV" id="7kTeLbPzUJo" role="1sPUBK">
-                      <node concept="3clFbS" id="7kTeLbPzUJp" role="2VODD2">
-                        <node concept="3clFbF" id="7kTeLbPzUJq" role="3cqZAp">
-                          <node concept="2OqwBi" id="7kTeLbPzUJr" role="3clFbG">
-                            <node concept="30H73N" id="7kTeLbPzUJs" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="7kTeLbPzUJt" role="2OqNvi">
-                              <node concept="3gmYPX" id="7kTeLbPzUJu" role="1xVPHs">
-                                <node concept="3gn64h" id="7kTeLbPzUJv" role="3gmYPZ">
-                                  <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                </node>
-                                <node concept="3gn64h" id="7kTeLbPzUJw" role="3gmYPZ">
-                                  <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="7kTeLbPzUJx" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:77AxcO4ZwMR" resolve="merge" />
-                  <node concept="2OqwBi" id="7kTeLbPzUJy" role="37wK5m">
-                    <node concept="37vLTw" id="7kTeLbPzUJz" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7kTeLbPzUJ8" resolve="session" />
-                      <node concept="1sPUBX" id="7kTeLbPzUJ$" role="lGtFl">
-                        <ref role="v9R2y" node="1L74NXExmCW" resolve="session_variable" />
-                        <node concept="3NFfHV" id="7kTeLbPzUJ_" role="1sPUBK">
-                          <node concept="3clFbS" id="7kTeLbPzUJA" role="2VODD2">
-                            <node concept="3clFbF" id="7kTeLbPzUJB" role="3cqZAp">
-                              <node concept="2OqwBi" id="7kTeLbPzUJC" role="3clFbG">
-                                <node concept="30H73N" id="7kTeLbPzUJD" role="2Oq$k0" />
-                                <node concept="2Xjw5R" id="7kTeLbPzUJE" role="2OqNvi">
-                                  <node concept="3gmYPX" id="7kTeLbPzUJF" role="1xVPHs">
-                                    <node concept="3gn64h" id="7kTeLbPzUJG" role="3gmYPZ">
-                                      <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                    </node>
-                                    <node concept="3gn64h" id="7kTeLbPzUJH" role="3gmYPZ">
-                                      <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="7kTeLbPzUJI" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:18kNIl1wWgU" resolve="expandMacro" />
-                      <node concept="10Nm6u" id="7kTeLbPzUJJ" role="37wK5m">
-                        <node concept="29HgVG" id="7kTeLbPzUJK" role="lGtFl">
-                          <node concept="3NFfHV" id="7kTeLbPzUJL" role="3NFExx">
-                            <node concept="3clFbS" id="7kTeLbPzUJM" role="2VODD2">
-                              <node concept="3clFbF" id="7kTeLbPzUJN" role="3cqZAp">
-                                <node concept="2OqwBi" id="7kTeLbPzUJO" role="3clFbG">
-                                  <node concept="3TrEf2" id="7kTeLbPzUJP" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:18kNIl0jL_z" resolve="logical" />
-                                  </node>
-                                  <node concept="30H73N" id="7kTeLbPzUJQ" role="2Oq$k0" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="10Nm6u" id="7kTeLbPzUJR" role="37wK5m">
-                        <node concept="29HgVG" id="7kTeLbPzUJS" role="lGtFl">
-                          <node concept="3NFfHV" id="7kTeLbPzUJT" role="3NFExx">
-                            <node concept="3clFbS" id="7kTeLbPzUJU" role="2VODD2">
-                              <node concept="3clFbF" id="7kTeLbPzUJV" role="3cqZAp">
-                                <node concept="2OqwBi" id="7kTeLbPzUJX" role="3clFbG">
-                                  <node concept="3TrEf2" id="7kTeLbPzUJY" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:18kNIl0jL3E" resolve="origin" />
-                                  </node>
-                                  <node concept="30H73N" id="7kTeLbPzUJZ" role="2Oq$k0" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="raruj" id="7kTeLbPzUK1" role="lGtFl" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="7kTeLbPzW_U" role="3aUrZf">
-      <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="wq2x:4MEOIDFfpSk" resolve="CallMacroPseudoConstraint" />
-      <node concept="1Koe21" id="7kTeLbPzW_V" role="1lVwrX">
-        <node concept="3clFb_" id="7kTeLbPzW_W" role="1Koe22">
-          <property role="TrG5h" value="method" />
-          <node concept="37vLTG" id="7kTeLbPzW_X" role="3clF46">
-            <property role="TrG5h" value="session" />
-            <node concept="3uibUv" id="7kTeLbPzW_Y" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-            </node>
-          </node>
-          <node concept="3cqZAl" id="7kTeLbPzW_Z" role="3clF45" />
-          <node concept="3Tm1VV" id="7kTeLbPzWA0" role="1B3o_S" />
-          <node concept="3clFbS" id="7kTeLbPzWA1" role="3clF47">
-            <node concept="3cpWs8" id="7kTeLbPzWA2" role="3cqZAp">
-              <node concept="3cpWsn" id="7kTeLbPzWA3" role="3cpWs9">
-                <property role="TrG5h" value="builder" />
-                <node concept="3uibUv" id="7kTeLbPzWA4" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                </node>
-                <node concept="2ShNRf" id="5yr01fDtVgI" role="33vP2m">
-                  <node concept="1pGfFk" id="5yr01fDtVgJ" role="2ShVmc">
-                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
-                    <node concept="10Nm6u" id="5yr01fE22yo" role="37wK5m" />
-                    <node concept="Xl_RD" id="5yr01fDtVgK" role="37wK5m">
-                      <property role="Xl_RC" value="" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="7kTeLbPzWA8" role="3cqZAp" />
-            <node concept="3clFbF" id="7kTeLbPzWA9" role="3cqZAp">
-              <node concept="2OqwBi" id="7kTeLbPzWAa" role="3clFbG">
-                <node concept="liA8E" id="7kTeLbPzWAb" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:77AxcO4ZwMR" resolve="merge" />
-                  <node concept="2OqwBi" id="7kTeLbPzWAc" role="37wK5m">
-                    <node concept="liA8E" id="7kTeLbPzWAd" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:4MEOIDFgV3a" resolve="callMacro" />
-                      <node concept="10Nm6u" id="7kTeLbPzWAe" role="37wK5m">
-                        <node concept="29HgVG" id="7kTeLbPzWAf" role="lGtFl">
-                          <node concept="3NFfHV" id="7kTeLbPzWAg" role="3NFExx">
-                            <node concept="3clFbS" id="7kTeLbPzWAh" role="2VODD2">
-                              <node concept="3clFbF" id="7kTeLbPzWAi" role="3cqZAp">
-                                <node concept="2OqwBi" id="7kTeLbPzWAj" role="3clFbG">
-                                  <node concept="3TrEf2" id="7kTeLbPzWAk" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:4MEOIDFfpT9" resolve="logical" />
-                                  </node>
-                                  <node concept="30H73N" id="7kTeLbPzWAl" role="2Oq$k0" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2YIFZM" id="5yr01fDEr6B" role="37wK5m">
-                        <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
-                        <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
-                        <node concept="Xl_RD" id="7kTeLbPzWAq" role="37wK5m">
-                          <property role="Xl_RC" value="" />
-                          <node concept="17Uvod" id="7kTeLbPzWAr" role="lGtFl">
-                            <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                            <property role="2qtEX9" value="value" />
-                            <node concept="3zFVjK" id="7kTeLbPzWAs" role="3zH0cK">
-                              <node concept="3clFbS" id="7kTeLbPzWAt" role="2VODD2">
-                                <node concept="3clFbF" id="5itBwM8rh8I" role="3cqZAp">
-                                  <node concept="2OqwBi" id="5itBwM8rh8J" role="3clFbG">
-                                    <node concept="2OqwBi" id="5itBwM8rh8K" role="2Oq$k0">
-                                      <node concept="liA8E" id="5itBwM8rh8L" role="2OqNvi">
-                                        <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                                      </node>
-                                      <node concept="2JrnkZ" id="5itBwM8rh8M" role="2Oq$k0">
-                                        <node concept="2OqwBi" id="5itBwM8rh8N" role="2JrQYb">
-                                          <node concept="1iwH7S" id="5itBwM8rh8O" role="2Oq$k0" />
-                                          <node concept="12$id9" id="5itBwM8rh8P" role="2OqNvi">
-                                            <node concept="2OqwBi" id="5itBwM8B6Jr" role="12$y8L">
-                                              <node concept="30H73N" id="5itBwM8rh8Q" role="2Oq$k0" />
-                                              <node concept="3TrEf2" id="5itBwM8B73U" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="wq2x:5hSMZ_lpUoi" resolve="declaration" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="liA8E" id="5itBwM8rh8R" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="10Nm6u" id="6EY0p2x2qNr" role="37wK5m">
-                        <node concept="5jKBG" id="6EY0p2x2qOp" role="lGtFl">
-                          <ref role="v9R2y" node="6EY0p2x2d9D" resolve="frag_callMacro_parameters" />
-                          <node concept="30H73N" id="6EY0p2x2qOw" role="v9R3O" />
-                          <node concept="3NFfHV" id="6EY0p2x2u0R" role="5jGum">
-                            <node concept="3clFbS" id="6EY0p2x2u0S" role="2VODD2">
-                              <node concept="3clFbF" id="6EY0p2x2ukU" role="3cqZAp">
-                                <node concept="2OqwBi" id="6EY0p2x2uKT" role="3clFbG">
-                                  <node concept="30H73N" id="6EY0p2x2ukT" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="6EY0p2x2uXW" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:5hSMZ_lpUoi" resolve="declaration" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="7kTeLbPzWAW" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7kTeLbPzW_X" resolve="session" />
-                      <node concept="1sPUBX" id="7kTeLbPzWAX" role="lGtFl">
-                        <ref role="v9R2y" node="1L74NXExmCW" resolve="session_variable" />
-                        <node concept="3NFfHV" id="7kTeLbPzWAY" role="1sPUBK">
-                          <node concept="3clFbS" id="7kTeLbPzWAZ" role="2VODD2">
-                            <node concept="3clFbF" id="7kTeLbPzWB0" role="3cqZAp">
-                              <node concept="2OqwBi" id="7kTeLbPzWB1" role="3clFbG">
-                                <node concept="30H73N" id="7kTeLbPzWB2" role="2Oq$k0" />
-                                <node concept="2Xjw5R" id="7kTeLbPzWB3" role="2OqNvi">
-                                  <node concept="3gmYPX" id="7kTeLbPzWB4" role="1xVPHs">
-                                    <node concept="3gn64h" id="7kTeLbPzWB5" role="3gmYPZ">
-                                      <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                    </node>
-                                    <node concept="3gn64h" id="7kTeLbPzWB6" role="3gmYPZ">
-                                      <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="7kTeLbPzWB7" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7kTeLbPzWA3" resolve="builder" />
-                  <node concept="1sPUBX" id="7kTeLbPzWB8" role="lGtFl">
-                    <ref role="v9R2y" node="1L74NXE_$78" resolve="builder_variable" />
-                    <node concept="3NFfHV" id="7kTeLbPzWB9" role="1sPUBK">
-                      <node concept="3clFbS" id="7kTeLbPzWBa" role="2VODD2">
-                        <node concept="3clFbF" id="7kTeLbPzWBb" role="3cqZAp">
-                          <node concept="2OqwBi" id="7kTeLbPzWBc" role="3clFbG">
-                            <node concept="30H73N" id="7kTeLbPzWBd" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="7kTeLbPzWBe" role="2OqNvi">
-                              <node concept="3gmYPX" id="7kTeLbPzWBf" role="1xVPHs">
-                                <node concept="3gn64h" id="7kTeLbPzWBg" role="3gmYPZ">
-                                  <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                </node>
-                                <node concept="3gn64h" id="7kTeLbPzWBh" role="3gmYPZ">
-                                  <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="raruj" id="7kTeLbPzWBi" role="lGtFl" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="5itBwM7WZbC" role="3aUrZf">
       <property role="36QftV" value="true" />
       <ref role="30HIoZ" to="wq2x:5itBwM7LtBf" resolve="CallMacroConstraint" />
@@ -14991,16 +12021,10 @@
     <property role="1sVAO0" value="false" />
     <node concept="2tJIrI" id="36tQV5AoEKI" role="jymVt" />
     <node concept="312cEu" id="36tQV5AoEKJ" role="jymVt">
-      <property role="2bfB8j" value="false" />
       <property role="TrG5h" value="Token" />
+      <property role="2bfB8j" value="false" />
       <node concept="2tJIrI" id="36tQV5AoEKK" role="jymVt" />
       <node concept="3clFbW" id="36tQV5AoEKL" role="jymVt">
-        <node concept="37vLTG" id="36tQV5AoEKM" role="3clF46">
-          <property role="TrG5h" value="templateRef" />
-          <node concept="3uibUv" id="6OXbTDyZe1I" role="1tU5fm">
-            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-          </node>
-        </node>
         <node concept="3cqZAl" id="36tQV5AoELh" role="3clF45" />
         <node concept="3Tm1VV" id="36tQV5AoELi" role="1B3o_S" />
         <node concept="3clFbS" id="36tQV5AoELj" role="3clF47">
@@ -15021,6 +12045,12 @@
         <node concept="2ZBi8u" id="36tQV5AoELH" role="lGtFl">
           <ref role="2rW$FS" node="36tQV5Aw2D4" resolve="ruletemplate_token_constructor" />
         </node>
+        <node concept="37vLTG" id="36tQV5AoEKM" role="3clF46">
+          <property role="TrG5h" value="templateRef" />
+          <node concept="3uibUv" id="6OXbTDyZe1I" role="1tU5fm">
+            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+          </node>
+        </node>
       </node>
       <node concept="2tJIrI" id="36tQV5AoELI" role="jymVt" />
       <node concept="3clFb_" id="36tQV5AoELJ" role="jymVt">
@@ -15119,26 +12149,9 @@
             <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
-        <node concept="37vLTG" id="36tQV5AoEOR" role="3clF46">
-          <property role="TrG5h" value="session" />
-          <node concept="3uibUv" id="36tQV5AoEOS" role="1tU5fm">
-            <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-          </node>
-          <node concept="2ZBi8u" id="36tQV5AoEOT" role="lGtFl">
-            <ref role="2rW$FS" node="429xoypVg6q" resolve="apply_session_parameter" />
-          </node>
-        </node>
         <node concept="3Tm1VV" id="36tQV5AoEOU" role="1B3o_S" />
         <node concept="3clFbS" id="36tQV5AoEOV" role="3clF47">
           <node concept="3clFbF" id="36tQV5Az_t2" role="3cqZAp">
-            <node concept="2OqwBi" id="6OXbTDzdZ5Q" role="3clFbG">
-              <node concept="37vLTw" id="6OXbTDzdY6i" role="2Oq$k0">
-                <ref role="3cqZAo" node="36tQV5AwA22" resolve="ruleBuilder" />
-              </node>
-              <node concept="TSZUe" id="6OXbTDze0y4" role="2OqNvi">
-                <node concept="10Nm6u" id="6OXbTDze0FB" role="25WWJ7" />
-              </node>
-            </node>
             <node concept="2b32R4" id="36tQV5AA6Tm" role="lGtFl">
               <node concept="3JmXsc" id="36tQV5AA6To" role="2P8S$">
                 <node concept="3clFbS" id="36tQV5AA6Tq" role="2VODD2">
@@ -15158,6 +12171,14 @@
                 </node>
               </node>
             </node>
+            <node concept="2OqwBi" id="6OXbTDzdZ5Q" role="3clFbG">
+              <node concept="37vLTw" id="6OXbTDzdY6i" role="2Oq$k0">
+                <ref role="3cqZAo" node="36tQV5AwA22" resolve="ruleBuilder" />
+              </node>
+              <node concept="TSZUe" id="6OXbTDze0y4" role="2OqNvi">
+                <node concept="10Nm6u" id="6OXbTDze0FB" role="25WWJ7" />
+              </node>
+            </node>
           </node>
           <node concept="3clFbF" id="36tQV5AJtRo" role="3cqZAp">
             <node concept="37vLTw" id="36tQV5AJtRm" role="3clFbG">
@@ -15168,6 +12189,15 @@
         <node concept="2AHcQZ" id="36tQV5AoERh" role="2AJF6D">
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
+        <node concept="37vLTG" id="36tQV5AoEOR" role="3clF46">
+          <property role="TrG5h" value="session" />
+          <node concept="3uibUv" id="36tQV5AoEOS" role="1tU5fm">
+            <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+          </node>
+          <node concept="2ZBi8u" id="36tQV5AoEOT" role="lGtFl">
+            <ref role="2rW$FS" node="429xoypVg6q" resolve="apply_session_parameter" />
+          </node>
+        </node>
       </node>
       <node concept="2tJIrI" id="36tQV5AoERi" role="jymVt" />
       <node concept="3clFb_" id="36tQV5AoERj" role="jymVt">
@@ -15370,14 +12400,19 @@
       <node concept="312cEg" id="36tQV5AwA22" role="jymVt">
         <property role="TrG5h" value="ruleBuilder" />
         <node concept="3Tmbuc" id="36tQV5AxznT" role="1B3o_S" />
+        <node concept="2ZBi8u" id="12QmIoz4Z$V" role="lGtFl">
+          <ref role="2rW$FS" node="4vbeH84GUyf" resolve="builder_variable" />
+        </node>
         <node concept="_YKpA" id="36tQV5AwDgP" role="1tU5fm">
           <node concept="3uibUv" id="36tQV5AwDpP" role="_ZDj9">
             <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
-        <node concept="2ZBi8u" id="12QmIoz4Z$V" role="lGtFl">
-          <ref role="2rW$FS" node="4vbeH84GUyf" resolve="builder_variable" />
-        </node>
+      </node>
+      <node concept="3Tm1VV" id="36tQV5AoEXa" role="1B3o_S" />
+      <node concept="raruj" id="36tQV5AoEXb" role="lGtFl" />
+      <node concept="2ZBi8u" id="36tQV5AoEXc" role="lGtFl">
+        <ref role="2rW$FS" node="36tQV5Ap$gK" resolve="ruletemplate_token_class" />
       </node>
       <node concept="312cEg" id="36tQV5AoEWD" role="jymVt">
         <property role="TrG5h" value="templateRef" />
@@ -15386,11 +12421,6 @@
           <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
         </node>
       </node>
-      <node concept="3Tm1VV" id="36tQV5AoEXa" role="1B3o_S" />
-      <node concept="raruj" id="36tQV5AoEXb" role="lGtFl" />
-      <node concept="2ZBi8u" id="36tQV5AoEXc" role="lGtFl">
-        <ref role="2rW$FS" node="36tQV5Ap$gK" resolve="ruletemplate_token_class" />
-      </node>
       <node concept="3uibUv" id="36tQV5AoEXd" role="1zkMxy">
         <ref role="3uigEE" to="i348:2RRx4MZ6I3W" resolve="BaseRuleTemplateToken" />
       </node>
@@ -15598,6 +12628,70 @@
       </node>
     </node>
     <node concept="2tJIrI" id="36tQV5AoEZr" role="jymVt" />
+    <node concept="3Tm1VV" id="36tQV5AoF2x" role="1B3o_S" />
+    <node concept="n94m4" id="36tQV5AoF2y" role="lGtFl">
+      <ref role="n9lRv" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+    </node>
+    <node concept="17Uvod" id="36tQV5AoF2z" role="lGtFl">
+      <property role="2qtEX9" value="name" />
+      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+      <node concept="3zFVjK" id="36tQV5AoF2$" role="3zH0cK">
+        <node concept="3clFbS" id="36tQV5AoF2_" role="2VODD2">
+          <node concept="3clFbF" id="36tQV5AoF2A" role="3cqZAp">
+            <node concept="3cpWs3" id="36tQV5AoF2B" role="3clFbG">
+              <node concept="2OqwBi" id="36tQV5AoF2C" role="3uHU7w">
+                <node concept="30H73N" id="36tQV5AoF2D" role="2Oq$k0" />
+                <node concept="3TrcHB" id="36tQV5AoF2E" role="2OqNvi">
+                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                </node>
+              </node>
+              <node concept="3cpWs3" id="36tQV5AoF2F" role="3uHU7B">
+                <node concept="2OqwBi" id="36tQV5AoF2G" role="3uHU7B">
+                  <node concept="1PxgMI" id="36tQV5AoF2H" role="2Oq$k0">
+                    <node concept="2OqwBi" id="36tQV5AoF2I" role="1m5AlR">
+                      <node concept="30H73N" id="36tQV5AoF2J" role="2Oq$k0" />
+                      <node concept="1mfA1w" id="36tQV5AoF2K" role="2OqNvi" />
+                    </node>
+                    <node concept="chp4Y" id="36tQV5AoF2L" role="3oSUPX">
+                      <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                    </node>
+                  </node>
+                  <node concept="3TrcHB" id="36tQV5AoF2M" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+                <node concept="Xl_RD" id="36tQV5AoF2N" role="3uHU7w">
+                  <property role="Xl_RC" value="_" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3uibUv" id="36tQV5AoF2O" role="1zkMxy">
+      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+      <node concept="3uibUv" id="36tQV5AoF33" role="11_B2D">
+        <ref role="3uigEE" node="36tQV5AoEKJ" resolve="RuleTemplateImpl.Token" />
+        <node concept="1ZhdrF" id="36tQV5AoF34" role="lGtFl">
+          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
+          <property role="2qtEX8" value="classifier" />
+          <node concept="3$xsQk" id="36tQV5AoF35" role="3$ytzL">
+            <node concept="3clFbS" id="36tQV5AoF36" role="2VODD2">
+              <node concept="3clFbF" id="36tQV5AoF37" role="3cqZAp">
+                <node concept="2OqwBi" id="36tQV5AoF38" role="3clFbG">
+                  <node concept="1iwH7S" id="36tQV5AoF39" role="2Oq$k0" />
+                  <node concept="1iwH70" id="36tQV5AoF3a" role="2OqNvi">
+                    <ref role="1iwH77" node="36tQV5Ap$gK" resolve="ruletemplate_token_class" />
+                    <node concept="30H73N" id="36tQV5AoF3b" role="1iwH7V" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="3clFb_" id="36tQV5AoEZs" role="jymVt">
       <property role="TrG5h" value="createToken" />
       <property role="1EzhhJ" value="false" />
@@ -15903,70 +12997,6 @@
         </node>
       </node>
     </node>
-    <node concept="3Tm1VV" id="36tQV5AoF2x" role="1B3o_S" />
-    <node concept="n94m4" id="36tQV5AoF2y" role="lGtFl">
-      <ref role="n9lRv" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
-    </node>
-    <node concept="17Uvod" id="36tQV5AoF2z" role="lGtFl">
-      <property role="2qtEX9" value="name" />
-      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-      <node concept="3zFVjK" id="36tQV5AoF2$" role="3zH0cK">
-        <node concept="3clFbS" id="36tQV5AoF2_" role="2VODD2">
-          <node concept="3clFbF" id="36tQV5AoF2A" role="3cqZAp">
-            <node concept="3cpWs3" id="36tQV5AoF2B" role="3clFbG">
-              <node concept="2OqwBi" id="36tQV5AoF2C" role="3uHU7w">
-                <node concept="30H73N" id="36tQV5AoF2D" role="2Oq$k0" />
-                <node concept="3TrcHB" id="36tQV5AoF2E" role="2OqNvi">
-                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                </node>
-              </node>
-              <node concept="3cpWs3" id="36tQV5AoF2F" role="3uHU7B">
-                <node concept="2OqwBi" id="36tQV5AoF2G" role="3uHU7B">
-                  <node concept="1PxgMI" id="36tQV5AoF2H" role="2Oq$k0">
-                    <node concept="2OqwBi" id="36tQV5AoF2I" role="1m5AlR">
-                      <node concept="30H73N" id="36tQV5AoF2J" role="2Oq$k0" />
-                      <node concept="1mfA1w" id="36tQV5AoF2K" role="2OqNvi" />
-                    </node>
-                    <node concept="chp4Y" id="36tQV5AoF2L" role="3oSUPX">
-                      <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                    </node>
-                  </node>
-                  <node concept="3TrcHB" id="36tQV5AoF2M" role="2OqNvi">
-                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                  </node>
-                </node>
-                <node concept="Xl_RD" id="36tQV5AoF2N" role="3uHU7w">
-                  <property role="Xl_RC" value="_" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3uibUv" id="36tQV5AoF2O" role="1zkMxy">
-      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
-      <node concept="3uibUv" id="36tQV5AoF33" role="11_B2D">
-        <ref role="3uigEE" node="36tQV5AoEKJ" resolve="RuleTemplateImpl.Token" />
-        <node concept="1ZhdrF" id="36tQV5AoF34" role="lGtFl">
-          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
-          <property role="2qtEX8" value="classifier" />
-          <node concept="3$xsQk" id="36tQV5AoF35" role="3$ytzL">
-            <node concept="3clFbS" id="36tQV5AoF36" role="2VODD2">
-              <node concept="3clFbF" id="36tQV5AoF37" role="3cqZAp">
-                <node concept="2OqwBi" id="36tQV5AoF38" role="3clFbG">
-                  <node concept="1iwH7S" id="36tQV5AoF39" role="2Oq$k0" />
-                  <node concept="1iwH70" id="36tQV5AoF3a" role="2OqNvi">
-                    <ref role="1iwH77" node="36tQV5Ap$gK" resolve="ruletemplate_token_class" />
-                    <node concept="30H73N" id="36tQV5AoF3b" role="1iwH7V" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
   </node>
   <node concept="13MO4I" id="36tQV5AxhJb">
     <property role="3GE5qa" value="rule" />
@@ -16607,12 +13637,6 @@
     <node concept="3clFb_" id="7P_FdVPsJk6" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="newQuery" />
-      <node concept="37vLTG" id="7P_FdVQ_t5i" role="3clF46">
-        <property role="TrG5h" value="observable" />
-        <node concept="3uibUv" id="7P_FdVQ_thj" role="1tU5fm">
-          <ref role="3uigEE" to="i348:7P_FdVQ_k3b" resolve="QueryTemplate.QueryObservable" />
-        </node>
-      </node>
       <node concept="3uibUv" id="7P_FdVPsJka" role="3clF45">
         <ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
       </node>
@@ -16629,6 +13653,12 @@
       <node concept="2AHcQZ" id="7P_FdVPsJke" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
+      <node concept="37vLTG" id="7P_FdVQ_t5i" role="3clF46">
+        <property role="TrG5h" value="observable" />
+        <node concept="3uibUv" id="7P_FdVQ_thj" role="1tU5fm">
+          <ref role="3uigEE" to="i348:7P_FdVQ_k3b" resolve="QueryTemplate.QueryObservable" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="6tPOoeT46g4" role="jymVt" />
     <node concept="3clFb_" id="6tPOoeT44hu" role="jymVt">
@@ -17235,12 +14265,6 @@
     <node concept="n94m4" id="6OXbTD$fBF0" role="lGtFl">
       <ref role="n9lRv" to="wq2x:6OXbTD$dU7b" resolve="Query" />
     </node>
-    <node concept="3uibUv" id="6OXbTD$iV$$" role="EKbjA">
-      <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
-      <node concept="3uibUv" id="6tPOoeT6cJK" role="11_B2D">
-        <ref role="3uigEE" node="6tPOoeT3Z1_" resolve="QueryTemplateImpl.Token" />
-      </node>
-    </node>
     <node concept="17Uvod" id="6OXbTD$iVUX" role="lGtFl">
       <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
       <property role="2qtEX9" value="name" />
@@ -17270,6 +14294,12 @@
         </node>
       </node>
     </node>
+    <node concept="3uibUv" id="6OXbTD$iV$$" role="EKbjA">
+      <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+      <node concept="3uibUv" id="6tPOoeT6cJK" role="11_B2D">
+        <ref role="3uigEE" node="6tPOoeT3Z1_" resolve="QueryTemplateImpl.Token" />
+      </node>
+    </node>
   </node>
   <node concept="bUwia" id="2BZXJecSPFv">
     <property role="3GE5qa" value="query" />
@@ -17541,156 +14571,6 @@
       </node>
     </node>
   </node>
-  <node concept="13MO4I" id="6EY0p2x2d9D">
-    <property role="3GE5qa" value="macro" />
-    <property role="TrG5h" value="frag_callMacro_parameters" />
-    <ref role="3gUMe" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-    <node concept="1N15co" id="6EY0p2x2d9F" role="1s_3oS">
-      <property role="TrG5h" value="call" />
-      <node concept="3Tqbb2" id="6EY0p2x2d9J" role="1N15GL">
-        <ref role="ehGHo" to="wq2x:4MEOIDFfpSk" resolve="CallMacroPseudoConstraint" />
-      </node>
-    </node>
-    <node concept="3clFb_" id="6EY0p2x2d9M" role="13RCb5">
-      <property role="TrG5h" value="context" />
-      <node concept="10Q1$e" id="6EY0p2x2d9R" role="3clF45">
-        <node concept="3uibUv" id="6EY0p2x2d9O" role="10Q1$1">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="6EY0p2x2da0" role="3clF47">
-        <node concept="3clFbF" id="6EY0p2x2d9Y" role="3cqZAp">
-          <node concept="2ShNRf" id="6EY0p2x2d9W" role="3clFbG">
-            <node concept="3g6Rrh" id="6EY0p2x2ecQ" role="2ShVmc">
-              <node concept="10Nm6u" id="6EY0p2x2ed3" role="3g7hyw">
-                <node concept="raruj" id="6EY0p2x2ed6" role="lGtFl" />
-                <node concept="1WS0z7" id="6EY0p2x2edg" role="lGtFl">
-                  <node concept="3JmXsc" id="6EY0p2x2edh" role="3Jn$fo">
-                    <node concept="3clFbS" id="6EY0p2x2edi" role="2VODD2">
-                      <node concept="3clFbF" id="6EY0p2x2eiS" role="3cqZAp">
-                        <node concept="2OqwBi" id="6EY0p2x2exM" role="3clFbG">
-                          <node concept="30H73N" id="6EY0p2x2fwx" role="2Oq$k0" />
-                          <node concept="3Tsc0h" id="6EY0p2x2eL8" role="2OqNvi">
-                            <ref role="3TtcxE" to="wq2x:7IysFeA0yca" resolve="parameter" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1W57fq" id="6EY0p2x2eLr" role="lGtFl">
-                  <node concept="3IZrLx" id="6EY0p2x2eLs" role="3IZSJc">
-                    <node concept="3clFbS" id="6EY0p2x2eLt" role="2VODD2">
-                      <node concept="3clFbF" id="6EY0p2x2fE6" role="3cqZAp">
-                        <node concept="2OqwBi" id="6EY0p2x2nq3" role="3clFbG">
-                          <node concept="2OqwBi" id="6EY0p2x2j5P" role="2Oq$k0">
-                            <node concept="2OqwBi" id="6EY0p2x2gGR" role="2Oq$k0">
-                              <node concept="2OqwBi" id="6EY0p2x2fVZ" role="2Oq$k0">
-                                <node concept="v3LJS" id="6EY0p2x2fE5" role="2Oq$k0">
-                                  <ref role="v3LJV" node="6EY0p2x2d9F" resolve="call" />
-                                </node>
-                                <node concept="3TrEf2" id="6EY0p2x2gb2" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:5hSMZ_lrcKO" resolve="argument" />
-                                </node>
-                              </node>
-                              <node concept="3Tsc0h" id="6EY0p2x2hiT" role="2OqNvi">
-                                <ref role="3TtcxE" to="wq2x:1L74NXEmFJV" resolve="binding" />
-                              </node>
-                            </node>
-                            <node concept="1z4cxt" id="6EY0p2x2lD6" role="2OqNvi">
-                              <node concept="1bVj0M" id="6EY0p2x2lD8" role="23t8la">
-                                <node concept="3clFbS" id="6EY0p2x2lD9" role="1bW5cS">
-                                  <node concept="3clFbF" id="6EY0p2x2lNa" role="3cqZAp">
-                                    <node concept="3clFbC" id="6EY0p2x2mYt" role="3clFbG">
-                                      <node concept="30H73N" id="6EY0p2x2mYO" role="3uHU7w" />
-                                      <node concept="2OqwBi" id="6EY0p2x2m5y" role="3uHU7B">
-                                        <node concept="37vLTw" id="6EY0p2x2lN9" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6EY0p2x2lDa" resolve="it" />
-                                        </node>
-                                        <node concept="3TrEf2" id="6EY0p2x2mjl" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="wq2x:1L74NXEmG0t" resolve="parameter" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="Rh6nW" id="6EY0p2x2lDa" role="1bW2Oz">
-                                  <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6EY0p2x2lDb" role="1tU5fm" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3x8VRR" id="6EY0p2x2nVI" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="gft3U" id="6EY0p2x2nVO" role="UU_$l">
-                    <node concept="10Nm6u" id="6EY0p2x2nVS" role="gfFT$" />
-                  </node>
-                </node>
-                <node concept="29HgVG" id="6EY0p2x2nWw" role="lGtFl">
-                  <node concept="3NFfHV" id="6EY0p2x2piG" role="3NFExx">
-                    <node concept="3clFbS" id="6EY0p2x2piH" role="2VODD2">
-                      <node concept="3clFbF" id="6EY0p2x2pwQ" role="3cqZAp">
-                        <node concept="2OqwBi" id="6EY0p2x2pWQ" role="3clFbG">
-                          <node concept="2OqwBi" id="6EY0p2x2pwS" role="2Oq$k0">
-                            <node concept="2OqwBi" id="6EY0p2x2pwT" role="2Oq$k0">
-                              <node concept="2OqwBi" id="6EY0p2x2pwU" role="2Oq$k0">
-                                <node concept="v3LJS" id="6EY0p2x2pwV" role="2Oq$k0">
-                                  <ref role="v3LJV" node="6EY0p2x2d9F" resolve="call" />
-                                </node>
-                                <node concept="3TrEf2" id="6EY0p2x2pwW" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:5hSMZ_lrcKO" resolve="argument" />
-                                </node>
-                              </node>
-                              <node concept="3Tsc0h" id="6EY0p2x2pwX" role="2OqNvi">
-                                <ref role="3TtcxE" to="wq2x:1L74NXEmFJV" resolve="binding" />
-                              </node>
-                            </node>
-                            <node concept="1z4cxt" id="6EY0p2x2pwY" role="2OqNvi">
-                              <node concept="1bVj0M" id="6EY0p2x2pwZ" role="23t8la">
-                                <node concept="3clFbS" id="6EY0p2x2px0" role="1bW5cS">
-                                  <node concept="3clFbF" id="6EY0p2x2px1" role="3cqZAp">
-                                    <node concept="3clFbC" id="6EY0p2x2px2" role="3clFbG">
-                                      <node concept="30H73N" id="6EY0p2x2px3" role="3uHU7w" />
-                                      <node concept="2OqwBi" id="6EY0p2x2px4" role="3uHU7B">
-                                        <node concept="37vLTw" id="6EY0p2x2px5" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="6EY0p2x2px7" resolve="it" />
-                                        </node>
-                                        <node concept="3TrEf2" id="6EY0p2x2px6" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="wq2x:1L74NXEmG0t" resolve="parameter" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="Rh6nW" id="6EY0p2x2px7" role="1bW2Oz">
-                                  <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="6EY0p2x2px8" role="1tU5fm" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3TrEf2" id="6EY0p2x2qil" role="2OqNvi">
-                            <ref role="3Tt5mk" to="wq2x:1L74NXGK1G1" resolve="code" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3uibUv" id="6EY0p2x2diF" role="3g7fb8">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="312cEu" id="7m2UX3UIaN5">
     <property role="TrG5h" value="BasicProgramAnalysisImpl" />
     <property role="3GE5qa" value="analysis" />
@@ -21268,25 +18148,25 @@
             </node>
             <node concept="3clFbJ" id="4U$Q3dLR1_9" role="3cqZAp">
               <node concept="3clFbS" id="4U$Q3dLR1_a" role="3clFbx">
-                <node concept="3clFbF" id="4U$Q3dLVqel" role="3cqZAp">
-                  <node concept="2OqwBi" id="4U$Q3dLVqTC" role="3clFbG">
-                    <node concept="37vLTw" id="4U$Q3dLVqek" role="2Oq$k0">
+                <node concept="3clFbF" id="631nQp3ZycR" role="3cqZAp">
+                  <node concept="2OqwBi" id="631nQp3ZycS" role="3clFbG">
+                    <node concept="37vLTw" id="631nQp3ZycT" role="2Oq$k0">
                       <ref role="3cqZAo" node="4U$Q3dLVpFk" resolve="result" />
-                      <node concept="1ZhdrF" id="4U$Q3dLVs5K" role="lGtFl">
+                      <node concept="1ZhdrF" id="631nQp3ZycU" role="lGtFl">
                         <property role="2qtEX8" value="variableDeclaration" />
                         <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                        <node concept="3$xsQk" id="4U$Q3dLVs5L" role="3$ytzL">
-                          <node concept="3clFbS" id="4U$Q3dLVs5M" role="2VODD2">
-                            <node concept="3clFbF" id="4U$Q3dLVseT" role="3cqZAp">
-                              <node concept="2OqwBi" id="4U$Q3dLVspw" role="3clFbG">
-                                <node concept="1iwH7S" id="4U$Q3dLVseS" role="2Oq$k0" />
-                                <node concept="1iwH70" id="4U$Q3dLVsvG" role="2OqNvi">
+                        <node concept="3$xsQk" id="631nQp3ZycV" role="3$ytzL">
+                          <node concept="3clFbS" id="631nQp3ZycW" role="2VODD2">
+                            <node concept="3clFbF" id="631nQp3ZycX" role="3cqZAp">
+                              <node concept="2OqwBi" id="631nQp3ZycY" role="3clFbG">
+                                <node concept="1iwH7S" id="631nQp3ZycZ" role="2Oq$k0" />
+                                <node concept="1iwH70" id="631nQp3Zyd0" role="2OqNvi">
                                   <ref role="1iwH77" node="4U$Q3dLVkEj" resolve="macroTable_result" />
-                                  <node concept="2OqwBi" id="4U$Q3dLVsUr" role="1iwH7V">
-                                    <node concept="30H73N" id="4U$Q3dLVsFs" role="2Oq$k0" />
-                                    <node concept="2Xjw5R" id="4U$Q3dLVtpI" role="2OqNvi">
-                                      <node concept="1xMEDy" id="4U$Q3dLVtpK" role="1xVPHs">
-                                        <node concept="chp4Y" id="4U$Q3dLVtuZ" role="ri$Ld">
+                                  <node concept="2OqwBi" id="631nQp3Zyd1" role="1iwH7V">
+                                    <node concept="30H73N" id="631nQp3Zyd2" role="2Oq$k0" />
+                                    <node concept="2Xjw5R" id="631nQp3Zyd3" role="2OqNvi">
+                                      <node concept="1xMEDy" id="631nQp3Zyd4" role="1xVPHs">
+                                        <node concept="chp4Y" id="631nQp3Zyd5" role="ri$Ld">
                                           <ref role="cht4Q" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
                                         </node>
                                       </node>
@@ -21299,28 +18179,28 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="TSZUe" id="4U$Q3dLVrFi" role="2OqNvi">
-                      <node concept="10QFUN" id="4U$Q3dLR150" role="25WWJ7">
-                        <node concept="3uibUv" id="4U$Q3dLR151" role="10QFUM">
+                    <node concept="TSZUe" id="631nQp3Zyd6" role="2OqNvi">
+                      <node concept="10QFUN" id="631nQp3Zyd7" role="25WWJ7">
+                        <node concept="3uibUv" id="631nQp3Zyd8" role="10QFUM">
                           <ref role="3uigEE" to="psr6:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
-                          <node concept="16syzq" id="4U$Q3dLR152" role="11_B2D">
+                          <node concept="16syzq" id="631nQp3Zyd9" role="11_B2D">
                             <ref role="16sUi3" node="4U$Q3dLR15h" resolve="T" />
                           </node>
                         </node>
-                        <node concept="2ShNRf" id="4U$Q3dLR153" role="10QFUP">
-                          <node concept="1pGfFk" id="4U$Q3dLR154" role="2ShVmc">
-                            <ref role="37wK5l" node="4JJCDIm$QjW" resolve="__MacroTable._Template" />
-                            <node concept="1ZhdrF" id="4U$Q3dLR155" role="lGtFl">
-                              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                        <node concept="2ShNRf" id="631nQp3Zyda" role="10QFUP">
+                          <node concept="1pGfFk" id="631nQp3ZyZ2" role="2ShVmc">
+                            <ref role="37wK5l" node="5itBwM7hMp$" resolve="__MacroTable._Expand" />
+                            <node concept="1ZhdrF" id="631nQp3Zzhw" role="lGtFl">
                               <property role="2qtEX8" value="baseMethodDeclaration" />
-                              <node concept="3$xsQk" id="4U$Q3dLR156" role="3$ytzL">
-                                <node concept="3clFbS" id="4U$Q3dLR157" role="2VODD2">
-                                  <node concept="3clFbF" id="4U$Q3dLR158" role="3cqZAp">
-                                    <node concept="2OqwBi" id="4U$Q3dLR159" role="3clFbG">
-                                      <node concept="1iwH7S" id="4U$Q3dLR15a" role="2Oq$k0" />
-                                      <node concept="1iwH70" id="4U$Q3dLR15b" role="2OqNvi">
+                              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                              <node concept="3$xsQk" id="631nQp3Zzhx" role="3$ytzL">
+                                <node concept="3clFbS" id="631nQp3Zzhy" role="2VODD2">
+                                  <node concept="3clFbF" id="631nQp3Zzuc" role="3cqZAp">
+                                    <node concept="2OqwBi" id="631nQp3Zzud" role="3clFbG">
+                                      <node concept="1iwH7S" id="631nQp3Zzue" role="2Oq$k0" />
+                                      <node concept="1iwH70" id="631nQp3Zzuf" role="2OqNvi">
                                         <ref role="1iwH77" node="4JJCDIm$O$I" resolve="macro_template_constructor" />
-                                        <node concept="30H73N" id="4U$Q3dLR15c" role="1iwH7V" />
+                                        <node concept="30H73N" id="631nQp3Zzug" role="1iwH7V" />
                                       </node>
                                     </node>
                                   </node>
@@ -21431,25 +18311,25 @@
             </node>
             <node concept="3clFbJ" id="4U$Q3dLR37Z" role="3cqZAp">
               <node concept="3clFbS" id="4U$Q3dLR380" role="3clFbx">
-                <node concept="3clFbF" id="4U$Q3dLVuLA" role="3cqZAp">
-                  <node concept="2OqwBi" id="4U$Q3dLVuLB" role="3clFbG">
-                    <node concept="37vLTw" id="4U$Q3dLVuLC" role="2Oq$k0">
+                <node concept="3clFbF" id="631nQp3ZzIs" role="3cqZAp">
+                  <node concept="2OqwBi" id="631nQp3ZzIt" role="3clFbG">
+                    <node concept="37vLTw" id="631nQp3ZzIu" role="2Oq$k0">
                       <ref role="3cqZAo" node="4U$Q3dLVtI0" resolve="result" />
-                      <node concept="1ZhdrF" id="4U$Q3dLVuLD" role="lGtFl">
+                      <node concept="1ZhdrF" id="631nQp3ZzIv" role="lGtFl">
                         <property role="2qtEX8" value="variableDeclaration" />
                         <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                        <node concept="3$xsQk" id="4U$Q3dLVuLE" role="3$ytzL">
-                          <node concept="3clFbS" id="4U$Q3dLVuLF" role="2VODD2">
-                            <node concept="3clFbF" id="4U$Q3dLVuLG" role="3cqZAp">
-                              <node concept="2OqwBi" id="4U$Q3dLVuLH" role="3clFbG">
-                                <node concept="1iwH7S" id="4U$Q3dLVuLI" role="2Oq$k0" />
-                                <node concept="1iwH70" id="4U$Q3dLVuLJ" role="2OqNvi">
+                        <node concept="3$xsQk" id="631nQp3ZzIw" role="3$ytzL">
+                          <node concept="3clFbS" id="631nQp3ZzIx" role="2VODD2">
+                            <node concept="3clFbF" id="631nQp3ZzIy" role="3cqZAp">
+                              <node concept="2OqwBi" id="631nQp3ZzIz" role="3clFbG">
+                                <node concept="1iwH7S" id="631nQp3ZzI$" role="2Oq$k0" />
+                                <node concept="1iwH70" id="631nQp3ZzI_" role="2OqNvi">
                                   <ref role="1iwH77" node="4U$Q3dLVkEj" resolve="macroTable_result" />
-                                  <node concept="2OqwBi" id="4U$Q3dLVuLK" role="1iwH7V">
-                                    <node concept="30H73N" id="4U$Q3dLVuLL" role="2Oq$k0" />
-                                    <node concept="2Xjw5R" id="4U$Q3dLVuLM" role="2OqNvi">
-                                      <node concept="1xMEDy" id="4U$Q3dLVuLN" role="1xVPHs">
-                                        <node concept="chp4Y" id="4U$Q3dLVuLO" role="ri$Ld">
+                                  <node concept="2OqwBi" id="631nQp3ZzIA" role="1iwH7V">
+                                    <node concept="30H73N" id="631nQp3ZzIB" role="2Oq$k0" />
+                                    <node concept="2Xjw5R" id="631nQp3ZzIC" role="2OqNvi">
+                                      <node concept="1xMEDy" id="631nQp3ZzID" role="1xVPHs">
+                                        <node concept="chp4Y" id="631nQp3ZzIE" role="ri$Ld">
                                           <ref role="cht4Q" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
                                         </node>
                                       </node>
@@ -21462,28 +18342,28 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="TSZUe" id="4U$Q3dLVuLP" role="2OqNvi">
-                      <node concept="10QFUN" id="4U$Q3dLVuLQ" role="25WWJ7">
-                        <node concept="3uibUv" id="4U$Q3dLVuLR" role="10QFUM">
+                    <node concept="TSZUe" id="631nQp3ZzIF" role="2OqNvi">
+                      <node concept="10QFUN" id="631nQp3ZzIG" role="25WWJ7">
+                        <node concept="3uibUv" id="631nQp3ZzIH" role="10QFUM">
                           <ref role="3uigEE" to="psr6:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
-                          <node concept="16syzq" id="4U$Q3dLVuLS" role="11_B2D">
+                          <node concept="16syzq" id="631nQp3ZzII" role="11_B2D">
                             <ref role="16sUi3" node="4U$Q3dLqoH3" resolve="T" />
                           </node>
                         </node>
-                        <node concept="2ShNRf" id="4U$Q3dLVuLT" role="10QFUP">
-                          <node concept="1pGfFk" id="4U$Q3dLVuLU" role="2ShVmc">
-                            <ref role="37wK5l" node="4JJCDIm$QjW" resolve="__MacroTable._Template" />
-                            <node concept="1ZhdrF" id="4U$Q3dLVuLV" role="lGtFl">
-                              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                        <node concept="2ShNRf" id="631nQp3ZzIJ" role="10QFUP">
+                          <node concept="1pGfFk" id="631nQp3ZzIK" role="2ShVmc">
+                            <ref role="37wK5l" node="5itBwM7hMp$" resolve="__MacroTable._Expand" />
+                            <node concept="1ZhdrF" id="631nQp3ZzIL" role="lGtFl">
                               <property role="2qtEX8" value="baseMethodDeclaration" />
-                              <node concept="3$xsQk" id="4U$Q3dLVuLW" role="3$ytzL">
-                                <node concept="3clFbS" id="4U$Q3dLVuLX" role="2VODD2">
-                                  <node concept="3clFbF" id="4U$Q3dLVuLY" role="3cqZAp">
-                                    <node concept="2OqwBi" id="4U$Q3dLVuLZ" role="3clFbG">
-                                      <node concept="1iwH7S" id="4U$Q3dLVuM0" role="2Oq$k0" />
-                                      <node concept="1iwH70" id="4U$Q3dLVuM1" role="2OqNvi">
+                              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                              <node concept="3$xsQk" id="631nQp3ZzIM" role="3$ytzL">
+                                <node concept="3clFbS" id="631nQp3ZzIN" role="2VODD2">
+                                  <node concept="3clFbF" id="631nQp3ZzIO" role="3cqZAp">
+                                    <node concept="2OqwBi" id="631nQp3ZzIP" role="3clFbG">
+                                      <node concept="1iwH7S" id="631nQp3ZzIQ" role="2Oq$k0" />
+                                      <node concept="1iwH70" id="631nQp3ZzIR" role="2OqNvi">
                                         <ref role="1iwH77" node="4JJCDIm$O$I" resolve="macro_template_constructor" />
-                                        <node concept="30H73N" id="4U$Q3dLVuM2" role="1iwH7V" />
+                                        <node concept="30H73N" id="631nQp3ZzIS" role="1iwH7V" />
                                       </node>
                                     </node>
                                   </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index 372a0d58..ceafedee 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -56,12 +56,6 @@
       <concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
         <child id="1076505808688" name="condition" index="2$JKZa" />
       </concept>
-      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
-        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
-      </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
-        <child id="1188208488637" name="annotation" index="2AJF6D" />
-      </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
         <child id="1154032183016" name="body" index="2LFqv$" />
       </concept>
@@ -129,15 +123,9 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
-      <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
-        <child id="1163668914799" name="condition" index="3K4Cdx" />
-        <child id="1163668922816" name="ifTrue" index="3K4E3e" />
-        <child id="1163668934364" name="ifFalse" index="3K4GZi" />
-      </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="1200397529627" name="jetbrains.mps.baseLanguage.structure.CharConstant" flags="nn" index="1Xhbcc">
@@ -192,7 +180,6 @@
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
-      <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
@@ -237,7 +224,6 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="3358009230509553641" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListType" flags="in" index="2BANLN" />
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
@@ -247,9 +233,7 @@
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
-      <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
-      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
     </language>
   </registry>
@@ -432,335 +416,6 @@
       <node concept="3clFbS" id="1hX44vMIE6z" role="2VODD2" />
     </node>
   </node>
-  <node concept="13h7C7" id="7IysFeA1uSQ">
-    <property role="3GE5qa" value="macro.decl" />
-    <ref role="13h7C2" to="wq2x:7IysFeA1uPa" resolve="MacroParameterReference" />
-    <node concept="13hLZK" id="7IysFeA1uSR" role="13h7CW">
-      <node concept="3clFbS" id="7IysFeA1uSS" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="7IysFeA1uT1" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="TrG5h" value="getVariable" />
-      <property role="13i0it" value="false" />
-      <ref role="13i0hy" to="tpek:SORzhOpB6t" resolve="getVariable" />
-      <node concept="3Tm1VV" id="7IysFeA1uT2" role="1B3o_S" />
-      <node concept="3clFbS" id="7IysFeA1uT5" role="3clF47">
-        <node concept="3clFbF" id="7IysFeA1uTm" role="3cqZAp">
-          <node concept="2OqwBi" id="7IysFeA1v1C" role="3clFbG">
-            <node concept="13iPFW" id="7IysFeA1uTl" role="2Oq$k0" />
-            <node concept="3TrEf2" id="7IysFeA1var" role="2OqNvi">
-              <ref role="3Tt5mk" to="wq2x:7IysFeA1uTj" resolve="parameter" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="7IysFeA1uT6" role="3clF45">
-        <ref role="ehGHo" to="tpee:4H$HgYMZ7sw" resolve="IVariableDeclaration" />
-      </node>
-    </node>
-  </node>
-  <node concept="13h7C7" id="7IysFeA5LcO">
-    <property role="3GE5qa" value="macro.code" />
-    <ref role="13h7C2" to="wq2x:7IysFeA5Lco" resolve="InitBlock" />
-    <node concept="13hLZK" id="7IysFeA5LcP" role="13h7CW">
-      <node concept="3clFbS" id="7IysFeA5LcQ" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="7IysFeA5LcZ" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="TrG5h" value="getExpectedRetType" />
-      <property role="13i0it" value="false" />
-      <ref role="13i0hy" to="tpek:i2fhBNC" resolve="getExpectedRetType" />
-      <node concept="3Tm1VV" id="7IysFeA5Ld0" role="1B3o_S" />
-      <node concept="2AHcQZ" id="7IysFeA5Ld3" role="2AJF6D">
-        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
-      </node>
-      <node concept="3clFbS" id="7IysFeA5Ld6" role="3clF47">
-        <node concept="3clFbF" id="7IysFeA5LV5" role="3cqZAp">
-          <node concept="2OqwBi" id="7IysFeA5MJb" role="3clFbG">
-            <node concept="2OqwBi" id="7IysFeA5M2O" role="2Oq$k0">
-              <node concept="13iPFW" id="7IysFeA5LV4" role="2Oq$k0" />
-              <node concept="2Xjw5R" id="7IysFeA5MoL" role="2OqNvi">
-                <node concept="1xMEDy" id="7IysFeA5MoN" role="1xVPHs">
-                  <node concept="chp4Y" id="7IysFeA5Msp" role="ri$Ld">
-                    <ref role="cht4Q" to="wq2x:7IysFeA0yb0" resolve="MacroParameterDeclaration" />
-                  </node>
-                </node>
-                <node concept="1xIGOp" id="7IysFeA5M$M" role="1xVPHs" />
-              </node>
-            </node>
-            <node concept="3TrEf2" id="7IysFeA5MW9" role="2OqNvi">
-              <ref role="3Tt5mk" to="wq2x:7IysFeA0ybI" resolve="type" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="7IysFeA5Ld7" role="3clF45" />
-    </node>
-  </node>
-  <node concept="13h7C7" id="7IysFeA8BcA">
-    <property role="3GE5qa" value="macro.decl" />
-    <ref role="13h7C2" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
-    <node concept="13hLZK" id="7IysFeA8BcB" role="13h7CW">
-      <node concept="3clFbS" id="7IysFeA8BcC" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="7IysFeA8BdB" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="availableLogicalVariable" />
-      <ref role="13i0hy" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
-      <node concept="3Tm1VV" id="7IysFeA8BdC" role="1B3o_S" />
-      <node concept="3clFbS" id="7IysFeA8BdI" role="3clF47">
-        <node concept="3clFbF" id="7IysFeA8Bja" role="3cqZAp">
-          <node concept="2OqwBi" id="7IysFeA8DmN" role="3clFbG">
-            <node concept="2OqwBi" id="7IysFeA8BqX" role="2Oq$k0">
-              <node concept="13iPFW" id="7IysFeA8Bj9" role="2Oq$k0" />
-              <node concept="3Tsc0h" id="7IysFeA8Byn" role="2OqNvi">
-                <ref role="3TtcxE" to="wq2x:7IysFe_ZPXE" resolve="parameter" />
-              </node>
-            </node>
-            <node concept="3goQfb" id="7IysFeA8G33" role="2OqNvi">
-              <node concept="1bVj0M" id="7IysFeA8G35" role="23t8la">
-                <node concept="3clFbS" id="7IysFeA8G36" role="1bW5cS">
-                  <node concept="3clFbF" id="7IysFeA8Gby" role="3cqZAp">
-                    <node concept="2OqwBi" id="7IysFeA8Gow" role="3clFbG">
-                      <node concept="37vLTw" id="7IysFeA8Gbx" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7IysFeA8G37" resolve="it" />
-                      </node>
-                      <node concept="3Tsc0h" id="7IysFeA8G_v" role="2OqNvi">
-                        <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="Rh6nW" id="7IysFeA8G37" role="1bW2Oz">
-                  <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7IysFeA8G38" role="1tU5fm" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="A3Dl8" id="7IysFeA8BdJ" role="3clF45">
-        <node concept="3Tqbb2" id="7IysFeA8BdK" role="A3Ik2">
-          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="13h7C7" id="3TnYLtqflZe">
-    <property role="3GE5qa" value="macro.code.with" />
-    <ref role="13h7C2" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
-    <node concept="13hLZK" id="3TnYLtqflZf" role="13h7CW">
-      <node concept="3clFbS" id="3TnYLtqflZg" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="3TnYLtqfm33" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="TrG5h" value="getVariable" />
-      <property role="13i0it" value="false" />
-      <ref role="13i0hy" to="tpek:SORzhOpB6t" resolve="getVariable" />
-      <node concept="3Tm1VV" id="3TnYLtqfm34" role="1B3o_S" />
-      <node concept="3clFbS" id="3TnYLtqfm37" role="3clF47">
-        <node concept="3clFbF" id="3TnYLtqfm5p" role="3cqZAp">
-          <node concept="2OqwBi" id="3TnYLtqfmdV" role="3clFbG">
-            <node concept="13iPFW" id="3TnYLtqfm5o" role="2Oq$k0" />
-            <node concept="3TrEf2" id="3TnYLtqfmuM" role="2OqNvi">
-              <ref role="3Tt5mk" to="wq2x:3TnYLtqfh$T" resolve="parameter" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="3TnYLtqfm38" role="3clF45">
-        <ref role="ehGHo" to="tpee:4H$HgYMZ7sw" resolve="IVariableDeclaration" />
-      </node>
-    </node>
-  </node>
-  <node concept="13h7C7" id="3AWu6Emeo_s">
-    <property role="3GE5qa" value="macro.decl" />
-    <ref role="13h7C2" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-    <node concept="13hLZK" id="3AWu6Emeo_t" role="13h7CW">
-      <node concept="3clFbS" id="3AWu6Emeo_u" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="3AWu6Eme_eg" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="availableLogicalVariable" />
-      <ref role="13i0hy" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
-      <node concept="3Tm1VV" id="3AWu6Eme_eh" role="1B3o_S" />
-      <node concept="3clFbS" id="3AWu6Eme_en" role="3clF47">
-        <node concept="3clFbF" id="3AWu6Eme_Zi" role="3cqZAp">
-          <node concept="2OqwBi" id="3AWu6Eme_Zj" role="3clFbG">
-            <node concept="2OqwBi" id="3AWu6Eme_Zk" role="2Oq$k0">
-              <node concept="13iPFW" id="3AWu6Eme_Zl" role="2Oq$k0" />
-              <node concept="3TrEf2" id="3AWu6Eme_Zm" role="2OqNvi">
-                <ref role="3Tt5mk" to="wq2x:7IysFe_ZQc2" resolve="body" />
-              </node>
-            </node>
-            <node concept="2qgKlT" id="3AWu6EmeAna" role="2OqNvi">
-              <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="A3Dl8" id="3AWu6Eme_eo" role="3clF45">
-        <node concept="3Tqbb2" id="3AWu6Eme_ep" role="A3Ik2">
-          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="13h7C7" id="1L74NXEmF9X">
-    <property role="3GE5qa" value="macro.invoke" />
-    <ref role="13h7C2" to="wq2x:1L74NXEmF9t" resolve="MacroInvocation" />
-    <node concept="13hLZK" id="1L74NXEmF9Y" role="13h7CW">
-      <node concept="3clFbS" id="1L74NXEmF9Z" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="1L74NXEmFa8" role="13h7CS">
-      <property role="13i0iv" value="true" />
-      <property role="13i0it" value="true" />
-      <property role="TrG5h" value="getTypeDeclaration" />
-      <node concept="3Tm1VV" id="1L74NXEmFa9" role="1B3o_S" />
-      <node concept="3Tqbb2" id="1L74NXEmFcj" role="3clF45">
-        <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-      </node>
-      <node concept="3clFbS" id="1L74NXEmFab" role="3clF47" />
-    </node>
-  </node>
-  <node concept="13h7C7" id="1L74NXEsP4$">
-    <property role="3GE5qa" value="macro.invoke" />
-    <ref role="13h7C2" to="wq2x:1L74NXEmFJU" resolve="MacroArgumentList" />
-    <node concept="13i0hz" id="1L74NXEsP5q" role="13h7CS">
-      <property role="TrG5h" value="getArguments" />
-      <node concept="3Tm1VV" id="1L74NXEsP5r" role="1B3o_S" />
-      <node concept="2I9FWS" id="1L74NXEsP5M" role="3clF45" />
-      <node concept="3clFbS" id="1L74NXEsP5t" role="3clF47">
-        <node concept="3cpWs8" id="1L74NXEotlb" role="3cqZAp">
-          <node concept="3cpWsn" id="1L74NXEotlc" role="3cpWs9">
-            <property role="TrG5h" value="params" />
-            <node concept="2I9FWS" id="1L74NXEotl7" role="1tU5fm">
-              <ref role="2I9WkF" to="wq2x:7IysFeA0yb0" resolve="MacroParameterDeclaration" />
-            </node>
-            <node concept="2OqwBi" id="1L74NXEotld" role="33vP2m">
-              <node concept="2OqwBi" id="1L74NXEotle" role="2Oq$k0">
-                <node concept="2OqwBi" id="1L74NXEotlf" role="2Oq$k0">
-                  <node concept="13iPFW" id="1L74NXEsPLB" role="2Oq$k0" />
-                  <node concept="2Xjw5R" id="1L74NXEotlh" role="2OqNvi">
-                    <node concept="1xMEDy" id="1L74NXEotli" role="1xVPHs">
-                      <node concept="chp4Y" id="1L74NXEotlj" role="ri$Ld">
-                        <ref role="cht4Q" to="wq2x:1L74NXEmF9t" resolve="MacroInvocation" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2qgKlT" id="1L74NXEotlk" role="2OqNvi">
-                  <ref role="37wK5l" node="1L74NXEmFa8" resolve="getTypeDeclaration" />
-                </node>
-              </node>
-              <node concept="3Tsc0h" id="1L74NXEotll" role="2OqNvi">
-                <ref role="3TtcxE" to="wq2x:7IysFeA0yca" resolve="parameter" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="1L74NXEoBkY" role="3cqZAp">
-          <node concept="3cpWsn" id="1L74NXEoBkZ" role="3cpWs9">
-            <property role="TrG5h" value="args" />
-            <node concept="2I9FWS" id="1L74NXEoBdR" role="1tU5fm">
-              <ref role="2I9WkF" to="wq2x:1L74NXEmF9s" resolve="MacroParameterBinding" />
-            </node>
-            <node concept="2OqwBi" id="1L74NXEoBl0" role="33vP2m">
-              <node concept="3Tsc0h" id="1L74NXEoBl1" role="2OqNvi">
-                <ref role="3TtcxE" to="wq2x:1L74NXEmFJV" resolve="binding" />
-              </node>
-              <node concept="13iPFW" id="1L74NXEsQfi" role="2Oq$k0" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1L74NXEouSQ" role="3cqZAp">
-          <node concept="2OqwBi" id="1L74NXEsQJt" role="3clFbG">
-            <node concept="2OqwBi" id="1L74NXEowKa" role="2Oq$k0">
-              <node concept="37vLTw" id="1L74NXEouSO" role="2Oq$k0">
-                <ref role="3cqZAo" node="1L74NXEotlc" resolve="params" />
-              </node>
-              <node concept="3$u5V9" id="1L74NXEo_vu" role="2OqNvi">
-                <node concept="1bVj0M" id="1L74NXEo_vw" role="23t8la">
-                  <node concept="3clFbS" id="1L74NXEo_vx" role="1bW5cS">
-                    <node concept="3cpWs8" id="1L74NXEoLyN" role="3cqZAp">
-                      <node concept="3cpWsn" id="1L74NXEoLyO" role="3cpWs9">
-                        <property role="TrG5h" value="b" />
-                        <node concept="3Tqbb2" id="1L74NXEoLyG" role="1tU5fm">
-                          <ref role="ehGHo" to="wq2x:1L74NXEmF9s" resolve="MacroParameterBinding" />
-                        </node>
-                        <node concept="2OqwBi" id="1L74NXEoLyP" role="33vP2m">
-                          <node concept="37vLTw" id="1L74NXEoLyQ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1L74NXEoBkZ" resolve="args" />
-                          </node>
-                          <node concept="1z4cxt" id="1L74NXEoLyR" role="2OqNvi">
-                            <node concept="1bVj0M" id="1L74NXEoLyS" role="23t8la">
-                              <node concept="3clFbS" id="1L74NXEoLyT" role="1bW5cS">
-                                <node concept="3clFbF" id="1L74NXEoLyU" role="3cqZAp">
-                                  <node concept="3clFbC" id="1L74NXEoLyV" role="3clFbG">
-                                    <node concept="37vLTw" id="1L74NXEoLyW" role="3uHU7w">
-                                      <ref role="3cqZAo" node="1L74NXEo_vy" resolve="p" />
-                                    </node>
-                                    <node concept="2OqwBi" id="1L74NXEoLyX" role="3uHU7B">
-                                      <node concept="37vLTw" id="1L74NXEoLyY" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="1L74NXEoLz0" resolve="it" />
-                                      </node>
-                                      <node concept="3TrEf2" id="1L74NXEoLyZ" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="wq2x:1L74NXEmG0t" resolve="parameter" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="Rh6nW" id="1L74NXEoLz0" role="1bW2Oz">
-                                <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="1L74NXEoLz1" role="1tU5fm" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="1L74NXEoDLn" role="3cqZAp">
-                      <node concept="3K4zz7" id="1L74NXEoOdn" role="3clFbG">
-                        <node concept="2OqwBi" id="1L74NXEoOOY" role="3K4E3e">
-                          <node concept="37vLTw" id="1L74NXEoO_J" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1L74NXEoLyO" resolve="b" />
-                          </node>
-                          <node concept="3TrEf2" id="1L74NXGKHCE" role="2OqNvi">
-                            <ref role="3Tt5mk" to="wq2x:1L74NXGK1G1" resolve="code" />
-                          </node>
-                        </node>
-                        <node concept="2c44tf" id="1L74NXEqkbi" role="3K4GZi">
-                          <node concept="10Nm6u" id="1L74NXEqkwF" role="2c44tc" />
-                        </node>
-                        <node concept="3y3z36" id="1L74NXEoNED" role="3K4Cdx">
-                          <node concept="10Nm6u" id="1L74NXEoO2X" role="3uHU7w" />
-                          <node concept="37vLTw" id="1L74NXEoLz2" role="3uHU7B">
-                            <ref role="3cqZAo" node="1L74NXEoLyO" resolve="b" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="Rh6nW" id="1L74NXEo_vy" role="1bW2Oz">
-                    <property role="TrG5h" value="p" />
-                    <node concept="2jxLKc" id="1L74NXEo_vz" role="1tU5fm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="ANE8D" id="1L74NXEsRw1" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="13hLZK" id="1L74NXEsP4_" role="13h7CW">
-      <node concept="3clFbS" id="1L74NXEsP4A" role="2VODD2" />
-    </node>
-  </node>
   <node concept="13h7C7" id="4MEOIDG83WW">
     <property role="3GE5qa" value="macro" />
     <ref role="13h7C2" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
@@ -817,33 +472,6 @@
       <node concept="3clFbS" id="4MEOIDG83WY" role="2VODD2" />
     </node>
   </node>
-  <node concept="13h7C7" id="5hSMZ_ltVxm">
-    <property role="3GE5qa" value="constraint.typespecific" />
-    <ref role="13h7C2" to="wq2x:4MEOIDFfpSk" resolve="CallMacroPseudoConstraint" />
-    <node concept="13hLZK" id="5hSMZ_ltVxn" role="13h7CW">
-      <node concept="3clFbS" id="5hSMZ_ltVxo" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="5hSMZ_ltVxx" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="getTypeDeclaration" />
-      <ref role="13i0hy" node="1L74NXEmFa8" resolve="getTypeDeclaration" />
-      <node concept="3Tm1VV" id="5hSMZ_ltVxy" role="1B3o_S" />
-      <node concept="3clFbS" id="5hSMZ_ltVx_" role="3clF47">
-        <node concept="3clFbF" id="5hSMZ_ltVzJ" role="3cqZAp">
-          <node concept="2OqwBi" id="5hSMZ_ltVID" role="3clFbG">
-            <node concept="13iPFW" id="5hSMZ_ltVzI" role="2Oq$k0" />
-            <node concept="3TrEf2" id="5hSMZ_ltVS$" role="2OqNvi">
-              <ref role="3Tt5mk" to="wq2x:5hSMZ_lpUoi" resolve="declaration" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="5hSMZ_ltVxA" role="3clF45">
-        <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-      </node>
-    </node>
-  </node>
   <node concept="13h7C7" id="5WBVN_N1Xtr">
     <property role="3GE5qa" value="logical" />
     <ref role="13h7C2" to="wq2x:5WBVN_MT8FC" resolve="LateExpressionItem" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
index 8d8ab941..e3e8464b 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
@@ -107,9 +107,6 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </concept>
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
@@ -122,7 +119,6 @@
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
@@ -206,9 +202,6 @@
       </concept>
       <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
-      <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
-        <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
-      </concept>
       <concept id="1154546920561" name="jetbrains.mps.lang.smodel.structure.OperationParm_ConceptList" flags="ng" index="3gmYPX">
         <child id="1154546920563" name="concept" index="3gmYPZ" />
       </concept>
@@ -274,7 +267,6 @@
         <child id="1235573187520" name="singletonValue" index="2HTEbv" />
       </concept>
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
-        <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
@@ -384,199 +376,6 @@
       </node>
     </node>
   </node>
-  <node concept="1M2fIO" id="7IysFeA1vGZ">
-    <property role="3GE5qa" value="macro.decl" />
-    <ref role="1M2myG" to="wq2x:7IysFeA1uPa" resolve="MacroParameterReference" />
-    <node concept="1N5Pfh" id="7IysFeA1vHe" role="1Mr941">
-      <ref role="1N5Vy1" to="wq2x:7IysFeA1uTj" resolve="parameter" />
-      <node concept="3dgokm" id="6fXjIfxgfVL" role="1N6uqs">
-        <node concept="3clFbS" id="6fXjIfxgfVM" role="2VODD2">
-          <node concept="3clFbF" id="6fXjIfxgfVN" role="3cqZAp">
-            <node concept="2ShNRf" id="6fXjIfxgfVO" role="3clFbG">
-              <node concept="YeOm9" id="6fXjIfxgfVP" role="2ShVmc">
-                <node concept="1Y3b0j" id="6fXjIfxgfVQ" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
-                  <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                  <node concept="2OqwBi" id="6fXjIfxgfVR" role="37wK5m">
-                    <node concept="2OqwBi" id="6fXjIfxgfVS" role="2Oq$k0">
-                      <node concept="2rP1CM" id="6fXjIfxgfVT" role="2Oq$k0" />
-                      <node concept="2Xjw5R" id="6fXjIfxgfVU" role="2OqNvi">
-                        <node concept="1xMEDy" id="6fXjIfxgfVV" role="1xVPHs">
-                          <node concept="chp4Y" id="6fXjIfxgfVW" role="ri$Ld">
-                            <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-                          </node>
-                        </node>
-                        <node concept="1xIGOp" id="6fXjIfxgfVX" role="1xVPHs" />
-                      </node>
-                    </node>
-                    <node concept="3Tsc0h" id="6fXjIfxgfVY" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:7IysFeA0yca" resolve="parameter" />
-                    </node>
-                  </node>
-                  <node concept="3Tm1VV" id="6fXjIfxgfVZ" role="1B3o_S" />
-                  <node concept="3clFb_" id="6fXjIfxgfW0" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="getName" />
-                    <node concept="17QB3L" id="6fXjIfxgfW1" role="3clF45" />
-                    <node concept="3Tm1VV" id="6fXjIfxgfW2" role="1B3o_S" />
-                    <node concept="37vLTG" id="6fXjIfxgfW3" role="3clF46">
-                      <property role="TrG5h" value="child" />
-                      <node concept="3Tqbb2" id="6fXjIfxgfW4" role="1tU5fm" />
-                    </node>
-                    <node concept="3clFbS" id="6fXjIfxgfW5" role="3clF47">
-                      <node concept="3clFbF" id="6fXjIfxgfW6" role="3cqZAp">
-                        <node concept="2OqwBi" id="6fXjIfxgfW7" role="3clFbG">
-                          <node concept="1PxgMI" id="6fXjIfxgfW8" role="2Oq$k0">
-                            <property role="1BlNFB" value="true" />
-                            <node concept="37vLTw" id="6fXjIfxgfW9" role="1m5AlR">
-                              <ref role="3cqZAo" node="6fXjIfxgfW3" resolve="child" />
-                            </node>
-                            <node concept="chp4Y" id="6fXjIfxgneK" role="3oSUPX">
-                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                            </node>
-                          </node>
-                          <node concept="3TrcHB" id="6fXjIfxgfWa" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="1M2fIO" id="3TnYLtqfhA9">
-    <property role="3GE5qa" value="macro.code.with" />
-    <ref role="1M2myG" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
-    <node concept="1N5Pfh" id="3TnYLtqfhNA" role="1Mr941">
-      <ref role="1N5Vy1" to="wq2x:3TnYLtqfh$T" resolve="parameter" />
-      <node concept="3dgokm" id="6fXjIfxgfWM" role="1N6uqs">
-        <node concept="3clFbS" id="6fXjIfxgfWN" role="2VODD2">
-          <node concept="3clFbF" id="63PS1WF10NC" role="3cqZAp">
-            <node concept="2ShNRf" id="63PS1WF10NE" role="3clFbG">
-              <node concept="1pGfFk" id="63PS1WF10NF" role="2ShVmc">
-                <ref role="37wK5l" to="o8zo:4k9eBec$QVW" resolve="ModelPlusImportedScope" />
-                <node concept="2OqwBi" id="63PS1WF10NG" role="37wK5m">
-                  <node concept="2rP1CM" id="63PS1WF10NH" role="2Oq$k0" />
-                  <node concept="I4A8Y" id="63PS1WF10NI" role="2OqNvi" />
-                </node>
-                <node concept="3clFbT" id="63PS1WF10NJ" role="37wK5m">
-                  <property role="3clFbU" value="false" />
-                </node>
-                <node concept="35c_gC" id="63PS1WF10NK" role="37wK5m">
-                  <ref role="35c_gD" to="wq2x:3TnYLtqfhzx" resolve="ContextParameterDeclaration" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="1M2fIO" id="3TnYLtqgRGO">
-    <property role="3GE5qa" value="macro.code.with" />
-    <ref role="1M2myG" to="wq2x:3TnYLtqgQYU" resolve="WithContextStatement" />
-    <node concept="1N5Pfh" id="3TnYLtqgRGP" role="1Mr941">
-      <ref role="1N5Vy1" to="wq2x:3TnYLtqgRY3" resolve="parameter" />
-      <node concept="3dgokm" id="6fXjIfxgfWb" role="1N6uqs">
-        <node concept="3clFbS" id="6fXjIfxgfWc" role="2VODD2">
-          <node concept="3clFbF" id="6fXjIfxgfWd" role="3cqZAp">
-            <node concept="2ShNRf" id="6fXjIfxgfWe" role="3clFbG">
-              <node concept="1pGfFk" id="6fXjIfxgfWf" role="2ShVmc">
-                <ref role="37wK5l" to="o8zo:4k9eBec$QVW" resolve="ModelPlusImportedScope" />
-                <node concept="2OqwBi" id="6fXjIfxgfWj" role="37wK5m">
-                  <node concept="2rP1CM" id="6fXjIfxgfWk" role="2Oq$k0" />
-                  <node concept="I4A8Y" id="6fXjIfxgfWl" role="2OqNvi" />
-                </node>
-                <node concept="3clFbT" id="6fXjIfxgfWh" role="37wK5m" />
-                <node concept="35c_gC" id="6fXjIfxgfWi" role="37wK5m">
-                  <ref role="35c_gD" to="wq2x:3TnYLtqfhzx" resolve="ContextParameterDeclaration" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="1M2fIO" id="1L74NXEmG0V">
-    <property role="3GE5qa" value="macro.invoke" />
-    <ref role="1M2myG" to="wq2x:1L74NXEmF9s" resolve="MacroParameterBinding" />
-    <node concept="1N5Pfh" id="1L74NXEmG0W" role="1Mr941">
-      <ref role="1N5Vy1" to="wq2x:1L74NXEmG0t" resolve="parameter" />
-      <node concept="3dgokm" id="6fXjIfxgfWm" role="1N6uqs">
-        <node concept="3clFbS" id="6fXjIfxgfWn" role="2VODD2">
-          <node concept="3clFbF" id="6fXjIfxgfWo" role="3cqZAp">
-            <node concept="2ShNRf" id="6fXjIfxgfWp" role="3clFbG">
-              <node concept="YeOm9" id="6fXjIfxgfWq" role="2ShVmc">
-                <node concept="1Y3b0j" id="6fXjIfxgfWr" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                  <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
-                  <node concept="3Tm1VV" id="6fXjIfxgfWs" role="1B3o_S" />
-                  <node concept="3clFb_" id="6fXjIfxgfWt" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="getName" />
-                    <node concept="17QB3L" id="6fXjIfxgfWu" role="3clF45" />
-                    <node concept="3Tm1VV" id="6fXjIfxgfWv" role="1B3o_S" />
-                    <node concept="37vLTG" id="6fXjIfxgfWw" role="3clF46">
-                      <property role="TrG5h" value="child" />
-                      <node concept="3Tqbb2" id="6fXjIfxgfWx" role="1tU5fm" />
-                    </node>
-                    <node concept="3clFbS" id="6fXjIfxgfWy" role="3clF47">
-                      <node concept="3clFbF" id="6fXjIfxgfWz" role="3cqZAp">
-                        <node concept="2OqwBi" id="6fXjIfxgfW$" role="3clFbG">
-                          <node concept="1PxgMI" id="6fXjIfxgfW_" role="2Oq$k0">
-                            <property role="1BlNFB" value="true" />
-                            <node concept="37vLTw" id="6fXjIfxgfWA" role="1m5AlR">
-                              <ref role="3cqZAo" node="6fXjIfxgfWw" resolve="child" />
-                            </node>
-                            <node concept="chp4Y" id="6fXjIfxgnfc" role="3oSUPX">
-                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                            </node>
-                          </node>
-                          <node concept="3TrcHB" id="6fXjIfxgfWB" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="6fXjIfxgfWC" role="37wK5m">
-                    <node concept="2OqwBi" id="6fXjIfxgfWD" role="2Oq$k0">
-                      <node concept="2OqwBi" id="6fXjIfxgfWE" role="2Oq$k0">
-                        <node concept="2rP1CM" id="6fXjIfxgfWF" role="2Oq$k0" />
-                        <node concept="2Xjw5R" id="6fXjIfxgfWG" role="2OqNvi">
-                          <node concept="1xMEDy" id="6fXjIfxgfWH" role="1xVPHs">
-                            <node concept="chp4Y" id="6fXjIfxgfWI" role="ri$Ld">
-                              <ref role="cht4Q" to="wq2x:1L74NXEmF9t" resolve="MacroInvocation" />
-                            </node>
-                          </node>
-                          <node concept="1xIGOp" id="6fXjIfxgfWJ" role="1xVPHs" />
-                        </node>
-                      </node>
-                      <node concept="2qgKlT" id="6fXjIfxgfWK" role="2OqNvi">
-                        <ref role="37wK5l" to="x5bw:1L74NXEmFa8" resolve="getTypeDeclaration" />
-                      </node>
-                    </node>
-                    <node concept="3Tsc0h" id="6fXjIfxgfWL" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:7IysFeA0yca" resolve="parameter" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="1M2fIO" id="2vGNdoJFT55">
     <property role="3GE5qa" value="constraint.template" />
     <ref role="1M2myG" to="wq2x:6p0DfM0asBO" resolve="ConstraintDeclaration" />
@@ -616,197 +415,6 @@
       </node>
     </node>
   </node>
-  <node concept="1M2fIO" id="6DOfTm$zRn6">
-    <property role="3GE5qa" value="macro.decl" />
-    <ref role="1M2myG" to="wq2x:6DOfTm$zRmf" resolve="MacroInputDeclaration" />
-    <node concept="3EP7_v" id="6DOfTm$zRDR" role="1MtirG">
-      <node concept="3dgokm" id="6DOfTm$zRDV" role="3EP$qY">
-        <node concept="3clFbS" id="6DOfTm$zRDX" role="2VODD2">
-          <node concept="3cpWs8" id="6DOfTm$zRGQ" role="3cqZAp">
-            <node concept="3cpWsn" id="6DOfTm$zRGR" role="3cpWs9">
-              <property role="TrG5h" value="macroDecl" />
-              <node concept="3Tqbb2" id="6DOfTm$zRGS" role="1tU5fm">
-                <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-              </node>
-              <node concept="2OqwBi" id="6DOfTm$zRGT" role="33vP2m">
-                <node concept="2rP1CM" id="6DOfTm$zRGU" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="6DOfTm$zRGV" role="2OqNvi">
-                  <node concept="1xMEDy" id="6DOfTm$zRGW" role="1xVPHs">
-                    <node concept="chp4Y" id="6DOfTm$zTa_" role="ri$Ld">
-                      <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-                    </node>
-                  </node>
-                  <node concept="1xIGOp" id="6DOfTm$zRGY" role="1xVPHs" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="6DOfTm$zRGZ" role="3cqZAp">
-            <node concept="2ShNRf" id="6DOfTm$zRH0" role="3clFbG">
-              <node concept="YeOm9" id="6DOfTm$zRH1" role="2ShVmc">
-                <node concept="1Y3b0j" id="6DOfTm$zRH2" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                  <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
-                  <node concept="2YIFZM" id="6DOfTm$zRH3" role="37wK5m">
-                    <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-                    <ref role="37wK5l" to="33ny:~Collections.singletonList(java.lang.Object)" resolve="singletonList" />
-                    <node concept="2OqwBi" id="6DOfTm$zUuH" role="37wK5m">
-                      <node concept="37vLTw" id="6DOfTm$zRH6" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6DOfTm$zRGR" resolve="macroDecl" />
-                      </node>
-                      <node concept="3TrEf2" id="6DOfTm$zVFy" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:6DOfTm$zUE3" resolve="input" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3Tm1VV" id="6DOfTm$zRH9" role="1B3o_S" />
-                  <node concept="3clFb_" id="6DOfTm$zRHa" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="getName" />
-                    <node concept="17QB3L" id="6DOfTm$zRHb" role="3clF45" />
-                    <node concept="3Tm1VV" id="6DOfTm$zRHc" role="1B3o_S" />
-                    <node concept="37vLTG" id="6DOfTm$zRHd" role="3clF46">
-                      <property role="TrG5h" value="child" />
-                      <node concept="3Tqbb2" id="6DOfTm$zRHe" role="1tU5fm" />
-                    </node>
-                    <node concept="3clFbS" id="6DOfTm$zRHf" role="3clF47">
-                      <node concept="3clFbF" id="6DOfTm$zRHg" role="3cqZAp">
-                        <node concept="2OqwBi" id="6DOfTm$zRHh" role="3clFbG">
-                          <node concept="1PxgMI" id="6DOfTm$zRHi" role="2Oq$k0">
-                            <property role="1BlNFB" value="true" />
-                            <node concept="37vLTw" id="6DOfTm$zRHj" role="1m5AlR">
-                              <ref role="3cqZAo" node="6DOfTm$zRHd" resolve="child" />
-                            </node>
-                            <node concept="chp4Y" id="6DOfTm$zRHk" role="3oSUPX">
-                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                            </node>
-                          </node>
-                          <node concept="3TrcHB" id="6DOfTm$zRHl" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="1M2fIO" id="6DOfTm$$Xzc">
-    <property role="3GE5qa" value="macro.code" />
-    <ref role="1M2myG" to="wq2x:6DOfTm$$CHj" resolve="MacroInputReference" />
-    <node concept="1N5Pfh" id="6DOfTm$$Xzd" role="1Mr941">
-      <ref role="1N5Vy1" to="wq2x:6DOfTm$$CHk" resolve="declaration" />
-      <node concept="3dgokm" id="6DOfTm$$ZXM" role="1N6uqs">
-        <node concept="3clFbS" id="6DOfTm$$ZXN" role="2VODD2">
-          <node concept="3cpWs8" id="6DOfTm$$ZXO" role="3cqZAp">
-            <node concept="3cpWsn" id="6DOfTm$$ZXP" role="3cpWs9">
-              <property role="TrG5h" value="md" />
-              <node concept="3Tqbb2" id="6DOfTm$$ZXQ" role="1tU5fm">
-                <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-              </node>
-              <node concept="2OqwBi" id="6DOfTm$$ZXR" role="33vP2m">
-                <node concept="2rP1CM" id="6DOfTm$$ZXS" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="6DOfTm$$ZXT" role="2OqNvi">
-                  <node concept="1xMEDy" id="6DOfTm$$ZXU" role="1xVPHs">
-                    <node concept="chp4Y" id="6EY0p2x1LUm" role="ri$Ld">
-                      <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbJ" id="6DOfTm$$ZXW" role="3cqZAp">
-            <node concept="3clFbS" id="6DOfTm$$ZXX" role="3clFbx">
-              <node concept="3cpWs6" id="6DOfTm$$ZXY" role="3cqZAp">
-                <node concept="2ShNRf" id="6DOfTm$$ZXZ" role="3cqZAk">
-                  <node concept="YeOm9" id="6DOfTm$$ZY0" role="2ShVmc">
-                    <node concept="1Y3b0j" id="6DOfTm$$ZY1" role="YeSDq">
-                      <property role="2bfB8j" value="true" />
-                      <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
-                      <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                      <node concept="3Tm1VV" id="6DOfTm$$ZY2" role="1B3o_S" />
-                      <node concept="3clFb_" id="6DOfTm$$ZY3" role="jymVt">
-                        <property role="1EzhhJ" value="false" />
-                        <property role="TrG5h" value="getName" />
-                        <node concept="17QB3L" id="6DOfTm$$ZY4" role="3clF45" />
-                        <node concept="3Tm1VV" id="6DOfTm$$ZY5" role="1B3o_S" />
-                        <node concept="37vLTG" id="6DOfTm$$ZY6" role="3clF46">
-                          <property role="TrG5h" value="child" />
-                          <node concept="3Tqbb2" id="6DOfTm$$ZY7" role="1tU5fm" />
-                        </node>
-                        <node concept="3clFbS" id="6DOfTm$$ZY8" role="3clF47">
-                          <node concept="3clFbF" id="6DOfTm$_1nK" role="3cqZAp">
-                            <node concept="2OqwBi" id="6DOfTm$_208" role="3clFbG">
-                              <node concept="1PxgMI" id="6DOfTm$_1KV" role="2Oq$k0">
-                                <property role="1BlNFB" value="true" />
-                                <node concept="chp4Y" id="6DOfTm$_1Nh" role="3oSUPX">
-                                  <ref role="cht4Q" to="wq2x:6DOfTm$zRmf" resolve="MacroInputDeclaration" />
-                                </node>
-                                <node concept="37vLTw" id="6DOfTm$_1nJ" role="1m5AlR">
-                                  <ref role="3cqZAo" node="6DOfTm$$ZY6" resolve="child" />
-                                </node>
-                              </node>
-                              <node concept="3TrcHB" id="6DOfTm$_2f8" role="2OqNvi">
-                                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2ShNRf" id="6DOfTm$$ZYd" role="37wK5m">
-                        <node concept="Tc6Ow" id="6DOfTm$$ZYe" role="2ShVmc">
-                          <node concept="3Tqbb2" id="6DOfTm$$ZYf" role="HW$YZ" />
-                          <node concept="2OqwBi" id="6DOfTm$_0_g" role="HW$Y0">
-                            <node concept="1PxgMI" id="6DOfTm$$ZYg" role="2Oq$k0">
-                              <property role="1BlNFB" value="true" />
-                              <node concept="37vLTw" id="6DOfTm$$ZYi" role="1m5AlR">
-                                <ref role="3cqZAo" node="6DOfTm$$ZXP" resolve="md" />
-                              </node>
-                              <node concept="chp4Y" id="6DOfTm$$ZYk" role="3oSUPX">
-                                <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-                              </node>
-                            </node>
-                            <node concept="3TrEf2" id="6DOfTm$_17v" role="2OqNvi">
-                              <ref role="3Tt5mk" to="wq2x:6DOfTm$zUE3" resolve="input" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="6DOfTm$$ZYl" role="3cqZAp" />
-            </node>
-            <node concept="2OqwBi" id="6DOfTm$$ZYm" role="3clFbw">
-              <node concept="37vLTw" id="6DOfTm$$ZYn" role="2Oq$k0">
-                <ref role="3cqZAo" node="6DOfTm$$ZXP" resolve="md" />
-              </node>
-              <node concept="3x8VRR" id="6DOfTm$$ZYo" role="2OqNvi" />
-            </node>
-            <node concept="9aQIb" id="6DOfTm$$ZYp" role="9aQIa">
-              <node concept="3clFbS" id="6DOfTm$$ZYq" role="9aQI4">
-                <node concept="3cpWs6" id="6DOfTm$$ZYr" role="3cqZAp">
-                  <node concept="2ShNRf" id="6DOfTm$$ZYs" role="3cqZAk">
-                    <node concept="1pGfFk" id="6DOfTm$$ZYt" role="2ShVmc">
-                      <ref role="37wK5l" to="o8zo:7ipADkTfAzT" resolve="EmptyScope" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="1M2fIO" id="1090FxOSDK0">
     <ref role="1M2myG" to="wq2x:60zk4o7reud" resolve="LogicalContextExpression" />
     <node concept="9S07l" id="1090FxOSDK1" role="9Vyp8">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 782ed8ab..7ec7d788 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -44,7 +44,6 @@
       </concept>
       <concept id="1140524381322" name="jetbrains.mps.lang.editor.structure.CellModel_ListWithRole" flags="ng" index="2czfm3">
         <property id="1140524450557" name="separatorText" index="2czwfO" />
-        <property id="1156252885376" name="separatorLayoutConstraint" index="Q2I2d" />
         <child id="1140524464360" name="cellLayout" index="2czzBx" />
         <child id="1140524464359" name="emptyCellModel" index="2czzBI" />
         <child id="928328222691832421" name="separatorTextQuery" index="2gpyvW" />
@@ -1840,85 +1839,6 @@
       <node concept="l2Vlx" id="1pPth$m5B5h" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="1pPth$m6097">
-    <property role="3GE5qa" value="macro.decl" />
-    <ref role="1XX52x" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-    <node concept="3EZMnI" id="1pPth$m6099" role="2wV5jI">
-      <node concept="3F0ifn" id="7IysFeA7AdY" role="3EZMnx">
-        <property role="3F0ifm" value="macro" />
-        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
-      </node>
-      <node concept="3F0A7n" id="1pPth$m609g" role="3EZMnx">
-        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-        <ref role="1k5W1q" to="tpen:hshUnm6" resolve="StaticMethod" />
-      </node>
-      <node concept="3F0ifn" id="7IysFeA6Upz" role="3EZMnx">
-        <property role="3F0ifm" value="expands" />
-        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
-      </node>
-      <node concept="3F1sOY" id="6DOfTm$zYlt" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:6DOfTm$zUE3" resolve="input" />
-      </node>
-      <node concept="3F2HdR" id="7IysFeA0yd6" role="3EZMnx">
-        <property role="Q2I2d" value="g$1Qtxb/punctuation" />
-        <property role="2czwfO" value=" " />
-        <ref role="1NtTu8" to="wq2x:7IysFeA0yca" resolve="parameter" />
-        <node concept="l2Vlx" id="7IysFeA0yd8" role="2czzBx" />
-        <node concept="tppnM" id="7IysFeA5bgI" role="sWeuL">
-          <node concept="ljvvj" id="7IysFeA5bgL" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="lj46D" id="7Xmdqtdxyyv" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="pVoyu" id="7Xmdqtdxyyw" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="3F0ifn" id="7XmdqtdxJfq" role="2czzBI">
-          <property role="3F0ifm" value="no parameters" />
-          <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
-          <node concept="Vb9p2" id="7Xmdqtdys5T" role="3F10Kt">
-            <property role="Vbekb" value="g1_k_vY/BOLD" />
-          </node>
-        </node>
-      </node>
-      <node concept="3F0ifn" id="7Xmdqtdxz9p" role="3EZMnx">
-        <property role="3F0ifm" value="" />
-        <node concept="lj46D" id="7IysFeA6Us2" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="pVoyu" id="7IysFeA6UuT" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="pkWqt" id="7Xmdqtdxznr" role="pqm2j">
-          <node concept="3clFbS" id="7Xmdqtdxzns" role="2VODD2">
-            <node concept="3clFbF" id="7XmdqtdxzuD" role="3cqZAp">
-              <node concept="2OqwBi" id="7XmdqtdxE7p" role="3clFbG">
-                <node concept="2OqwBi" id="7XmdqtdxzHW" role="2Oq$k0">
-                  <node concept="pncrf" id="7XmdqtdxzuC" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="7Xmdqtdx$jq" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:7IysFeA0yca" resolve="parameter" />
-                  </node>
-                </node>
-                <node concept="3GX2aA" id="7XmdqtdxIQ$" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3F1sOY" id="7IysFe_ZQch" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:7IysFe_ZQc2" resolve="body" />
-        <node concept="lj46D" id="4MEOIDF_LeC" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="pVoyu" id="4MEOIDF_LeD" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="l2Vlx" id="1pPth$m609c" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="PB1R3Y7Ej_">
     <property role="3GE5qa" value="constraint.variable" />
     <ref role="1XX52x" to="wq2x:PB1R3Y7Ed7" resolve="RulePartParameterDeclaration" />
@@ -2039,27 +1959,6 @@
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="18kNIl0jL7w">
-    <property role="3GE5qa" value="constraint.typespecific" />
-    <ref role="1XX52x" to="wq2x:18kNIl0jL2T" resolve="ExpandPseudoConstraint" />
-    <node concept="3EZMnI" id="18kNIl0jL7y" role="2wV5jI">
-      <node concept="3F1sOY" id="18kNIl0jL7z" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:18kNIl0jL_z" resolve="logical" />
-      </node>
-      <node concept="3F0ifn" id="18kNIl0jL7$" role="3EZMnx">
-        <property role="3F0ifm" value=":=" />
-        <ref role="1k5W1q" to="tpen:hF$iUjy" resolve="Operator" />
-      </node>
-      <node concept="PMmxH" id="6DOfTm$5j2d" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
-      </node>
-      <node concept="3F1sOY" id="18kNIl0jMiT" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:18kNIl0jL3E" resolve="origin" />
-      </node>
-      <node concept="l2Vlx" id="18kNIl0jL8a" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="7IysFe_ZPXL">
     <property role="3GE5qa" value="macro.decl" />
     <ref role="1XX52x" to="wq2x:7IysFe_ZPXH" resolve="MacroBodyLogicalDeclaration" />
@@ -2090,467 +1989,6 @@
       <node concept="l2Vlx" id="7IysFe_ZPXU" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="7IysFe_ZQ5Q">
-    <property role="3GE5qa" value="macro.decl" />
-    <ref role="1XX52x" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
-    <node concept="3EZMnI" id="7IysFe_ZQ6e" role="2wV5jI">
-      <node concept="3F0ifn" id="7IysFe_ZQ6E" role="3EZMnx">
-        <property role="3F0ifm" value="produce" />
-        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
-        <node concept="pVoyu" id="7IysFeA7AiM" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="A1WHr" id="7XmdqtdBqvb" role="3vIgyS">
-          <ref role="2ZyFGn" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
-        </node>
-      </node>
-      <node concept="3EZMnI" id="7XmdqtdB5Cs" role="3EZMnx">
-        <node concept="3F0ifn" id="7XmdqtdBODP" role="3EZMnx">
-          <property role="3F0ifm" value="&lt;" />
-          <node concept="11LMrY" id="7XmdqtdCbtb" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="VPM3Z" id="7XmdqtdB5Cu" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F2HdR" id="7XmdqtdBqWY" role="3EZMnx">
-          <property role="2czwfO" value="," />
-          <ref role="1NtTu8" to="wq2x:7IysFe_ZPXE" resolve="parameter" />
-          <node concept="l2Vlx" id="7XmdqtdBqWZ" role="2czzBx" />
-          <node concept="3F0ifn" id="7XmdqtdBqX0" role="2czzBI">
-            <property role="ilYzB" value="&lt;no logical&gt;" />
-          </node>
-        </node>
-        <node concept="3F0ifn" id="7XmdqtdBqD7" role="3EZMnx">
-          <property role="3F0ifm" value="&gt;" />
-          <node concept="11L4FC" id="7XmdqtdCbtd" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="l2Vlx" id="7XmdqtdB5Cx" role="2iSdaV" />
-        <node concept="pkWqt" id="7XmdqtdB5CX" role="pqm2j">
-          <node concept="3clFbS" id="7XmdqtdB5CY" role="2VODD2">
-            <node concept="3clFbF" id="7XmdqtdB5Kb" role="3cqZAp">
-              <node concept="2OqwBi" id="7XmdqtdB8mq" role="3clFbG">
-                <node concept="2OqwBi" id="7XmdqtdB5X8" role="2Oq$k0">
-                  <node concept="pncrf" id="7XmdqtdB5Ka" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="7XmdqtdB6gS" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:7IysFe_ZPXE" resolve="parameter" />
-                  </node>
-                </node>
-                <node concept="3GX2aA" id="7XmdqtdBbEN" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3EZMnI" id="7XmdqtdBOYd" role="3EZMnx">
-        <node concept="VPM3Z" id="7XmdqtdBOYf" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="lj46D" id="7XmdqtdBP8N" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="pVoyu" id="7XmdqtdBP8V" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="l2Vlx" id="7XmdqtdBOYi" role="2iSdaV" />
-        <node concept="3F0ifn" id="7XmdqtdBsKt" role="3EZMnx">
-          <property role="3F0ifm" value="%%" />
-          <ref role="1k5W1q" node="7LZcKzBE07j" resolve="EmitConstraint" />
-          <node concept="ljvvj" id="7XmdqtdBt4D" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="3EZMnI" id="7IysFe_ZQ8b" role="3EZMnx">
-          <property role="S$Qs1" value="true" />
-          <node concept="VPM3Z" id="7IysFe_ZQ8c" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-          <node concept="pVoyu" id="7IysFe_ZQ8d" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="lj46D" id="7IysFe_ZQ8e" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="ljvvj" id="7IysFe_ZQ8f" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="l2Vlx" id="7IysFe_ZQ8g" role="2iSdaV" />
-          <node concept="3F1sOY" id="7IysFe_ZQ8h" role="3EZMnx">
-            <ref role="1NtTu8" to="wq2x:7IysFe_ZPXC" resolve="code" />
-          </node>
-        </node>
-        <node concept="3F0ifn" id="7XmdqtdBtpv" role="3EZMnx">
-          <property role="3F0ifm" value="%%" />
-          <ref role="1k5W1q" node="7LZcKzBE07j" resolve="EmitConstraint" />
-          <node concept="pVoyu" id="7XmdqtdBtHH" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-      </node>
-      <node concept="l2Vlx" id="7IysFe_ZQ6f" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="7IysFeA0ybR">
-    <property role="3GE5qa" value="macro.decl" />
-    <ref role="1XX52x" to="wq2x:7IysFeA0yb0" resolve="MacroParameterDeclaration" />
-    <node concept="3EZMnI" id="7IysFeA0ybT" role="2wV5jI">
-      <node concept="3F1sOY" id="7IysFeA0yc0" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:7IysFeA0ybI" resolve="type" />
-      </node>
-      <node concept="3F0A7n" id="7IysFeA0yc6" role="3EZMnx">
-        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-        <ref role="1k5W1q" to="tpen:hshQ_OE" resolve="Field" />
-      </node>
-      <node concept="3F0ifn" id="7IysFeA5xBX" role="3EZMnx">
-        <property role="3F0ifm" value="=" />
-      </node>
-      <node concept="3F1sOY" id="7IysFeA5xC7" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:7IysFeA5xBQ" resolve="init" />
-      </node>
-      <node concept="l2Vlx" id="7IysFeA0ybW" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="7IysFeA1vun">
-    <property role="3GE5qa" value="macro.decl" />
-    <ref role="1XX52x" to="wq2x:7IysFeA1uPa" resolve="MacroParameterReference" />
-    <node concept="3EZMnI" id="7IysFeA1vup" role="2wV5jI">
-      <node concept="1iCGBv" id="7IysFeA1vuw" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:7IysFeA1uTj" resolve="parameter" />
-        <node concept="1sVBvm" id="7IysFeA1vuy" role="1sWHZn">
-          <node concept="3F0A7n" id="7IysFeA1vuD" role="2wV5jI">
-            <property role="1Intyy" value="true" />
-            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-            <ref role="1k5W1q" to="tpen:hshQ_OE" resolve="Field" />
-          </node>
-        </node>
-      </node>
-      <node concept="l2Vlx" id="7IysFeA1vus" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="7IysFeA5Lea">
-    <property role="3GE5qa" value="macro.code" />
-    <ref role="1XX52x" to="wq2x:7IysFeA5Lco" resolve="InitBlock" />
-    <node concept="3EZMnI" id="7IysFeA5LyV" role="2wV5jI">
-      <node concept="3F0ifn" id="7IysFeA5LyW" role="3EZMnx">
-        <property role="3F0ifm" value="{" />
-        <ref role="1k5W1q" to="tpen:hFD5onb" resolve="LeftBrace" />
-        <node concept="lj46D" id="7IysFeA5LyX" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="pkWqt" id="7IysFeA5LyY" role="pqm2j">
-          <node concept="3clFbS" id="7IysFeA5LyZ" role="2VODD2">
-            <node concept="3clFbF" id="7IysFeA5Lz0" role="3cqZAp">
-              <node concept="3fqX7Q" id="7IysFeA5Lz1" role="3clFbG">
-                <node concept="2OqwBi" id="7IysFeA5Lz2" role="3fr31v">
-                  <node concept="2OqwBi" id="7IysFeA5Lz3" role="2Oq$k0">
-                    <node concept="pncrf" id="7IysFeA5Lz4" role="2Oq$k0" />
-                    <node concept="2qgKlT" id="7IysFeA5Lz5" role="2OqNvi">
-                      <ref role="37wK5l" to="tpek:i0zv5tb" resolve="getStatementList" />
-                    </node>
-                  </node>
-                  <node concept="2qgKlT" id="7IysFeA5Lz6" role="2OqNvi">
-                    <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="ljvvj" id="7IysFeA5Lz7" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3EZMnI" id="7IysFeA5Lz8" role="3EZMnx">
-        <node concept="VPM3Z" id="7IysFeA5Lz9" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="lj46D" id="7IysFeA5Lza" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="l2Vlx" id="7IysFeA5Lzb" role="2iSdaV" />
-        <node concept="3EZMnI" id="7IysFeA5Lzc" role="3EZMnx">
-          <property role="S$Qs1" value="true" />
-          <node concept="VPM3Z" id="7IysFeA5Lzd" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-          <node concept="pVoyu" id="7IysFeA5Lze" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-            <node concept="3nzxsE" id="7IysFeA5Lzf" role="3n$kyP">
-              <node concept="3clFbS" id="7IysFeA5Lzg" role="2VODD2">
-                <node concept="3clFbF" id="7IysFeA5Lzh" role="3cqZAp">
-                  <node concept="3fqX7Q" id="7IysFeA5Lzi" role="3clFbG">
-                    <node concept="2OqwBi" id="7IysFeA5Lzj" role="3fr31v">
-                      <node concept="2OqwBi" id="7IysFeA5Lzk" role="2Oq$k0">
-                        <node concept="pncrf" id="7IysFeA5Lzl" role="2Oq$k0" />
-                        <node concept="2qgKlT" id="7IysFeA5Lzm" role="2OqNvi">
-                          <ref role="37wK5l" to="tpek:i0zv5tb" resolve="getStatementList" />
-                        </node>
-                      </node>
-                      <node concept="2qgKlT" id="7IysFeA5Lzn" role="2OqNvi">
-                        <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="lj46D" id="7IysFeA5Lzo" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-            <node concept="3nzxsE" id="7IysFeA5Lzp" role="3n$kyP">
-              <node concept="3clFbS" id="7IysFeA5Lzq" role="2VODD2">
-                <node concept="3clFbF" id="7IysFeA5Lzr" role="3cqZAp">
-                  <node concept="3fqX7Q" id="7IysFeA5Lzs" role="3clFbG">
-                    <node concept="2OqwBi" id="7IysFeA5Lzt" role="3fr31v">
-                      <node concept="2OqwBi" id="7IysFeA5Lzu" role="2Oq$k0">
-                        <node concept="pncrf" id="7IysFeA5Lzv" role="2Oq$k0" />
-                        <node concept="2qgKlT" id="7IysFeA5Lzw" role="2OqNvi">
-                          <ref role="37wK5l" to="tpek:i0zv5tb" resolve="getStatementList" />
-                        </node>
-                      </node>
-                      <node concept="2qgKlT" id="7IysFeA5Lzx" role="2OqNvi">
-                        <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="ljvvj" id="7IysFeA5Lzy" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-            <node concept="3nzxsE" id="7IysFeA5Lzz" role="3n$kyP">
-              <node concept="3clFbS" id="7IysFeA5Lz$" role="2VODD2">
-                <node concept="3clFbF" id="7IysFeA5Lz_" role="3cqZAp">
-                  <node concept="3fqX7Q" id="7IysFeA5LzA" role="3clFbG">
-                    <node concept="2OqwBi" id="7IysFeA5LzB" role="3fr31v">
-                      <node concept="2OqwBi" id="7IysFeA5LzC" role="2Oq$k0">
-                        <node concept="pncrf" id="7IysFeA5LzD" role="2Oq$k0" />
-                        <node concept="2qgKlT" id="7IysFeA5LzE" role="2OqNvi">
-                          <ref role="37wK5l" to="tpek:i0zv5tb" resolve="getStatementList" />
-                        </node>
-                      </node>
-                      <node concept="2qgKlT" id="7IysFeA5LzF" role="2OqNvi">
-                        <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="l2Vlx" id="7IysFeA5LzG" role="2iSdaV" />
-          <node concept="3F1sOY" id="7IysFeA5LzH" role="3EZMnx">
-            <ref role="1NtTu8" to="wq2x:tIwzd1_VRv" resolve="code" />
-          </node>
-          <node concept="3F0ifn" id="7IysFeA5LzI" role="AHCbl">
-            <property role="3F0ifm" value="{...}" />
-            <ref role="1k5W1q" to="tpen:4vxLnq9T43C" resolve="FoldedCell" />
-          </node>
-        </node>
-      </node>
-      <node concept="3F0ifn" id="7IysFeA5LzJ" role="3EZMnx">
-        <property role="3F0ifm" value="}" />
-        <ref role="1k5W1q" to="tpen:hFD5_7H" resolve="RightBrace" />
-        <node concept="pkWqt" id="7IysFeA5LzK" role="pqm2j">
-          <node concept="3clFbS" id="7IysFeA5LzL" role="2VODD2">
-            <node concept="3clFbF" id="7IysFeA5LzM" role="3cqZAp">
-              <node concept="3fqX7Q" id="7IysFeA5LzN" role="3clFbG">
-                <node concept="2OqwBi" id="7IysFeA5LzO" role="3fr31v">
-                  <node concept="2OqwBi" id="7IysFeA5LzP" role="2Oq$k0">
-                    <node concept="pncrf" id="7IysFeA5LzQ" role="2Oq$k0" />
-                    <node concept="2qgKlT" id="7IysFeA5LzR" role="2OqNvi">
-                      <ref role="37wK5l" to="tpek:i0zv5tb" resolve="getStatementList" />
-                    </node>
-                  </node>
-                  <node concept="2qgKlT" id="7IysFeA5LzS" role="2OqNvi">
-                    <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="lj46D" id="7IysFeA5LzT" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="pVoyu" id="7IysFeA5LzU" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="l2Vlx" id="7IysFeA5LzV" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="7IysFeA99pm">
-    <property role="3GE5qa" value="macro.code" />
-    <ref role="1XX52x" to="wq2x:7IysFeA99oR" resolve="MacroLogicalExpression" />
-    <node concept="3EZMnI" id="7IysFeA99po" role="2wV5jI">
-      <node concept="PMmxH" id="7IysFeA99pp" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" to="qgy9:1iWwVK2B1it" resolve="Logical" />
-        <node concept="Vb9p2" id="7XmdqtdDfDo" role="3F10Kt">
-          <property role="Vbekb" value="g1_kEg4/ITALIC" />
-        </node>
-      </node>
-      <node concept="l2Vlx" id="7IysFeA99pr" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="3TnYLtqfh$h">
-    <property role="3GE5qa" value="macro.code.with" />
-    <ref role="1XX52x" to="wq2x:3TnYLtqfhzx" resolve="ContextParameterDeclaration" />
-    <node concept="3EZMnI" id="3TnYLtqfh$j" role="2wV5jI">
-      <node concept="3F1sOY" id="3TnYLtqfh$x" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:3TnYLtqfhzO" resolve="type" />
-      </node>
-      <node concept="3F0A7n" id="3TnYLtqfh$F" role="3EZMnx">
-        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-      </node>
-      <node concept="l2Vlx" id="3TnYLtqfh$m" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="3TnYLtqfh_m">
-    <property role="3GE5qa" value="macro.code.with" />
-    <ref role="1XX52x" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
-    <node concept="3EZMnI" id="3TnYLtqfh_o" role="2wV5jI">
-      <node concept="1iCGBv" id="3TnYLtqfh_v" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:3TnYLtqfh$T" resolve="parameter" />
-        <node concept="1sVBvm" id="3TnYLtqfh_x" role="1sWHZn">
-          <node concept="3F0A7n" id="3TnYLtqfh_C" role="2wV5jI">
-            <property role="1Intyy" value="true" />
-            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-          </node>
-        </node>
-      </node>
-      <node concept="3F0ifn" id="6hqFpWmO6yq" role="3EZMnx">
-        <property role="3F0ifm" value="from context" />
-        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
-      </node>
-      <node concept="l2Vlx" id="3TnYLtqfh_r" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="3TnYLtqgQZv">
-    <property role="3GE5qa" value="macro.code.with" />
-    <ref role="1XX52x" to="wq2x:3TnYLtqgQYU" resolve="WithContextStatement" />
-    <node concept="3EZMnI" id="3TnYLtqgQZx" role="2wV5jI">
-      <node concept="l2Vlx" id="3TnYLtqgQZ$" role="2iSdaV" />
-      <node concept="PMmxH" id="3TnYLtqgQZH" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
-        <node concept="VPxyj" id="3TnYLtqhLap" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="3TnYLtqgQZM" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-        <ref role="1k5W1q" to="tpen:hFCSAw$" resolve="LeftParen" />
-      </node>
-      <node concept="1iCGBv" id="3TnYLtqgRYv" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:3TnYLtqgRY3" resolve="parameter" />
-        <node concept="1sVBvm" id="3TnYLtqgRYx" role="1sWHZn">
-          <node concept="3F0A7n" id="3TnYLtqgRYN" role="2wV5jI">
-            <property role="1Intyy" value="true" />
-            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-          </node>
-        </node>
-      </node>
-      <node concept="3F0ifn" id="3TnYLtqgR7G" role="3EZMnx">
-        <property role="3F0ifm" value="=" />
-      </node>
-      <node concept="3F1sOY" id="3TnYLtqgR8k" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:3TnYLtqgQZ0" resolve="init" />
-      </node>
-      <node concept="3F0ifn" id="3TnYLtqgQZU" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
-      </node>
-      <node concept="3F0ifn" id="3TnYLtqgR0i" role="3EZMnx">
-        <property role="3F0ifm" value="{" />
-        <ref role="1k5W1q" to="tpen:hFD5onb" resolve="LeftBrace" />
-        <node concept="ljvvj" id="3TnYLtqhL6t" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="ljvvj" id="3TnYLtqhL8g" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F1sOY" id="3TnYLtqgR0_" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:3TnYLtqgQYV" resolve="body" />
-        <node concept="lj46D" id="3TnYLtqgR3d" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="3TnYLtqgR3E" role="3EZMnx">
-        <property role="3F0ifm" value="}" />
-        <ref role="1k5W1q" to="tpen:hFD5_7H" resolve="RightBrace" />
-        <node concept="pVoyu" id="3TnYLtqgR77" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="24kQdi" id="1L74NXEmFKo">
-    <property role="3GE5qa" value="macro.invoke" />
-    <ref role="1XX52x" to="wq2x:1L74NXEmFJU" resolve="MacroArgumentList" />
-    <node concept="3EZMnI" id="1L74NXEmFMy" role="2wV5jI">
-      <node concept="3F2HdR" id="1L74NXEmFY1" role="3EZMnx">
-        <property role="2czwfO" value="," />
-        <property role="Q2I2d" value="g$1Qtxb/punctuation" />
-        <ref role="1NtTu8" to="wq2x:1L74NXEmFJV" resolve="binding" />
-        <node concept="l2Vlx" id="1L74NXEmFY2" role="2czzBx" />
-        <node concept="3F0ifn" id="1L74NXEmFY3" role="2czzBI">
-          <property role="3F0ifm" value="" />
-        </node>
-      </node>
-      <node concept="l2Vlx" id="1L74NXEmFM_" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="1L74NXEmHyT">
-    <property role="3GE5qa" value="macro.invoke" />
-    <ref role="1XX52x" to="wq2x:1L74NXEmF9s" resolve="MacroParameterBinding" />
-    <node concept="3EZMnI" id="1L74NXEmHyV" role="2wV5jI">
-      <node concept="3EZMnI" id="1L74NXGKmQR" role="3EZMnx">
-        <node concept="VPM3Z" id="1L74NXGKmQT" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3vyZuw" id="6p0DfM0hLg7" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="1Bsynf" id="6p0DfM0hLga" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="1Bt7hp" id="6p0DfM0hLgb" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="1iCGBv" id="1L74NXEmHyW" role="3EZMnx">
-          <ref role="1NtTu8" to="wq2x:1L74NXEmG0t" resolve="parameter" />
-          <node concept="1sVBvm" id="1L74NXEmHyX" role="1sWHZn">
-            <node concept="3F0A7n" id="1L74NXEmHyY" role="2wV5jI">
-              <property role="1Intyy" value="true" />
-              <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-              <ref role="1k5W1q" to="tpen:hshQ_OE" resolve="Field" />
-            </node>
-          </node>
-        </node>
-        <node concept="3F0ifn" id="1L74NXEmHyZ" role="3EZMnx">
-          <property role="3F0ifm" value="=" />
-          <node concept="11L4FC" id="1L74NXEmHz0" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="11LMrY" id="1L74NXEmHz1" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="3F1sOY" id="1L74NXGK7zP" role="3EZMnx">
-          <ref role="1NtTu8" to="wq2x:1L74NXGK1G1" resolve="code" />
-        </node>
-        <node concept="l2Vlx" id="1L74NXGKmQW" role="2iSdaV" />
-      </node>
-      <node concept="l2Vlx" id="1L74NXEmHz3" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="3ICXOK" id="4hPXq9JmegX">
     <property role="TrG5h" value="Head_keep_discard" />
     <property role="3GE5qa" value="rule.component" />
@@ -2992,84 +2430,6 @@
       </node>
     </node>
   </node>
-  <node concept="3p309x" id="4hPXq9JmenD">
-    <property role="TrG5h" value="Expression_Contribution" />
-    <node concept="2kknPJ" id="4hPXq9JmenE" role="1IG6uw">
-      <ref role="2ZyFGn" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-    <node concept="1s_PAr" id="4hPXq9Jmesz" role="3ft7WO">
-      <node concept="2kknPI" id="4hPXq9Jmes$" role="1s_PAo">
-        <ref role="2kkw0f" node="4hPXq9JmerR" resolve="MacroLogical_Expression" />
-      </node>
-    </node>
-    <node concept="1s_PAr" id="4hPXq9Jmeth" role="3ft7WO">
-      <node concept="2kknPI" id="4hPXq9Jmeti" role="1s_PAo">
-        <ref role="2kkw0f" node="4hPXq9Jmes_" resolve="MacroDeclaration_parameter" />
-      </node>
-    </node>
-  </node>
-  <node concept="Q6S24" id="4hPXq9JmerR">
-    <property role="TrG5h" value="MacroLogical_Expression" />
-    <property role="3GE5qa" value="macro" />
-    <ref role="aqKnT" to="tpee:fz3vP1J" resolve="Expression" />
-    <node concept="3ft6gV" id="4hPXq9JmerT" role="3ft7WO">
-      <node concept="3ft6gW" id="4hPXq9JmerU" role="3ft5RY">
-        <node concept="3clFbS" id="4hPXq9JmerV" role="2VODD2">
-          <node concept="3clFbF" id="4hPXq9JmerW" role="3cqZAp">
-            <node concept="2OqwBi" id="4hPXq9JmerX" role="3clFbG">
-              <node concept="2OqwBi" id="4hPXq9JmerY" role="2Oq$k0">
-                <node concept="3bvxqY" id="4hPXq9Jmes5" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="4hPXq9Jmes0" role="2OqNvi">
-                  <node concept="1xMEDy" id="4hPXq9Jmes1" role="1xVPHs">
-                    <node concept="chp4Y" id="4hPXq9Jmes2" role="ri$Ld">
-                      <ref role="cht4Q" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
-                    </node>
-                  </node>
-                  <node concept="1xIGOp" id="4hPXq9Jmes3" role="1xVPHs" />
-                </node>
-              </node>
-              <node concept="3x8VRR" id="4hPXq9Jmes4" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3ft5Ry" id="4hPXq9Jmesw" role="3ft5RZ">
-        <ref role="4PJHt" to="wq2x:7IysFeA99oR" resolve="MacroLogicalExpression" />
-      </node>
-    </node>
-  </node>
-  <node concept="Q6S24" id="4hPXq9Jmes_">
-    <property role="TrG5h" value="MacroDeclaration_parameter" />
-    <property role="3GE5qa" value="macro" />
-    <ref role="aqKnT" to="tpee:fz3vP1J" resolve="Expression" />
-    <node concept="3ft6gV" id="4hPXq9JmesB" role="3ft7WO">
-      <node concept="3ft6gW" id="4hPXq9JmesC" role="3ft5RY">
-        <node concept="3clFbS" id="4hPXq9JmesD" role="2VODD2">
-          <node concept="3clFbF" id="4hPXq9JmesE" role="3cqZAp">
-            <node concept="2OqwBi" id="4hPXq9JmesF" role="3clFbG">
-              <node concept="2OqwBi" id="4hPXq9JmesG" role="2Oq$k0">
-                <node concept="3bvxqY" id="4hPXq9JmesN" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="4hPXq9JmesI" role="2OqNvi">
-                  <node concept="1xMEDy" id="4hPXq9JmesJ" role="1xVPHs">
-                    <node concept="chp4Y" id="4hPXq9JmesK" role="ri$Ld">
-                      <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
-                    </node>
-                  </node>
-                  <node concept="1xIGOp" id="4hPXq9JmesL" role="1xVPHs" />
-                </node>
-              </node>
-              <node concept="3x8VRR" id="4hPXq9JmesM" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1s_PAr" id="3yBNtx8$qrr" role="3ft5RZ">
-        <node concept="2kknPI" id="3yBNtx8$qrs" role="1s_PAo">
-          <ref role="2kkw0f" node="3yBNtx8$qnP" resolve="MacroParameterReference_SmartReference" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="3p309x" id="4hPXq9Jmetj">
     <property role="TrG5h" value="Statement_Contribution" />
     <node concept="2kknPJ" id="4hPXq9Jmetk" role="1IG6uw">
@@ -3150,85 +2510,6 @@
       </node>
     </node>
   </node>
-  <node concept="3p36aQ" id="4hPXq9JmeBh">
-    <property role="3GE5qa" value="macro" />
-    <ref role="aqKnT" to="wq2x:7IysFeA99oR" resolve="MacroLogicalExpression" />
-  </node>
-  <node concept="3p36aQ" id="4hPXq9JmeBi">
-    <property role="3GE5qa" value="macro" />
-    <ref role="aqKnT" to="wq2x:7IysFeA1uPa" resolve="MacroParameterReference" />
-  </node>
-  <node concept="3p36aQ" id="4hPXq9JmeBm">
-    <ref role="aqKnT" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
-    <node concept="3XHNnq" id="6hqFpWmNvFW" role="3ft7WO">
-      <ref role="3XGfJA" to="wq2x:3TnYLtqfh$T" resolve="parameter" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="4MEOIDFfpTe">
-    <property role="3GE5qa" value="constraint.typespecific" />
-    <ref role="1XX52x" to="wq2x:4MEOIDFfpSk" resolve="CallMacroPseudoConstraint" />
-    <node concept="3EZMnI" id="4MEOIDFfpTg" role="2wV5jI">
-      <node concept="3F1sOY" id="4MEOIDFfpTn" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:4MEOIDFfpT9" resolve="logical" />
-      </node>
-      <node concept="3F0ifn" id="4MEOIDFfpTt" role="3EZMnx">
-        <property role="3F0ifm" value=":=" />
-        <ref role="1k5W1q" to="tpen:hF$iUjy" resolve="Operator" />
-      </node>
-      <node concept="PMmxH" id="6DOfTm$5ikq" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
-      </node>
-      <node concept="1iCGBv" id="5hSMZ_lpX5n" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:5hSMZ_lpUoi" resolve="declaration" />
-        <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
-        <node concept="1sVBvm" id="5hSMZ_lpX5p" role="1sWHZn">
-          <node concept="3F0A7n" id="5hSMZ_lpX5$" role="2wV5jI">
-            <property role="1Intyy" value="true" />
-            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-          </node>
-        </node>
-        <node concept="Vb9p2" id="6DOfTm$8sUZ" role="3F10Kt">
-          <property role="Vbekb" value="g1_tSyq/BOLD_ITALIC" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="5hSMZ_lrdys" role="3EZMnx">
-        <property role="3F0ifm" value="&lt;" />
-        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
-        <node concept="11LMrY" id="5hSMZ_lrdyu" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="3Xmtl4" id="6DOfTm$83po" role="3F10Kt">
-          <node concept="1wgc9g" id="6DOfTm$8sJu" role="3XvnJa">
-            <ref role="1wgcnl" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
-          </node>
-        </node>
-      </node>
-      <node concept="3F1sOY" id="5hSMZ_lrdyv" role="3EZMnx">
-        <property role="2ru_X1" value="true" />
-        <ref role="1NtTu8" to="wq2x:5hSMZ_lrcKO" resolve="argument" />
-        <node concept="3nxI2P" id="5hSMZ_lrdyw" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="3F0ifn" id="4bWqD4Chtoh" role="2ruayu">
-          <property role="3F0ifm" value="" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="5hSMZ_lrdyy" role="3EZMnx">
-        <property role="3F0ifm" value="&gt;" />
-        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
-        <node concept="11L4FC" id="5hSMZ_lrdyz" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="3Xmtl4" id="6DOfTm$83p_" role="3F10Kt">
-          <node concept="1wgc9g" id="6DOfTm$8sJx" role="3XvnJa">
-            <ref role="1wgcnl" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
-          </node>
-        </node>
-      </node>
-      <node concept="l2Vlx" id="4MEOIDFfpTj" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="20Ay2VefOqG">
     <property role="3GE5qa" value="rule.clause" />
     <ref role="1XX52x" to="wq2x:20Ay2VefOqC" resolve="LogicalClauseList" />
@@ -3478,155 +2759,6 @@
       </node>
     </node>
   </node>
-  <node concept="IW6AY" id="7XmdqtdBbWm">
-    <property role="3GE5qa" value="macro.decl" />
-    <ref role="aqKnT" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
-    <node concept="1Qtc8_" id="7XmdqtdBbWt" role="IW6Ez">
-      <node concept="IWgqT" id="7XmdqtdBcyH" role="1Qtc8A">
-        <node concept="1hCUdq" id="7XmdqtdBcyJ" role="1hCUd6">
-          <node concept="3clFbS" id="7XmdqtdBcyL" role="2VODD2">
-            <node concept="3clFbF" id="7XmdqtdBcFu" role="3cqZAp">
-              <node concept="Xl_RD" id="7XmdqtdBcFt" role="3clFbG">
-                <property role="Xl_RC" value="&lt;" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="IWg2L" id="7XmdqtdBcyN" role="IWgqQ">
-          <node concept="3clFbS" id="7XmdqtdBcyP" role="2VODD2">
-            <node concept="3clFbF" id="7XmdqtdBjdA" role="3cqZAp">
-              <node concept="2OqwBi" id="7XmdqtdBmUm" role="3clFbG">
-                <node concept="2OqwBi" id="7XmdqtdBjla" role="2Oq$k0">
-                  <node concept="7Obwk" id="7XmdqtdBjd_" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="7XmdqtdBjAX" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:7IysFe_ZPXE" resolve="parameter" />
-                  </node>
-                </node>
-                <node concept="2DeJg1" id="7XmdqtdBq7M" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="27VH4U" id="7XmdqtdBcWz" role="2jiSrf">
-          <node concept="3clFbS" id="7XmdqtdBcW$" role="2VODD2">
-            <node concept="3clFbF" id="7XmdqtdBd3R" role="3cqZAp">
-              <node concept="2OqwBi" id="7XmdqtdBfJ8" role="3clFbG">
-                <node concept="2OqwBi" id="7XmdqtdBdgO" role="2Oq$k0">
-                  <node concept="7Obwk" id="7XmdqtdBd3Q" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="7XmdqtdBdDA" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:7IysFe_ZPXE" resolve="parameter" />
-                  </node>
-                </node>
-                <node concept="1v1jN8" id="7XmdqtdBj3$" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3cWJ9i" id="7XmdqtdBcyx" role="1Qtc8$">
-        <node concept="CtIbL" id="7XmdqtdBcyz" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="Q6S24" id="3yBNtx8$qnP">
-    <property role="TrG5h" value="MacroParameterReference_SmartReference" />
-    <property role="3GE5qa" value="macro.decl" />
-    <ref role="aqKnT" to="wq2x:7IysFeA1uPa" resolve="MacroParameterReference" />
-    <node concept="3XHNnq" id="3yBNtx8$qnO" role="3ft7WO">
-      <ref role="3XGfJA" to="wq2x:7IysFeA1uTj" resolve="parameter" />
-    </node>
-    <node concept="382kZG" id="3yBNtx8$qnQ" role="lGtFl" />
-  </node>
-  <node concept="24kQdi" id="6hqFpWmM97Z">
-    <property role="3GE5qa" value="macro.code.with" />
-    <ref role="1XX52x" to="wq2x:6hqFpWmM6I9" resolve="ContextParameterContainer" />
-    <node concept="3EZMnI" id="6hqFpWmM98y" role="2wV5jI">
-      <node concept="PMmxH" id="6hqFpWmM98G" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      </node>
-      <node concept="3F0A7n" id="6hqFpWmM98P" role="3EZMnx">
-        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-      </node>
-      <node concept="3EZMnI" id="6hqFpWmM98X" role="3EZMnx">
-        <node concept="VPM3Z" id="6hqFpWmM98Z" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F2HdR" id="6hqFpWmM99a" role="3EZMnx">
-          <ref role="1NtTu8" to="wq2x:6hqFpWmM98w" resolve="parameter" />
-          <node concept="l2Vlx" id="6hqFpWmM99c" role="2czzBx" />
-          <node concept="2o9xnK" id="6hqFpWmM99h" role="2gpyvW">
-            <node concept="3clFbS" id="6hqFpWmM99i" role="2VODD2">
-              <node concept="3clFbF" id="6hqFpWmM9hJ" role="3cqZAp">
-                <node concept="Xl_RD" id="6hqFpWmM9hI" role="3clFbG">
-                  <property role="Xl_RC" value="" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="tppnM" id="6hqFpWmM9yC" role="sWeuL">
-            <node concept="ljvvj" id="6hqFpWmM9AT" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-          </node>
-          <node concept="lj46D" id="6hqFpWmM9B6" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="pVoyu" id="6hqFpWmM9AV" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="l2Vlx" id="6hqFpWmM992" role="2iSdaV" />
-      </node>
-      <node concept="l2Vlx" id="6hqFpWmM98_" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="7smgEqggf15">
-    <ref role="1XX52x" to="wq2x:7smgEqggf12" resolve="NodeAnchor" />
-    <node concept="3EZMnI" id="7smgEqggf17" role="2wV5jI">
-      <node concept="3F0ifn" id="7smgEqggf1e" role="3EZMnx">
-        <property role="3F0ifm" value="@" />
-        <node concept="11LMrY" id="7smgEqggf1o" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F1sOY" id="7smgEqggf1k" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:7smgEqggf13" resolve="node" />
-      </node>
-      <node concept="l2Vlx" id="7smgEqggf1a" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="6DOfTm$zRmy">
-    <property role="3GE5qa" value="macro.decl" />
-    <ref role="1XX52x" to="wq2x:6DOfTm$zRmf" resolve="MacroInputDeclaration" />
-    <node concept="3EZMnI" id="6DOfTm$zRm$" role="2wV5jI">
-      <node concept="3F1sOY" id="6DOfTm$zWc6" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:6DOfTm$zVok" resolve="type" />
-      </node>
-      <node concept="3F0A7n" id="6DOfTm$zRm_" role="3EZMnx">
-        <ref role="1k5W1q" node="7ksQUDZqpsE" resolve="InputName" />
-        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-      </node>
-      <node concept="l2Vlx" id="6DOfTm$zRmA" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="6DOfTm$$CHm">
-    <property role="3GE5qa" value="macro.code" />
-    <ref role="1XX52x" to="wq2x:6DOfTm$$CHj" resolve="MacroInputReference" />
-    <node concept="3EZMnI" id="6DOfTm$$CHo" role="2wV5jI">
-      <node concept="1iCGBv" id="6DOfTm$$CHv" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:6DOfTm$$CHk" resolve="declaration" />
-        <node concept="1sVBvm" id="6DOfTm$$CHx" role="1sWHZn">
-          <node concept="3F0A7n" id="6DOfTm$$CHC" role="2wV5jI">
-            <property role="1Intyy" value="true" />
-            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-          </node>
-        </node>
-      </node>
-      <node concept="l2Vlx" id="6DOfTm$$CHr" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="IW6AY" id="5f6wxQ38FK1">
     <property role="3GE5qa" value="constraint.template" />
     <ref role="aqKnT" to="wq2x:1CgWc1TyPXm" resolve="ConstraintParameterDeclaration" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
index 24147991..df03ce8f 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
@@ -4411,115 +4411,6 @@
           </node>
         </node>
         <node concept="3clFbJ" id="5VJ3UjCgwBb" role="3cqZAp">
-          <node concept="2OqwBi" id="5VJ3UjCgwTA" role="3clFbw">
-            <node concept="37vLTw" id="5VJ3UjCgwDb" role="2Oq$k0">
-              <ref role="3cqZAo" node="5VJ3UjCfF2V" resolve="macroUsage" />
-            </node>
-            <node concept="1mIQ4w" id="5VJ3UjCgx83" role="2OqNvi">
-              <node concept="chp4Y" id="5VJ3UjChml4" role="cj9EA">
-                <ref role="cht4Q" to="wq2x:4MEOIDFfpSk" resolve="CallMacroPseudoConstraint" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbS" id="5VJ3UjCgwBd" role="3clFbx">
-            <node concept="3clFbF" id="7qe1GumJVdx" role="3cqZAp">
-              <node concept="1rXfSq" id="7qe1GumJVdw" role="3clFbG">
-                <ref role="37wK5l" node="7qe1GumJo4T" resolve="markAffected" />
-                <node concept="2OqwBi" id="5VJ3UjChGpy" role="37wK5m">
-                  <node concept="1PxgMI" id="5VJ3UjChBz2" role="2Oq$k0">
-                    <property role="1BlNFB" value="true" />
-                    <node concept="chp4Y" id="5VJ3UjChDjP" role="3oSUPX">
-                      <ref role="cht4Q" to="wq2x:4MEOIDFfpSk" resolve="CallMacroPseudoConstraint" />
-                    </node>
-                    <node concept="37vLTw" id="5VJ3UjChvH8" role="1m5AlR">
-                      <ref role="3cqZAo" node="5VJ3UjCfF2V" resolve="macroUsage" />
-                    </node>
-                  </node>
-                  <node concept="3TrEf2" id="5VJ3UjChIOL" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:4MEOIDFfpT9" resolve="logical" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="1ALxU7rj0US" role="3cqZAp" />
-          </node>
-          <node concept="3eNFk2" id="5VJ3UjChmrP" role="3eNLev">
-            <node concept="3clFbS" id="5VJ3UjChmrR" role="3eOfB_">
-              <node concept="3clFbF" id="7qe1GumJZRB" role="3cqZAp">
-                <node concept="1rXfSq" id="7qe1GumJZRC" role="3clFbG">
-                  <ref role="37wK5l" node="7qe1GumJo4T" resolve="markAffected" />
-                  <node concept="2OqwBi" id="7qe1GumJZRD" role="37wK5m">
-                    <node concept="1PxgMI" id="7qe1GumJZRE" role="2Oq$k0">
-                      <property role="1BlNFB" value="true" />
-                      <node concept="chp4Y" id="7qe1GumK3kX" role="3oSUPX">
-                        <ref role="cht4Q" to="wq2x:18kNIl0jL2T" resolve="ExpandPseudoConstraint" />
-                      </node>
-                      <node concept="37vLTw" id="7qe1GumJZRG" role="1m5AlR">
-                        <ref role="3cqZAo" node="5VJ3UjCfF2V" resolve="macroUsage" />
-                      </node>
-                    </node>
-                    <node concept="3TrEf2" id="7qe1GumNcjB" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:18kNIl0jL_z" resolve="logical" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="1ALxU7rj0Sc" role="3cqZAp" />
-            </node>
-            <node concept="2OqwBi" id="5VJ3UjChmxV" role="3eO9$A">
-              <node concept="37vLTw" id="5VJ3UjChmxW" role="2Oq$k0">
-                <ref role="3cqZAo" node="5VJ3UjCfF2V" resolve="macroUsage" />
-              </node>
-              <node concept="1mIQ4w" id="5VJ3UjChmxX" role="2OqNvi">
-                <node concept="chp4Y" id="5VJ3UjChmCo" role="cj9EA">
-                  <ref role="cht4Q" to="wq2x:18kNIl0jL2T" resolve="ExpandPseudoConstraint" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3eNFk2" id="1ALxU7rj0C_" role="3eNLev">
-            <node concept="2OqwBi" id="1ALxU7rj4da" role="3eO9$A">
-              <node concept="37vLTw" id="1ALxU7rj3BH" role="2Oq$k0">
-                <ref role="3cqZAo" node="5VJ3UjCfF2V" resolve="macroUsage" />
-              </node>
-              <node concept="1mIQ4w" id="1ALxU7rj4MU" role="2OqNvi">
-                <node concept="chp4Y" id="1ALxU7rj4Su" role="cj9EA">
-                  <ref role="cht4Q" to="wq2x:5itBwM7LtBf" resolve="CallMacroConstraint" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbS" id="1ALxU7rj0CB" role="3eOfB_">
-              <node concept="2Gpval" id="1ALxU7rjauj" role="3cqZAp">
-                <node concept="3clFbS" id="1ALxU7rj8Ab" role="2LFqv$">
-                  <node concept="3clFbF" id="1ALxU7rj4YX" role="3cqZAp">
-                    <node concept="1rXfSq" id="1ALxU7rj4YY" role="3clFbG">
-                      <ref role="37wK5l" node="7qe1GumJo4T" resolve="markAffected" />
-                      <node concept="2GrUjf" id="1ALxU7rjbDi" role="37wK5m">
-                        <ref role="2Gs0qQ" node="1ALxU7rjauV" resolve="log" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="1ALxU7rj8Ah" role="2GsD0m">
-                  <node concept="1PxgMI" id="1ALxU7rj8Ai" role="2Oq$k0">
-                    <property role="1BlNFB" value="true" />
-                    <node concept="chp4Y" id="1ALxU7rj8Aj" role="3oSUPX">
-                      <ref role="cht4Q" to="wq2x:5itBwM7LtBf" resolve="CallMacroConstraint" />
-                    </node>
-                    <node concept="37vLTw" id="1ALxU7rj8Ak" role="1m5AlR">
-                      <ref role="3cqZAo" node="5VJ3UjCfF2V" resolve="macroUsage" />
-                    </node>
-                  </node>
-                  <node concept="3Tsc0h" id="1ALxU7rj8Al" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:5itBwM7Lv0S" resolve="logical" />
-                  </node>
-                </node>
-                <node concept="2GrKxI" id="1ALxU7rjauV" role="2Gsz3X">
-                  <property role="TrG5h" value="log" />
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="3eNFk2" id="1ALxU7rjc9E" role="3eNLev">
             <node concept="2OqwBi" id="1ALxU7rjc9F" role="3eO9$A">
               <node concept="37vLTw" id="1ALxU7rjc9G" role="2Oq$k0">
@@ -4563,6 +4454,47 @@
               </node>
             </node>
           </node>
+          <node concept="2OqwBi" id="1ALxU7rj4da" role="3clFbw">
+            <node concept="37vLTw" id="1ALxU7rj3BH" role="2Oq$k0">
+              <ref role="3cqZAo" node="5VJ3UjCfF2V" resolve="macroUsage" />
+            </node>
+            <node concept="1mIQ4w" id="1ALxU7rj4MU" role="2OqNvi">
+              <node concept="chp4Y" id="1ALxU7rj4Su" role="cj9EA">
+                <ref role="cht4Q" to="wq2x:5itBwM7LtBf" resolve="CallMacroConstraint" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbS" id="1ALxU7rj0CB" role="3clFbx">
+            <node concept="2Gpval" id="1ALxU7rjauj" role="3cqZAp">
+              <node concept="3clFbS" id="1ALxU7rj8Ab" role="2LFqv$">
+                <node concept="3clFbF" id="1ALxU7rj4YX" role="3cqZAp">
+                  <node concept="1rXfSq" id="1ALxU7rj4YY" role="3clFbG">
+                    <ref role="37wK5l" node="7qe1GumJo4T" resolve="markAffected" />
+                    <node concept="2GrUjf" id="1ALxU7rjbDi" role="37wK5m">
+                      <ref role="2Gs0qQ" node="1ALxU7rjauV" resolve="log" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="1ALxU7rj8Ah" role="2GsD0m">
+                <node concept="1PxgMI" id="1ALxU7rj8Ai" role="2Oq$k0">
+                  <property role="1BlNFB" value="true" />
+                  <node concept="chp4Y" id="1ALxU7rj8Aj" role="3oSUPX">
+                    <ref role="cht4Q" to="wq2x:5itBwM7LtBf" resolve="CallMacroConstraint" />
+                  </node>
+                  <node concept="37vLTw" id="1ALxU7rj8Ak" role="1m5AlR">
+                    <ref role="3cqZAo" node="5VJ3UjCfF2V" resolve="macroUsage" />
+                  </node>
+                </node>
+                <node concept="3Tsc0h" id="1ALxU7rj8Al" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:5itBwM7Lv0S" resolve="logical" />
+                </node>
+              </node>
+              <node concept="2GrKxI" id="1ALxU7rjauV" role="2Gsz3X">
+                <property role="TrG5h" value="log" />
+              </node>
+            </node>
+          </node>
         </node>
       </node>
       <node concept="3Tmbuc" id="1RMe_qTeMSl" role="1B3o_S" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
index b10e96d0..5c561449 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
@@ -181,9 +181,6 @@
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
-      <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC">
-        <reference id="1139880128956" name="concept" index="1A9B2P" />
-      </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -1188,7 +1185,6 @@
     <node concept="2tJIrI" id="5yr01fCxE86" role="jymVt" />
     <node concept="3tYpMH" id="5yr01fCxE87" role="jymVt">
       <property role="TrG5h" value="isRerunnable" />
-      <property role="3tYpME" value="true" />
       <ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
       <node concept="3Tm1VV" id="5yr01fCxE88" role="1B3o_S" />
       <node concept="10P_77" id="5yr01fCxE89" role="1tU5fm" />
@@ -1205,103 +1201,10 @@
       <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
       <node concept="3Tm1VV" id="5yr01fCxE8d" role="1B3o_S" />
       <node concept="3clFbS" id="5yr01fCxE8f" role="3clF47">
-        <node concept="L3pyB" id="5yr01fCxFxN" role="3cqZAp">
-          <node concept="3clFbS" id="5yr01fCxFxO" role="L3pyw">
-            <node concept="3clFbF" id="5yr01fCxFGU" role="3cqZAp">
-              <node concept="2OqwBi" id="5yr01fCxGrb" role="3clFbG">
-                <node concept="qVDSY" id="5yr01fCxFGS" role="2Oq$k0">
-                  <node concept="chp4Y" id="5yr01fCxFPW" role="qVDSX">
-                    <ref role="cht4Q" to="wq2x:7smgEqggf12" resolve="NodeAnchor" />
-                  </node>
-                  <node concept="1dO9Bo" id="5yr01fCxFJJ" role="1dOa5D">
-                    <node concept="3Z_Q4n" id="5yr01fCxFMx" role="1dp2q7" />
-                  </node>
-                </node>
-                <node concept="2es0OD" id="5yr01fCxH4P" role="2OqNvi">
-                  <node concept="1bVj0M" id="5yr01fCxH4R" role="23t8la">
-                    <node concept="3clFbS" id="5yr01fCxH4S" role="1bW5cS">
-                      <node concept="3clFbH" id="5yr01fCxHcG" role="3cqZAp" />
-                      <node concept="3cpWs8" id="5yr01fCxHSx" role="3cqZAp">
-                        <node concept="3cpWsn" id="5yr01fCxHSy" role="3cpWs9">
-                          <property role="TrG5h" value="n" />
-                          <node concept="3Tqbb2" id="5yr01fCxHQC" role="1tU5fm">
-                            <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
-                          </node>
-                          <node concept="2OqwBi" id="5yr01fCxHSz" role="33vP2m">
-                            <node concept="37vLTw" id="5yr01fCxHS$" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5yr01fCxH4T" resolve="na" />
-                            </node>
-                            <node concept="3TrEf2" id="5yr01fCxHS_" role="2OqNvi">
-                              <ref role="3Tt5mk" to="wq2x:7smgEqggf13" resolve="node" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3cpWs8" id="5yr01fCxI_s" role="3cqZAp">
-                        <node concept="3cpWsn" id="5yr01fCxI_t" role="3cpWs9">
-                          <property role="TrG5h" value="de" />
-                          <node concept="3Tqbb2" id="5yr01fCxIxM" role="1tU5fm">
-                            <ref role="ehGHo" to="tpee:hqOqwz4" resolve="DotExpression" />
-                          </node>
-                          <node concept="2OqwBi" id="5yr01fCxI_u" role="33vP2m">
-                            <node concept="37vLTw" id="5yr01fCxI_v" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5yr01fCxH4T" resolve="na" />
-                            </node>
-                            <node concept="1_qnLN" id="5yr01fCxI_w" role="2OqNvi">
-                              <ref role="1_rbq0" to="tpee:hqOqwz4" resolve="DotExpression" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="5yr01fCxJO3" role="3cqZAp" />
-                      <node concept="3clFbF" id="5yr01fCxIax" role="3cqZAp">
-                        <node concept="2OqwBi" id="5yr01fCxJmp" role="3clFbG">
-                          <node concept="2OqwBi" id="5yr01fCxIQw" role="2Oq$k0">
-                            <node concept="37vLTw" id="5yr01fCxI_x" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5yr01fCxI_t" resolve="de" />
-                            </node>
-                            <node concept="3TrEf2" id="5yr01fCxJa4" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                            </node>
-                          </node>
-                          <node concept="2oxUTD" id="5yr01fCxJD1" role="2OqNvi">
-                            <node concept="2OqwBi" id="5yr01fCxLku" role="2oxUTC">
-                              <node concept="37vLTw" id="5yr01fCxJJB" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5yr01fCxHSy" resolve="n" />
-                              </node>
-                              <node concept="3YRAZt" id="5yr01fCxLCr" role="2OqNvi" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="5yr01fCxJWh" role="3cqZAp">
-                        <node concept="2OqwBi" id="5yr01fCxKEn" role="3clFbG">
-                          <node concept="2OqwBi" id="5yr01fCxK7E" role="2Oq$k0">
-                            <node concept="37vLTw" id="5yr01fCxJWf" role="2Oq$k0">
-                              <ref role="3cqZAo" node="5yr01fCxI_t" resolve="de" />
-                            </node>
-                            <node concept="3TrEf2" id="5yr01fCxKur" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                            </node>
-                          </node>
-                          <node concept="zfrQC" id="5yr01fCxKVR" role="2OqNvi">
-                            <ref role="1A9B2P" to="tp25:4o40NPkYE0z" resolve="Node_PointerOperation" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="5yr01fCxHgp" role="3cqZAp" />
-                    </node>
-                    <node concept="Rh6nW" id="5yr01fCxH4T" role="1bW2Oz">
-                      <property role="TrG5h" value="na" />
-                      <node concept="2jxLKc" id="5yr01fCxH4U" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="5yr01fCxFzH" role="L3pyr">
-            <ref role="3cqZAo" node="5yr01fCxE8h" resolve="m" />
+        <node concept="RRSsy" id="631nQp400EH" role="3cqZAp">
+          <property role="RRSoG" value="gZ5fh_4/error" />
+          <node concept="Xl_RD" id="631nQp400EI" role="RRSoy">
+            <property role="Xl_RC" value="Migration has been truncated, please downgrade. (ReplaceEqWithUni)" />
           </node>
         </node>
       </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 87308c8f..806f4a27 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -468,50 +468,6 @@
       <ref role="PrY4T" node="1CgWc1Tyjkz" resolve="Commentable" />
     </node>
   </node>
-  <node concept="1TIwiD" id="1pPth$m5Bbz">
-    <property role="3GE5qa" value="macro.decl" />
-    <property role="TrG5h" value="MacroDeclaration" />
-    <property role="EcuMT" value="1618328391714763491" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="6DOfTm$zUE3" role="1TKVEi">
-      <property role="IQ2ns" value="7670825977262353027" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="input" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="6DOfTm$zRmf" resolve="MacroInputDeclaration" />
-    </node>
-    <node concept="1TJgyj" id="7IysFeA0yca" role="1TKVEi">
-      <property role="IQ2ns" value="8908809128802132746" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="7IysFeA0yb0" resolve="MacroParameterDeclaration" />
-    </node>
-    <node concept="1TJgyj" id="7IysFe_ZQc2" role="1TKVEi">
-      <property role="IQ2ns" value="8908809128801952514" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="body" />
-      <ref role="20lvS9" node="7IysFe_ZPX_" resolve="MacroBody" />
-    </node>
-    <node concept="PrWs8" id="5itBwM56QHJ" role="PzmwI">
-      <ref role="PrY4T" node="5itBwM56wgT" resolve="MacroTemplate" />
-    </node>
-    <node concept="PrWs8" id="1pPth$m5Bb$" role="PzmwI">
-      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
-    </node>
-    <node concept="PrWs8" id="7IysFeBd3kM" role="PzmwI">
-      <ref role="PrY4T" node="7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-    </node>
-    <node concept="PrWs8" id="3AWu6Emeo$c" role="PzmwI">
-      <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
-    </node>
-    <node concept="PrWs8" id="b5g$pBzjW6" role="PzmwI">
-      <ref role="PrY4T" node="1CgWc1Tyjkz" resolve="Commentable" />
-    </node>
-    <node concept="PrWs8" id="5itBwMaaWLe" role="PzmwI">
-      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="PB1R3Y7Ed7">
     <property role="3GE5qa" value="constraint.variable" />
     <property role="TrG5h" value="RulePartParameterDeclaration" />
@@ -544,28 +500,6 @@
       <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
     </node>
   </node>
-  <node concept="1TIwiD" id="18kNIl0jL2T">
-    <property role="EcuMT" value="1302893676238672057" />
-    <property role="3GE5qa" value="constraint.typespecific" />
-    <property role="TrG5h" value="ExpandPseudoConstraint" />
-    <property role="34LRSv" value="expand" />
-    <ref role="1TJDcQ" node="18kNIl0mxXI" resolve="PseudoConstraint" />
-    <node concept="1TJgyj" id="18kNIl0jL_z" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="logical" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <property role="IQ2ns" value="1302893676238674275" />
-      <ref role="20lvS9" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
-    </node>
-    <node concept="1TJgyj" id="18kNIl0jL3E" role="1TKVEi">
-      <property role="IQ2ns" value="1302893676238672106" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="origin" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-    <node concept="asaX9" id="5itBwM7GBuX" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="18kNIl0mxXI">
     <property role="EcuMT" value="1302893676239396718" />
     <property role="3GE5qa" value="constraint" />
@@ -574,31 +508,6 @@
     <property role="R5$K2" value="false" />
     <ref role="1TJDcQ" node="6p0DfM0ajMA" resolve="AbstractConstraint" />
   </node>
-  <node concept="1TIwiD" id="7IysFe_ZPX_">
-    <property role="EcuMT" value="8908809128801951589" />
-    <property role="3GE5qa" value="macro.decl" />
-    <property role="TrG5h" value="MacroBody" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="7IysFe_ZPXC" role="1TKVEi">
-      <property role="IQ2ns" value="8908809128801951592" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="code" />
-      <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
-    </node>
-    <node concept="1TJgyj" id="7IysFe_ZPXE" role="1TKVEi">
-      <property role="IQ2ns" value="8908809128801951594" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="7IysFe_ZPXH" resolve="MacroBodyLogicalDeclaration" />
-    </node>
-    <node concept="PrWs8" id="7IysFe_ZPXA" role="PzmwI">
-      <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
-    </node>
-    <node concept="PrWs8" id="5itBwM5wQOg" role="PzmwI">
-      <ref role="PrY4T" node="5itBwM5wMtr" resolve="MacroTemplateBody" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="7IysFe_ZPXH">
     <property role="EcuMT" value="8908809128801951597" />
     <property role="3GE5qa" value="macro.decl" />
@@ -608,203 +517,10 @@
       <ref role="PrY4T" to="5j4j:75vUFrS_9Sg" resolve="LogicalVariableDeclarationContainer" />
     </node>
   </node>
-  <node concept="1TIwiD" id="7IysFeA0yb0">
-    <property role="EcuMT" value="8908809128802132672" />
-    <property role="3GE5qa" value="macro.decl" />
-    <property role="TrG5h" value="MacroParameterDeclaration" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="7IysFeA0ybI" role="1TKVEi">
-      <property role="IQ2ns" value="8908809128802132718" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="type" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="tpee:fz3vP1H" resolve="Type" />
-    </node>
-    <node concept="1TJgyj" id="7IysFeA5xBQ" role="1TKVEi">
-      <property role="IQ2ns" value="8908809128803441142" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="init" />
-      <ref role="20lvS9" node="7IysFeA5Lco" resolve="InitBlock" />
-    </node>
-    <node concept="PrWs8" id="7IysFeA0ybD" role="PzmwI">
-      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
-    </node>
-    <node concept="PrWs8" id="7IysFeA0ybs" role="PzmwI">
-      <ref role="PrY4T" to="tpee:4H$HgYMZ7sw" resolve="IVariableDeclaration" />
-    </node>
-    <node concept="PrWs8" id="7IysFeA0ybx" role="PzmwI">
-      <ref role="PrY4T" to="tpck:hqLv6T6" resolve="IResolveInfo" />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="7IysFeA1uPa">
-    <property role="EcuMT" value="8908809128802381130" />
-    <property role="3GE5qa" value="macro.decl" />
-    <property role="TrG5h" value="MacroParameterReference" />
-    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
-    <node concept="1TJgyj" id="7IysFeA1uTj" role="1TKVEi">
-      <property role="IQ2ns" value="8908809128802381395" />
-      <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="7IysFeA0yb0" resolve="MacroParameterDeclaration" />
-    </node>
-    <node concept="PrWs8" id="7IysFeA1uRT" role="PzmwI">
-      <ref role="PrY4T" to="tpee:SORzhOp6jM" resolve="IVariableReference" />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="7IysFeA5Lco">
-    <property role="EcuMT" value="8908809128803504920" />
-    <property role="3GE5qa" value="macro.code" />
-    <property role="TrG5h" value="InitBlock" />
-    <ref role="1TJDcQ" node="1hX44vMFoce" resolve="CodeBlock" />
-  </node>
-  <node concept="1TIwiD" id="7IysFeA99oR">
-    <property role="EcuMT" value="8908809128804390455" />
-    <property role="3GE5qa" value="macro.code" />
-    <property role="TrG5h" value="MacroLogicalExpression" />
-    <property role="34LRSv" value="macroLogical" />
-    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
-    <node concept="asaX9" id="1ALxU7rdvPw" role="lGtFl" />
-  </node>
   <node concept="PlHQZ" id="7IysFeBd3kI">
     <property role="EcuMT" value="8908809128822191406" />
     <property role="TrG5h" value="ApplicationSessionParticipant" />
   </node>
-  <node concept="1TIwiD" id="3TnYLtqfhzx">
-    <property role="EcuMT" value="4492335231042132193" />
-    <property role="3GE5qa" value="macro.code.with" />
-    <property role="TrG5h" value="ContextParameterDeclaration" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="3TnYLtqfhzO" role="1TKVEi">
-      <property role="IQ2ns" value="4492335231042132212" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="type" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="tpee:fz3vP1H" resolve="Type" />
-    </node>
-    <node concept="PrWs8" id="3TnYLtqfhzy" role="PzmwI">
-      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
-    </node>
-    <node concept="PrWs8" id="3TnYLtqfhzB" role="PzmwI">
-      <ref role="PrY4T" to="tpee:4H$HgYMZ7sw" resolve="IVariableDeclaration" />
-    </node>
-    <node concept="PrWs8" id="3TnYLtqfhzJ" role="PzmwI">
-      <ref role="PrY4T" to="tpck:hqLv6T6" resolve="IResolveInfo" />
-    </node>
-    <node concept="asaX9" id="1ALxU7rdc$P" role="lGtFl" />
-  </node>
-  <node concept="1TIwiD" id="3TnYLtqfh$J">
-    <property role="EcuMT" value="4492335231042132271" />
-    <property role="3GE5qa" value="macro.code.with" />
-    <property role="TrG5h" value="ContextParameterReference" />
-    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
-    <node concept="1TJgyj" id="3TnYLtqfh$T" role="1TKVEi">
-      <property role="IQ2ns" value="4492335231042132281" />
-      <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="3TnYLtqfhzx" resolve="ContextParameterDeclaration" />
-    </node>
-    <node concept="PrWs8" id="3TnYLtqfh$K" role="PzmwI">
-      <ref role="PrY4T" to="tpee:SORzhOp6jM" resolve="IVariableReference" />
-    </node>
-    <node concept="asaX9" id="1ALxU7rdg3B" role="lGtFl" />
-  </node>
-  <node concept="1TIwiD" id="3TnYLtqgQYU">
-    <property role="EcuMT" value="4492335231042547642" />
-    <property role="3GE5qa" value="macro.code.with" />
-    <property role="TrG5h" value="WithContextStatement" />
-    <property role="34LRSv" value="with" />
-    <ref role="1TJDcQ" to="tpee:fzclF8l" resolve="Statement" />
-    <node concept="1TJgyj" id="3TnYLtqgRY3" role="1TKVEi">
-      <property role="IQ2ns" value="4492335231042551683" />
-      <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="3TnYLtqfhzx" resolve="ContextParameterDeclaration" />
-    </node>
-    <node concept="1TJgyj" id="3TnYLtqgQZ0" role="1TKVEi">
-      <property role="IQ2ns" value="4492335231042547648" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="init" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <property role="TrG5h" value="value" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-    <node concept="1TJgyj" id="3TnYLtqgQYV" role="1TKVEi">
-      <property role="IQ2ns" value="4492335231042547643" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="body" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
-    </node>
-    <node concept="asaX9" id="1ALxU7rdgVl" role="lGtFl" />
-  </node>
-  <node concept="1TIwiD" id="1L74NXEmF9s">
-    <property role="EcuMT" value="2037618519496634972" />
-    <property role="3GE5qa" value="macro.invoke" />
-    <property role="TrG5h" value="MacroParameterBinding" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="1L74NXEmG0t" role="1TKVEi">
-      <property role="IQ2ns" value="2037618519496638493" />
-      <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="7IysFeA0yb0" resolve="MacroParameterDeclaration" />
-    </node>
-    <node concept="1TJgyj" id="1L74NXGK1G1" role="1TKVEi">
-      <property role="IQ2ns" value="2037618519536835329" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="code" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-  </node>
-  <node concept="PlHQZ" id="1L74NXEmF9t">
-    <property role="EcuMT" value="2037618519496634973" />
-    <property role="3GE5qa" value="macro.invoke" />
-    <property role="TrG5h" value="MacroInvocation" />
-    <node concept="asaX9" id="1ALxU7rzC1E" role="lGtFl" />
-  </node>
-  <node concept="1TIwiD" id="1L74NXEmFJU">
-    <property role="EcuMT" value="2037618519496637434" />
-    <property role="3GE5qa" value="macro.invoke" />
-    <property role="TrG5h" value="MacroArgumentList" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="1L74NXEmFJV" role="1TKVEi">
-      <property role="IQ2ns" value="2037618519496637435" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="binding" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="1L74NXEmF9s" resolve="MacroParameterBinding" />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="4MEOIDFfpSk">
-    <property role="EcuMT" value="5524459797186715156" />
-    <property role="3GE5qa" value="constraint.typespecific" />
-    <property role="TrG5h" value="CallMacroPseudoConstraint" />
-    <property role="34LRSv" value="call" />
-    <ref role="1TJDcQ" node="18kNIl0mxXI" resolve="PseudoConstraint" />
-    <node concept="1TJgyj" id="5hSMZ_lpUoi" role="1TKVEi">
-      <property role="IQ2ns" value="6086839168131376658" />
-      <property role="20kJfa" value="declaration" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="1pPth$m5Bbz" resolve="MacroDeclaration" />
-    </node>
-    <node concept="1TJgyj" id="4MEOIDFfpT9" role="1TKVEi">
-      <property role="IQ2ns" value="5524459797186715209" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="logical" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
-    </node>
-    <node concept="1TJgyj" id="5hSMZ_lrcKO" role="1TKVEi">
-      <property role="IQ2ns" value="6086839168131714100" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="argument" />
-      <ref role="20lvS9" node="1L74NXEmFJU" resolve="MacroArgumentList" />
-    </node>
-    <node concept="PrWs8" id="5hSMZ_ltV78" role="PzmwI">
-      <ref role="PrY4T" node="1L74NXEmF9t" resolve="MacroInvocation" />
-    </node>
-    <node concept="asaX9" id="5itBwM7GBuZ" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="20Ay2VefOqC">
     <property role="EcuMT" value="2316688792938825384" />
     <property role="3GE5qa" value="rule.clause" />
@@ -882,74 +598,6 @@
     <property role="34LRSv" value="logicalContext" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
   </node>
-  <node concept="1TIwiD" id="6hqFpWmM6I9">
-    <property role="EcuMT" value="7231283050490391433" />
-    <property role="3GE5qa" value="macro.code.with" />
-    <property role="TrG5h" value="ContextParameterContainer" />
-    <property role="19KtqR" value="true" />
-    <property role="34LRSv" value="context parameters" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="6hqFpWmM98w" role="1TKVEi">
-      <property role="IQ2ns" value="7231283050490401312" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="3TnYLtqfhzx" resolve="ContextParameterDeclaration" />
-    </node>
-    <node concept="PrWs8" id="6hqFpWmM98u" role="PzmwI">
-      <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
-    </node>
-    <node concept="asaX9" id="1ALxU7rd4E4" role="lGtFl" />
-  </node>
-  <node concept="1TIwiD" id="7smgEqggf12">
-    <property role="EcuMT" value="8581119423153238082" />
-    <property role="TrG5h" value="NodeAnchor" />
-    <property role="34LRSv" value="@anchor" />
-    <ref role="1TJDcQ" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
-    <node concept="1TJgyj" id="7smgEqggf13" role="1TKVEi">
-      <property role="IQ2ns" value="8581119423153238083" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="node" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-    <node concept="asaX9" id="5yr01fCxOXU" role="lGtFl" />
-  </node>
-  <node concept="1TIwiD" id="6DOfTm$zRmf">
-    <property role="EcuMT" value="7670825977262339471" />
-    <property role="3GE5qa" value="macro.decl" />
-    <property role="TrG5h" value="MacroInputDeclaration" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="6DOfTm$zVok" role="1TKVEi">
-      <property role="IQ2ns" value="7670825977262355988" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="type" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="tp25:gzTqbfa" resolve="SNodeType" />
-    </node>
-    <node concept="PrWs8" id="6DOfTm$zRmg" role="PzmwI">
-      <ref role="PrY4T" to="tpee:4H$HgYMZ7sw" resolve="IVariableDeclaration" />
-    </node>
-    <node concept="PrWs8" id="6DOfTm$zRml" role="PzmwI">
-      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
-    </node>
-    <node concept="PrWs8" id="6DOfTm$zRmt" role="PzmwI">
-      <ref role="PrY4T" to="tpck:hqLv6T6" resolve="IResolveInfo" />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="6DOfTm$$CHj">
-    <property role="EcuMT" value="7670825977262541651" />
-    <property role="3GE5qa" value="macro.code" />
-    <property role="TrG5h" value="MacroInputReference" />
-    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
-    <node concept="1TJgyj" id="6DOfTm$$CHk" role="1TKVEi">
-      <property role="IQ2ns" value="7670825977262541652" />
-      <property role="20kJfa" value="declaration" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="6DOfTm$zRmf" resolve="MacroInputDeclaration" />
-    </node>
-    <node concept="asaX9" id="1ALxU7rdzki" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="5WBVN_MT8FC">
     <property role="EcuMT" value="6856711987714624232" />
     <property role="TrG5h" value="LateExpressionItem" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
index 7669d863..f98fcda2 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
@@ -189,9 +189,6 @@
       </concept>
       <concept id="1174663118805" name="jetbrains.mps.lang.typesystem.structure.CreateLessThanInequationStatement" flags="nn" index="1ZobV4" />
     </language>
-    <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
-      <concept id="1564179198502666296" name="jetbrains.mps.logic.structure.LogicalType" flags="ig" index="26uTi9" />
-    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -1113,98 +1110,6 @@
       <ref role="1YaFvo" to="wq2x:1hX44vMFoce" resolve="CodeBlock" />
     </node>
   </node>
-  <node concept="1YbPZF" id="7IysFeA3vjt">
-    <property role="TrG5h" value="typeof_MacroParameterReference" />
-    <property role="3GE5qa" value="macro.decl" />
-    <node concept="3clFbS" id="7IysFeA3vju" role="18ibNy">
-      <node concept="1Z5TYs" id="7IysFeA3vv7" role="3cqZAp">
-        <node concept="mw_s8" id="7IysFeA3vv_" role="1ZfhKB">
-          <node concept="2OqwBi" id="7IysFeA3w5A" role="mwGJk">
-            <node concept="2OqwBi" id="7IysFeA3vAO" role="2Oq$k0">
-              <node concept="1YBJjd" id="7IysFeA3vvz" role="2Oq$k0">
-                <ref role="1YBMHb" node="7IysFeA3vjw" resolve="mpr" />
-              </node>
-              <node concept="3TrEf2" id="7IysFeA3vL8" role="2OqNvi">
-                <ref role="3Tt5mk" to="wq2x:7IysFeA1uTj" resolve="parameter" />
-              </node>
-            </node>
-            <node concept="3TrEf2" id="7IysFeA3wlo" role="2OqNvi">
-              <ref role="3Tt5mk" to="wq2x:7IysFeA0ybI" resolve="type" />
-            </node>
-          </node>
-        </node>
-        <node concept="mw_s8" id="7IysFeA3vva" role="1ZfhK$">
-          <node concept="1Z2H0r" id="7IysFeA3vj$" role="mwGJk">
-            <node concept="1YBJjd" id="7IysFeA3vot" role="1Z2MuG">
-              <ref role="1YBMHb" node="7IysFeA3vjw" resolve="mpr" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="7IysFeA3vjw" role="1YuTPh">
-      <property role="TrG5h" value="mpr" />
-      <ref role="1YaFvo" to="wq2x:7IysFeA1uPa" resolve="MacroParameterReference" />
-    </node>
-  </node>
-  <node concept="1YbPZF" id="7IysFeA9bof">
-    <property role="TrG5h" value="typeof_MacroLogicalExpression" />
-    <property role="3GE5qa" value="macro.code" />
-    <node concept="3clFbS" id="7IysFeA9bog" role="18ibNy">
-      <node concept="1Z5TYs" id="7IysFeA9bwM" role="3cqZAp">
-        <node concept="mw_s8" id="7IysFeA9bxi" role="1ZfhKB">
-          <node concept="2c44tf" id="7IysFeA9bxe" role="mwGJk">
-            <node concept="26uTi9" id="7IysFeA9bxC" role="2c44tc" />
-          </node>
-        </node>
-        <node concept="mw_s8" id="7IysFeA9bwP" role="1ZfhK$">
-          <node concept="1Z2H0r" id="7IysFeA9bop" role="mwGJk">
-            <node concept="1YBJjd" id="7IysFeA9bq9" role="1Z2MuG">
-              <ref role="1YBMHb" node="7IysFeA9boi" resolve="mle" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="7IysFeA9boi" role="1YuTPh">
-      <property role="TrG5h" value="mle" />
-      <ref role="1YaFvo" to="wq2x:7IysFeA99oR" resolve="MacroLogicalExpression" />
-    </node>
-  </node>
-  <node concept="1YbPZF" id="3TnYLtqfmDB">
-    <property role="TrG5h" value="typeof_ContextParameterReference" />
-    <property role="3GE5qa" value="macro.code.with" />
-    <node concept="3clFbS" id="3TnYLtqfmDC" role="18ibNy">
-      <node concept="1Z5TYs" id="3TnYLtqfmXq" role="3cqZAp">
-        <node concept="mw_s8" id="3TnYLtqfmXG" role="1ZfhKB">
-          <node concept="2OqwBi" id="3TnYLtqfnDq" role="mwGJk">
-            <node concept="2OqwBi" id="3TnYLtqfn4i" role="2Oq$k0">
-              <node concept="1YBJjd" id="3TnYLtqfmXE" role="2Oq$k0">
-                <ref role="1YBMHb" node="3TnYLtqfmDE" resolve="cpr" />
-              </node>
-              <node concept="3TrEf2" id="3TnYLtqfnls" role="2OqNvi">
-                <ref role="3Tt5mk" to="wq2x:3TnYLtqfh$T" resolve="parameter" />
-              </node>
-            </node>
-            <node concept="3TrEf2" id="3TnYLtqfnUS" role="2OqNvi">
-              <ref role="3Tt5mk" to="wq2x:3TnYLtqfhzO" resolve="type" />
-            </node>
-          </node>
-        </node>
-        <node concept="mw_s8" id="3TnYLtqfmXt" role="1ZfhK$">
-          <node concept="1Z2H0r" id="3TnYLtqfmIW" role="mwGJk">
-            <node concept="1YBJjd" id="3TnYLtqfmNI" role="1Z2MuG">
-              <ref role="1YBMHb" node="3TnYLtqfmDE" resolve="cpr" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="3TnYLtqfmDE" role="1YuTPh">
-      <property role="TrG5h" value="cpr" />
-      <ref role="1YaFvo" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="60zk4o7revn">
     <property role="TrG5h" value="typeof_LogicalContextExpression" />
     <node concept="3clFbS" id="60zk4o7revo" role="18ibNy">
@@ -1230,92 +1135,6 @@
       <ref role="1YaFvo" to="wq2x:60zk4o7reud" resolve="LogicalContextExpression" />
     </node>
   </node>
-  <node concept="1YbPZF" id="7smgEqggf1N">
-    <property role="TrG5h" value="typeof_NodeAnchor" />
-    <node concept="3clFbS" id="7smgEqggf1O" role="18ibNy">
-      <node concept="1Z5TYs" id="7smgEqggfiD" role="3cqZAp">
-        <node concept="mw_s8" id="7smgEqggfiX" role="1ZfhKB">
-          <node concept="2c44tf" id="7smgEqggfiT" role="mwGJk">
-            <node concept="26uTi9" id="7smgEqggfjj" role="2c44tc" />
-          </node>
-        </node>
-        <node concept="mw_s8" id="7smgEqggfiG" role="1ZfhK$">
-          <node concept="1Z2H0r" id="7smgEqggf2G" role="mwGJk">
-            <node concept="1YBJjd" id="7smgEqggf4s" role="1Z2MuG">
-              <ref role="1YBMHb" node="7smgEqggf1Q" resolve="nodeAnchor" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="7smgEqggf1Q" role="1YuTPh">
-      <property role="TrG5h" value="nodeAnchor" />
-      <ref role="1YaFvo" to="wq2x:7smgEqggf12" resolve="NodeAnchor" />
-    </node>
-  </node>
-  <node concept="1YbPZF" id="6DOfTm$zWcY">
-    <property role="TrG5h" value="typeof_MacroInputDeclaration" />
-    <property role="3GE5qa" value="macro.decl" />
-    <node concept="3clFbS" id="6DOfTm$zWcZ" role="18ibNy">
-      <node concept="1Z5TYs" id="6DOfTm$zXey" role="3cqZAp">
-        <node concept="mw_s8" id="6DOfTm$zXeO" role="1ZfhKB">
-          <node concept="2OqwBi" id="6DOfTm$zXp9" role="mwGJk">
-            <node concept="1YBJjd" id="6DOfTm$zXeM" role="2Oq$k0">
-              <ref role="1YBMHb" node="6DOfTm$zWd1" resolve="mid" />
-            </node>
-            <node concept="3TrEf2" id="6DOfTm$zXKQ" role="2OqNvi">
-              <ref role="3Tt5mk" to="wq2x:6DOfTm$zVok" resolve="type" />
-            </node>
-          </node>
-        </node>
-        <node concept="mw_s8" id="6DOfTm$zXe_" role="1ZfhK$">
-          <node concept="1Z2H0r" id="6DOfTm$zWi2" role="mwGJk">
-            <node concept="1YBJjd" id="6DOfTm$zWjP" role="1Z2MuG">
-              <ref role="1YBMHb" node="6DOfTm$zWd1" resolve="mid" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="6DOfTm$zWd1" role="1YuTPh">
-      <property role="TrG5h" value="mid" />
-      <ref role="1YaFvo" to="wq2x:6DOfTm$zRmf" resolve="MacroInputDeclaration" />
-    </node>
-  </node>
-  <node concept="1YbPZF" id="6DOfTm$$CI4">
-    <property role="TrG5h" value="typeof_MacroInputReference" />
-    <property role="3GE5qa" value="macro.code" />
-    <node concept="3clFbS" id="6DOfTm$$CI5" role="18ibNy">
-      <node concept="1Z5TYs" id="6DOfTm$$D1t" role="3cqZAp">
-        <node concept="mw_s8" id="6DOfTm$$D1J" role="1ZfhKB">
-          <node concept="2OqwBi" id="6DOfTm$$DIg" role="mwGJk">
-            <node concept="2OqwBi" id="6DOfTm$$D9B" role="2Oq$k0">
-              <node concept="1YBJjd" id="6DOfTm$$D1H" role="2Oq$k0">
-                <ref role="1YBMHb" node="6DOfTm$$CI7" resolve="mir" />
-              </node>
-              <node concept="3TrEf2" id="6DOfTm$$DoR" role="2OqNvi">
-                <ref role="3Tt5mk" to="wq2x:6DOfTm$$CHk" resolve="declaration" />
-              </node>
-            </node>
-            <node concept="3TrEf2" id="6DOfTm$$DZV" role="2OqNvi">
-              <ref role="3Tt5mk" to="wq2x:6DOfTm$zVok" resolve="type" />
-            </node>
-          </node>
-        </node>
-        <node concept="mw_s8" id="6DOfTm$$D1w" role="1ZfhK$">
-          <node concept="1Z2H0r" id="6DOfTm$$CLs" role="mwGJk">
-            <node concept="1YBJjd" id="6DOfTm$$CNf" role="1Z2MuG">
-              <ref role="1YBMHb" node="6DOfTm$$CI7" resolve="mir" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="6DOfTm$$CI7" role="1YuTPh">
-      <property role="TrG5h" value="mir" />
-      <ref role="1YaFvo" to="wq2x:6DOfTm$$CHj" resolve="MacroInputReference" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="5f6wxQ39shK">
     <property role="TrG5h" value="typeof_UserConstraint" />
     <property role="3GE5qa" value="constraint" />
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 160008c7..7f2efea6 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
@@ -157,7 +157,6 @@
     <node concept="2tJIrI" id="4U$Q3dLryje" role="jymVt" />
     <node concept="3Tm1VV" id="1pPth$m7IVG" role="1B3o_S" />
     <node concept="3clFb_" id="4KRwoelAtxl" role="jymVt">
-      <property role="1EzhhJ" value="true" />
       <property role="TrG5h" value="macroTemplate" />
       <node concept="3uibUv" id="4KRwoelAyo8" role="3clF45">
         <ref role="3uigEE" node="1hX44vNnjJ$" resolve="MacroTemplate" />
@@ -166,7 +165,15 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="4KRwoelAtxp" role="1B3o_S" />
-      <node concept="3clFbS" id="4KRwoelAtxq" role="3clF47" />
+      <node concept="3clFbS" id="4KRwoelAtxq" role="3clF47">
+        <node concept="YS8fn" id="631nQp3ZlPl" role="3cqZAp">
+          <node concept="2ShNRf" id="631nQp3ZlPP" role="YScLw">
+            <node concept="1pGfFk" id="631nQp3Zn5D" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="37vLTG" id="4KRwoelAyUd" role="3clF46">
         <property role="TrG5h" value="concept" />
         <node concept="3bZ5Sz" id="4KRwoelAyUc" role="1tU5fm" />
@@ -183,7 +190,6 @@
     </node>
     <node concept="2tJIrI" id="5itBwM8SKbL" role="jymVt" />
     <node concept="3clFb_" id="5itBwM8SJDJ" role="jymVt">
-      <property role="1EzhhJ" value="true" />
       <property role="TrG5h" value="macroTemplate" />
       <node concept="3uibUv" id="5itBwM8SJDK" role="3clF45">
         <ref role="3uigEE" node="1hX44vNnjJ$" resolve="MacroTemplate" />
@@ -192,7 +198,15 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="5itBwM8SJDM" role="1B3o_S" />
-      <node concept="3clFbS" id="5itBwM8SJDN" role="3clF47" />
+      <node concept="3clFbS" id="5itBwM8SJDN" role="3clF47">
+        <node concept="YS8fn" id="631nQp3ZLIO" role="3cqZAp">
+          <node concept="2ShNRf" id="631nQp3ZLIP" role="YScLw">
+            <node concept="1pGfFk" id="631nQp3ZLIQ" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="37vLTG" id="5itBwM8SK_e" role="3clF46">
         <property role="TrG5h" value="templateRef" />
         <node concept="3uibUv" id="5itBwM8SK_f" role="1tU5fm">
@@ -262,12 +276,19 @@
     <node concept="2tJIrI" id="5itBwM7qCDt" role="jymVt" />
     <node concept="3clFb_" id="6UWSvq4Vn1v" role="jymVt">
       <property role="TrG5h" value="allMacroConcepts" />
-      <property role="1EzhhJ" value="true" />
       <node concept="3vKaQO" id="6UWSvq4Vn1w" role="3clF45">
         <node concept="3bZ5Sz" id="6UWSvq4VpUS" role="3O5elw" />
       </node>
       <node concept="3Tm1VV" id="6UWSvq4Vn1y" role="1B3o_S" />
-      <node concept="3clFbS" id="6UWSvq4Vn1z" role="3clF47" />
+      <node concept="3clFbS" id="6UWSvq4Vn1z" role="3clF47">
+        <node concept="YS8fn" id="631nQp3ZXzf" role="3cqZAp">
+          <node concept="2ShNRf" id="631nQp3ZXzg" role="YScLw">
+            <node concept="1pGfFk" id="631nQp3ZXzh" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="2AHcQZ" id="5itBwM7qscB" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>