From e2ea78ef9ee60d0832c5ba7caf0b2b973479e66c Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Fri, 18 Jan 2019 12:30:17 +0100
Subject: [PATCH] Improve layout of constraints and dataforms. Get rid of
 unnecessary anchors and hacks.

---
 .../languageModels/editor.mps                 | 246 ++++++++++--------
 .../languageModels/editor.mps                 | 144 +---------
 2 files changed, 145 insertions(+), 245 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 18fcd890..5c698751 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -575,9 +575,6 @@
         </node>
       </node>
       <node concept="l2Vlx" id="6p0DfM0cTe3" role="2iSdaV" />
-      <node concept="1Bt7hp" id="7lt0LtPhUj$" role="3F10Kt">
-        <property role="VOm3f" value="true" />
-      </node>
     </node>
   </node>
   <node concept="24kQdi" id="6p0DfM0cXHS">
@@ -773,9 +770,6 @@
           </node>
         </node>
       </node>
-      <node concept="1Bt7hp" id="6ntBQ9KE8a9" role="3F10Kt">
-        <property role="VOm3f" value="true" />
-      </node>
       <node concept="pVoyu" id="7lt0LtPlW24" role="3F10Kt">
         <property role="VOm3f" value="true" />
         <node concept="3nzxsE" id="7lt0LtPlWnD" role="3n$kyP">
@@ -919,16 +913,6 @@
     <property role="3GE5qa" value="rule.component" />
     <ref role="1XX52x" to="wq2x:6p0DfM0a3Qe" resolve="Guard" />
     <node concept="3EZMnI" id="6p0DfM0dH8B" role="2wV5jI">
-      <node concept="3F0ifn" id="4aJUH_hOrI6" role="3EZMnx">
-        <property role="3F0ifm" value="when" />
-        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
-        <node concept="pVoyu" id="7lt0LtPvYMZ" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="ljvvj" id="4aJUH_hOrIe" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
       <node concept="PMmxH" id="3g$8GQC8lAb" role="3EZMnx">
         <ref role="PMmxG" node="3g$8GQC8l_C" resolve="RuleComponentCode" />
         <node concept="lj46D" id="4nIWweBIE_f" role="3F10Kt">
@@ -995,9 +979,6 @@
             <property role="VOm3f" value="true" />
           </node>
         </node>
-        <node concept="1Bsynf" id="2q_78a8Me41" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
         <node concept="3F0ifn" id="3kjrYXAtIlL" role="2czzBI">
           <property role="3F0ifm" value="" />
         </node>
@@ -1453,12 +1434,6 @@
         <node concept="3vyZuw" id="oI9YrmS7G" role="3F10Kt">
           <property role="VOm3f" value="false" />
         </node>
-        <node concept="1Bsynf" id="oI9YrmS7H" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="1Bt7hp" id="oI9YrmS7I" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
         <node concept="3F0ifn" id="oI9YrmS7M" role="3EZMnx">
           <property role="3F0ifm" value=")" />
           <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
@@ -3299,9 +3274,6 @@
         <node concept="VPM3Z" id="20Ay2VeizvE" role="3F10Kt">
           <property role="VOm3f" value="false" />
         </node>
-        <node concept="1Bsynf" id="20Ay2Veizxz" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
         <node concept="l2Vlx" id="20Ay2VeizvH" role="2iSdaV" />
         <node concept="3F1sOY" id="20Ay2Vei7Gy" role="3EZMnx">
           <ref role="1NtTu8" to="wq2x:20Ay2Vei7FI" resolve="code" />
@@ -3740,12 +3712,6 @@
         <node concept="3vyZuw" id="5WBVN_MT8FH" role="3F10Kt">
           <property role="VOm3f" value="false" />
         </node>
-        <node concept="1Bsynf" id="5WBVN_MT8FI" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="1Bt7hp" id="5WBVN_MT8FJ" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
         <node concept="3F1sOY" id="6p0DfM0hLgd" role="3EZMnx">
           <ref role="1NtTu8" to="wq2x:5WBVN_MT8FD" resolve="code" />
           <node concept="11L4FC" id="7ksQUDZvFEO" role="3F10Kt">
@@ -3857,9 +3823,6 @@
     <ref role="1XX52x" to="wq2x:36tQV5AmIt0" resolve="ConstraintRuleStatement" />
     <node concept="3EZMnI" id="36tQV5AB4ng" role="2wV5jI">
       <node concept="3EZMnI" id="36tQV5ABts7" role="3EZMnx">
-        <node concept="lj46D" id="36tQV5ACfrF" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
         <node concept="VPM3Z" id="36tQV5ABts9" role="3F10Kt">
           <property role="VOm3f" value="false" />
         </node>
@@ -3903,16 +3866,10 @@
             <property role="VOm3f" value="true" />
           </node>
         </node>
-        <node concept="1Bsynf" id="7lt0LtPHSzn" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
       </node>
       <node concept="3F2HdR" id="36tQV5AmMLS" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:36tQV5AmIsU" resolve="head" />
         <node concept="l2Vlx" id="36tQV5AmMLT" role="2czzBx" />
-        <node concept="ljvvj" id="36tQV5AmMLU" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
         <node concept="3F0ifn" id="36tQV5AmMLV" role="2czzBI">
           <property role="3F0ifm" value="start" />
           <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
@@ -3920,30 +3877,68 @@
             <property role="Vbekb" value="BOLD" />
           </node>
         </node>
+        <node concept="pVoyu" id="4TI9yUddc5w" role="3F10Kt">
+          <node concept="3nzxsE" id="4TI9yUdhFYH" role="3n$kyP">
+            <node concept="3clFbS" id="4TI9yUdhFYI" role="2VODD2">
+              <node concept="3clFbF" id="4TI9yUdhG67" role="3cqZAp">
+                <node concept="2OqwBi" id="4TI9yUdhKhE" role="3clFbG">
+                  <node concept="2OqwBi" id="4TI9yUdhGk8" role="2Oq$k0">
+                    <node concept="pncrf" id="4TI9yUdhG66" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="4TI9yUdhI0k" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:36tQV5AmIsU" resolve="head" />
+                    </node>
+                  </node>
+                  <node concept="3GX2aA" id="4TI9yUdhOGj" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
-      <node concept="VPM3Z" id="36tQV5AmMLX" role="3F10Kt">
-        <property role="VOm3f" value="false" />
-      </node>
-      <node concept="3F2HdR" id="36tQV5AmMLY" role="3EZMnx">
-        <property role="2czwfO" value=" " />
-        <ref role="1NtTu8" to="wq2x:36tQV5AmIsV" resolve="guard" />
-        <node concept="l2Vlx" id="36tQV5AmMLZ" role="2czzBx" />
-        <node concept="tppnM" id="36tQV5AmMM0" role="sWeuL">
-          <node concept="ljvvj" id="36tQV5AmMM1" role="3F10Kt">
+      <node concept="3EZMnI" id="4TI9yUdpPUy" role="3EZMnx">
+        <node concept="VPM3Z" id="4TI9yUdpPU$" role="3F10Kt" />
+        <node concept="pVoyu" id="4TI9yUdpQ9p" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="3F0ifn" id="4TI9yUdpRAV" role="3EZMnx">
+          <property role="3F0ifm" value="when" />
+          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+          <node concept="VPxyj" id="4TI9yUdqYD_" role="3F10Kt" />
+          <node concept="VPM3Z" id="4TI9yUdqYDJ" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="lj46D" id="4TI9yUdpRLu" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="pVoyu" id="4TI9yUdpRAW" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
         </node>
-        <node concept="ljvvj" id="36tQV5AmMM2" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="3F0ifn" id="36tQV5AmMM3" role="2czzBI">
-          <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
-          <node concept="Vb9p2" id="36tQV5AmMM4" role="3F10Kt">
-            <property role="Vbekb" value="BOLD" />
+        <node concept="3F2HdR" id="36tQV5AmMLY" role="3EZMnx">
+          <property role="2czwfO" value=" " />
+          <ref role="1NtTu8" to="wq2x:36tQV5AmIsV" resolve="guard" />
+          <node concept="l2Vlx" id="36tQV5AmMLZ" role="2czzBx" />
+          <node concept="tppnM" id="36tQV5AmMM0" role="sWeuL">
+            <node concept="ljvvj" id="36tQV5AmMM1" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+          </node>
+          <node concept="3F0ifn" id="36tQV5AmMM3" role="2czzBI">
+            <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
+            <node concept="Vb9p2" id="36tQV5AmMM4" role="3F10Kt">
+              <property role="Vbekb" value="BOLD" />
+            </node>
+          </node>
+          <node concept="pVoyu" id="4TI9yUdpRLo" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="lj46D" id="4TI9yUdpRLC" role="3F10Kt">
+            <property role="VOm3f" value="true" />
           </node>
         </node>
-        <node concept="pkWqt" id="36tQV5AmMM5" role="pqm2j">
-          <node concept="3clFbS" id="36tQV5AmMM6" role="2VODD2">
+        <node concept="l2Vlx" id="4TI9yUdpPUB" role="2iSdaV" />
+        <node concept="pkWqt" id="4TI9yUdpR7z" role="pqm2j">
+          <node concept="3clFbS" id="4TI9yUdpR7$" role="2VODD2">
             <node concept="3clFbF" id="36tQV5AmMM7" role="3cqZAp">
               <node concept="2OqwBi" id="36tQV5AmMM8" role="3clFbG">
                 <node concept="2OqwBi" id="36tQV5AmMM9" role="2Oq$k0">
@@ -3958,69 +3953,94 @@
           </node>
         </node>
       </node>
-      <node concept="3F0ifn" id="36tQV5AmMMd" role="3EZMnx">
-        <property role="3F0ifm" value="activate" />
-        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
-        <node concept="VPxyj" id="36tQV5AmMMe" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="VPM3Z" id="36tQV5AmMMf" role="3F10Kt">
+      <node concept="3EZMnI" id="4TI9yUdqXu7" role="3EZMnx">
+        <node concept="VPM3Z" id="4TI9yUdqXu9" role="3F10Kt" />
+        <node concept="pVoyu" id="4TI9yUdqXH6" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
-        <node concept="ljvvj" id="36tQV5AmMMg" role="3F10Kt">
-          <property role="VOm3f" value="true" />
+        <node concept="3F0ifn" id="36tQV5AmMMd" role="3EZMnx">
+          <property role="3F0ifm" value="activate" />
+          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+          <node concept="VPxyj" id="36tQV5AmMMe" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="VPM3Z" id="36tQV5AmMMf" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="lj46D" id="4TI9yUdqYDr" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="pVoyu" id="4TI9yUddbVb" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="A1WHr" id="7lt0LtPPklW" role="3vIgyS">
+            <ref role="2ZyFGn" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+          </node>
         </node>
-        <node concept="A1WHr" id="7lt0LtPPklW" role="3vIgyS">
-          <ref role="2ZyFGn" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
-        </node>
-        <node concept="pkWqt" id="7lt0LtPRnco" role="pqm2j">
-          <node concept="3clFbS" id="7lt0LtPRncp" role="2VODD2">
-            <node concept="3clFbF" id="7lt0LtPRnjA" role="3cqZAp">
-              <node concept="2OqwBi" id="7lt0LtPRqrm" role="3clFbG">
-                <node concept="2OqwBi" id="7lt0LtPRnxn" role="2Oq$k0">
-                  <node concept="pncrf" id="7lt0LtPRnj_" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="7lt0LtPRo2z" role="2OqNvi">
+        <node concept="l2Vlx" id="4TI9yUdqXuc" role="2iSdaV" />
+        <node concept="pkWqt" id="4TI9yUdqXPR" role="pqm2j">
+          <node concept="3clFbS" id="4TI9yUdqXPS" role="2VODD2">
+            <node concept="3clFbF" id="4TI9yUdqXPY" role="3cqZAp">
+              <node concept="2OqwBi" id="4TI9yUdqXPZ" role="3clFbG">
+                <node concept="2OqwBi" id="4TI9yUdqXQ0" role="2Oq$k0">
+                  <node concept="pncrf" id="4TI9yUdqXQ1" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="4TI9yUdqXQ2" role="2OqNvi">
                     <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
                   </node>
                 </node>
-                <node concept="3GX2aA" id="7lt0LtPRwni" role="2OqNvi" />
+                <node concept="3GX2aA" id="4TI9yUdqXQ3" role="2OqNvi" />
               </node>
             </node>
           </node>
         </node>
+        <node concept="3EZMnI" id="36tQV5AmMMh" role="3EZMnx">
+          <node concept="lj46D" id="4TI9yUdqYDS" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="l2Vlx" id="36tQV5AmMMj" role="2iSdaV" />
+          <node concept="3F2HdR" id="36tQV5AmMMk" role="3EZMnx">
+            <property role="2czwfO" value="else" />
+            <ref role="1NtTu8" to="wq2x:36tQV5AmIsW" resolve="body" />
+            <node concept="l2Vlx" id="36tQV5AmMMl" role="2czzBx" />
+            <node concept="tppnM" id="36tQV5AmMMm" role="sWeuL">
+              <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+              <node concept="pVoyu" id="1mdVbTRQpgf" role="3F10Kt">
+                <property role="VOm3f" value="true" />
+              </node>
+              <node concept="ljvvj" id="1mdVbTRQpg5" role="3F10Kt">
+                <property role="VOm3f" value="true" />
+              </node>
+              <node concept="VPM3Z" id="1mdVbTRQpfN" role="3F10Kt">
+                <property role="VOm3f" value="true" />
+              </node>
+              <node concept="VPxyj" id="1mdVbTRQpfS" role="3F10Kt">
+                <property role="VOm3f" value="false" />
+              </node>
+            </node>
+            <node concept="3F0ifn" id="36tQV5AmMMn" role="2czzBI">
+              <property role="3F0ifm" value="activate nothing" />
+              <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
+              <node concept="Vb9p2" id="36tQV5AmMMo" role="3F10Kt">
+                <property role="Vbekb" value="BOLD" />
+              </node>
+            </node>
+          </node>
+          <node concept="pVoyu" id="4TI9yUddc5u" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
       </node>
-      <node concept="3EZMnI" id="36tQV5AmMMh" role="3EZMnx">
-        <node concept="ljvvj" id="36tQV5AmMMi" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="l2Vlx" id="36tQV5AmMMj" role="2iSdaV" />
-        <node concept="3F2HdR" id="36tQV5AmMMk" role="3EZMnx">
-          <property role="2czwfO" value="else" />
-          <ref role="1NtTu8" to="wq2x:36tQV5AmIsW" resolve="body" />
-          <node concept="l2Vlx" id="36tQV5AmMMl" role="2czzBx" />
-          <node concept="tppnM" id="36tQV5AmMMm" role="sWeuL">
-            <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
-            <node concept="pVoyu" id="1mdVbTRQpgf" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="ljvvj" id="1mdVbTRQpg5" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="VPM3Z" id="1mdVbTRQpfN" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="VPxyj" id="1mdVbTRQpfS" role="3F10Kt">
-              <property role="VOm3f" value="false" />
-            </node>
-          </node>
-          <node concept="3F0ifn" id="36tQV5AmMMn" role="2czzBI">
-            <property role="3F0ifm" value="activate nothing" />
-            <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
-            <node concept="Vb9p2" id="36tQV5AmMMo" role="3F10Kt">
-              <property role="Vbekb" value="BOLD" />
-            </node>
-          </node>
-        </node>
+      <node concept="lj46D" id="4TI9yUdo3Wj" role="3F10Kt">
+        <property role="VOm3f" value="true" />
+      </node>
+      <node concept="1Bsynf" id="4TI9yUdfYyM" role="3F10Kt">
+        <property role="VOm3f" value="true" />
+      </node>
+      <node concept="1Bt7hp" id="4TI9yUdfYyN" role="3F10Kt">
+        <property role="VOm3f" value="true" />
+      </node>
+      <node concept="VPM3Z" id="36tQV5AmMLX" role="3F10Kt">
+        <property role="VOm3f" value="false" />
       </node>
       <node concept="l2Vlx" id="36tQV5AmMMp" role="2iSdaV" />
     </node>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index 6e44b379..79a40b86 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -357,7 +357,6 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
@@ -440,7 +439,6 @@
       <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt">
         <reference id="1139877738879" name="concept" index="1A0vxQ" />
       </concept>
-      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
         <reference id="3562215692195600259" name="link" index="13MTZf" />
       </concept>
@@ -464,9 +462,6 @@
       <concept id="6870613620390542976" name="jetbrains.mps.lang.smodel.structure.ConceptAliasOperation" flags="ng" index="3n3YKJ" />
       <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="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
-        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
-      </concept>
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
@@ -517,7 +512,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -545,8 +539,18 @@
           <property role="VOm3f" value="true" />
         </node>
       </node>
-      <node concept="3F1sOY" id="1pt0VTMv4Bd" role="3EZMnx">
-        <ref role="1NtTu8" to="5j4j:6$jH9oLmVNm" resolve="root" />
+      <node concept="3EZMnI" id="4TI9yUd8aHa" role="3EZMnx">
+        <node concept="VPM3Z" id="4TI9yUd8aHc" role="3F10Kt" />
+        <node concept="1Bsynf" id="4TI9yUd8aHJ" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="1Bt7hp" id="4TI9yUd8aHR" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="3F1sOY" id="1pt0VTMv4Bd" role="3EZMnx">
+          <ref role="1NtTu8" to="5j4j:6$jH9oLmVNm" resolve="root" />
+        </node>
+        <node concept="l2Vlx" id="4TI9yUd8aHf" role="2iSdaV" />
       </node>
       <node concept="3F0ifn" id="2L$SfABicfI" role="3EZMnx">
         <property role="3F0ifm" value="»" />
@@ -1276,50 +1280,6 @@
         <node concept="lj46D" id="2L$SfABahMD" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
-        <node concept="1Bt7hp" id="2L$SfAB5Z3R" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-          <node concept="3nzxsE" id="2L$SfAB5Z3W" role="3n$kyP">
-            <node concept="3clFbS" id="2L$SfAB5Z3X" role="2VODD2">
-              <node concept="3clFbF" id="2L$SfAB5Z48" role="3cqZAp">
-                <node concept="2OqwBi" id="2L$SfAB60bU" role="3clFbG">
-                  <node concept="2OqwBi" id="2L$SfAB5Ziz" role="2Oq$k0">
-                    <node concept="pncrf" id="2L$SfAB5Z47" role="2Oq$k0" />
-                    <node concept="2Xjw5R" id="2L$SfAB5ZPQ" role="2OqNvi">
-                      <node concept="1xMEDy" id="2L$SfAB5ZPS" role="1xVPHs">
-                        <node concept="chp4Y" id="2L$SfAB5ZWX" role="ri$Ld">
-                          <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="ListNode" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3w_OXm" id="2L$SfAB62OS" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1Bsynf" id="2L$SfAB6hmO" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-          <node concept="3nzxsE" id="2L$SfAB6hnf" role="3n$kyP">
-            <node concept="3clFbS" id="2L$SfAB6hng" role="2VODD2">
-              <node concept="3clFbF" id="2L$SfAB6hnh" role="3cqZAp">
-                <node concept="2OqwBi" id="2L$SfAB6hni" role="3clFbG">
-                  <node concept="2OqwBi" id="2L$SfAB6hnj" role="2Oq$k0">
-                    <node concept="pncrf" id="2L$SfAB6hnk" role="2Oq$k0" />
-                    <node concept="2Xjw5R" id="2L$SfAB6hnl" role="2OqNvi">
-                      <node concept="1xMEDy" id="2L$SfAB6hnm" role="1xVPHs">
-                        <node concept="chp4Y" id="2L$SfAB6hnn" role="ri$Ld">
-                          <ref role="cht4Q" to="5j4j:1OShD0HAY6y" resolve="ListNode" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3w_OXm" id="2L$SfAB6hno" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
       </node>
       <node concept="3F0ifn" id="1OShD0HAZmS" role="3EZMnx">
         <property role="3F0ifm" value="]" />
@@ -3352,29 +3312,6 @@
         <node concept="3F0ifn" id="1L74NXFNj3F" role="3EZMnx">
           <property role="3F0ifm" value="(" />
           <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
-          <node concept="ljvvj" id="1L74NXFNj7v" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-            <node concept="3nzxsE" id="1L74NXFOUM5" role="3n$kyP">
-              <node concept="3clFbS" id="1L74NXFOUM6" role="2VODD2">
-                <node concept="3clFbF" id="1L74NXFOUWS" role="3cqZAp">
-                  <node concept="3eOSWO" id="1L74NXFP2wG" role="3clFbG">
-                    <node concept="3cmrfG" id="1L74NXFP2wM" role="3uHU7w">
-                      <property role="3cmrfH" value="2" />
-                    </node>
-                    <node concept="2OqwBi" id="1L74NXFOXiD" role="3uHU7B">
-                      <node concept="2OqwBi" id="1L74NXFOV8F" role="2Oq$k0">
-                        <node concept="pncrf" id="1L74NXFOUWR" role="2Oq$k0" />
-                        <node concept="3Tsc0h" id="1L74NXFOVBn" role="2OqNvi">
-                          <ref role="3TtcxE" to="5j4j:JOGAOsxaC4" resolve="override" />
-                        </node>
-                      </node>
-                      <node concept="34oBXx" id="1L74NXFP0h0" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
         </node>
         <node concept="3F2HdR" id="1L74NXFNj7x" role="3EZMnx">
           <ref role="1NtTu8" to="5j4j:JOGAOsxaC4" resolve="override" />
@@ -3389,31 +3326,6 @@
               </node>
             </node>
           </node>
-          <node concept="tppnM" id="1L74NXFPoKM" role="sWeuL">
-            <node concept="ljvvj" id="1L74NXFPoKV" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-              <node concept="3nzxsE" id="4bWqD4CgyAD" role="3n$kyP">
-                <node concept="3clFbS" id="4bWqD4CgyAE" role="2VODD2">
-                  <node concept="3clFbF" id="4bWqD4CgyHR" role="3cqZAp">
-                    <node concept="3eOSWO" id="4bWqD4CgEAp" role="3clFbG">
-                      <node concept="3cmrfG" id="4bWqD4CgEAv" role="3uHU7w">
-                        <property role="3cmrfH" value="2" />
-                      </node>
-                      <node concept="2OqwBi" id="4bWqD4Cg_p8" role="3uHU7B">
-                        <node concept="2OqwBi" id="4bWqD4CgyVA" role="2Oq$k0">
-                          <node concept="pncrf" id="4bWqD4CgyHQ" role="2Oq$k0" />
-                          <node concept="3Tsc0h" id="4bWqD4Cgzzg" role="2OqNvi">
-                            <ref role="3TtcxE" to="5j4j:JOGAOsxaC4" resolve="override" />
-                          </node>
-                        </node>
-                        <node concept="34oBXx" id="4bWqD4CgCks" role="2OqNvi" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="3F0ifn" id="Lu45F8B7eI" role="2czzBI">
             <property role="3F0ifm" value="" />
           </node>
@@ -3421,34 +3333,8 @@
         <node concept="3F0ifn" id="1L74NXFNj3T" role="3EZMnx">
           <property role="3F0ifm" value=")" />
           <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
-          <node concept="pVoyu" id="1L74NXFNj5N" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-            <node concept="3nzxsE" id="1L74NXFP31o" role="3n$kyP">
-              <node concept="3clFbS" id="1L74NXFP31p" role="2VODD2">
-                <node concept="3clFbF" id="1L74NXFP3eX" role="3cqZAp">
-                  <node concept="3eOSWO" id="1L74NXFPaP5" role="3clFbG">
-                    <node concept="3cmrfG" id="1L74NXFPaPb" role="3uHU7w">
-                      <property role="3cmrfH" value="2" />
-                    </node>
-                    <node concept="2OqwBi" id="1L74NXFP5$I" role="3uHU7B">
-                      <node concept="2OqwBi" id="1L74NXFP3qK" role="2Oq$k0">
-                        <node concept="pncrf" id="1L74NXFP3eW" role="2Oq$k0" />
-                        <node concept="3Tsc0h" id="1L74NXFP3Ts" role="2OqNvi">
-                          <ref role="3TtcxE" to="5j4j:JOGAOsxaC4" resolve="override" />
-                        </node>
-                      </node>
-                      <node concept="34oBXx" id="1L74NXFP8_p" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
         </node>
       </node>
-      <node concept="1Bsynf" id="1L74NXFNylb" role="3F10Kt">
-        <property role="VOm3f" value="true" />
-      </node>
     </node>
   </node>
   <node concept="3p36aQ" id="JOGAOsxYtS">
@@ -3843,12 +3729,6 @@
         <node concept="3vyZuw" id="7lt0LtQg3vs" role="3F10Kt">
           <property role="VOm3f" value="false" />
         </node>
-        <node concept="1Bsynf" id="7lt0LtQg3vt" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="1Bt7hp" id="7lt0LtQg3vu" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
         <node concept="3F1sOY" id="7lt0LtQg3vy" role="3EZMnx">
           <ref role="1NtTu8" to="5j4j:7lt0LtQg3vl" resolve="code" />
           <node concept="11L4FC" id="7lt0LtQg3vz" role="3F10Kt">