From d0d44b98c501ec6f9aaa27d19174f08ed902b783 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 24 Nov 2021 13:41:39 +0100
Subject: [PATCH] Minor editor fixes

---
 .../languageModels/editor.mps                 | 948 +++++++++---------
 .../languageModels/editor.mps                 | 153 ++-
 2 files changed, 541 insertions(+), 560 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index d173e708..7a369f02 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -3092,16 +3092,6 @@
       <node concept="l2Vlx" id="1laj_RThP8l" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="59P$gGfKFHA">
-    <property role="3GE5qa" value="rule.clause" />
-    <ref role="1XX52x" to="wq2x:59P$gGfKABp" resolve="ItemLogicalClause" />
-    <node concept="3EZMnI" id="59P$gGfKFHP" role="2wV5jI">
-      <node concept="3F1sOY" id="59P$gGfKFHZ" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:59P$gGfKABq" resolve="item" />
-      </node>
-      <node concept="l2Vlx" id="59P$gGfKFHS" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="6E2cNibqcv$">
     <property role="3GE5qa" value="rule.component" />
     <ref role="1XX52x" to="wq2x:6E2cNiboHlA" resolve="BodyBlock" />
@@ -4231,36 +4221,40 @@
           </node>
         </node>
       </node>
-      <node concept="3EZMnI" id="1L74NXFNJ0S" role="3EZMnx">
-        <node concept="VPM3Z" id="1L74NXFNJ0U" role="3F10Kt">
-          <property role="VOm3f" value="false" />
+      <node concept="3F0ifn" id="1L74NXFNj3F" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
+      </node>
+      <node concept="3F2HdR" id="1L74NXFNj7x" role="3EZMnx">
+        <property role="1cu_pB" value="gtguBGO/firstEditableCell" />
+        <ref role="1NtTu8" to="wq2x:JOGAOsxaC4" resolve="override" />
+        <node concept="l2Vlx" id="1L74NXFNj7z" role="2czzBx" />
+        <node concept="lj46D" id="1L74NXFNj9o" role="3F10Kt">
+          <property role="VOm3f" value="true" />
         </node>
-        <node concept="l2Vlx" id="1L74NXFNJ0X" role="2iSdaV" />
-        <node concept="3F0ifn" id="1L74NXFNj3F" role="3EZMnx">
-          <property role="3F0ifm" value="(" />
-          <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
-        </node>
-        <node concept="3F2HdR" id="1L74NXFNj7x" role="3EZMnx">
-          <ref role="1NtTu8" to="wq2x:JOGAOsxaC4" resolve="override" />
-          <node concept="l2Vlx" id="1L74NXFNj7z" role="2czzBx" />
-          <node concept="lj46D" id="1L74NXFNj9o" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="2o9xnK" id="1L74NXFPnXQ" role="2gpyvW">
-            <node concept="3clFbS" id="1L74NXFPnXR" role="2VODD2">
-              <node concept="3clFbF" id="1L74NXFPoax" role="3cqZAp">
-                <node concept="Xl_RD" id="1L74NXFPoaw" role="3clFbG" />
-              </node>
+        <node concept="2o9xnK" id="1L74NXFPnXQ" role="2gpyvW">
+          <node concept="3clFbS" id="1L74NXFPnXR" role="2VODD2">
+            <node concept="3clFbF" id="1L74NXFPoax" role="3cqZAp">
+              <node concept="Xl_RD" id="1L74NXFPoaw" role="3clFbG" />
             </node>
           </node>
-          <node concept="3F0ifn" id="Lu45F8B7eI" role="2czzBI">
-            <property role="3F0ifm" value="" />
+        </node>
+        <node concept="3F0ifn" id="Lu45F8B7eI" role="2czzBI">
+          <property role="3F0ifm" value="" />
+          <node concept="VPM3Z" id="1PN9XOI$Pis" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="VPxyj" id="1PN9XOI$Pit" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="34QqEe" id="1PN9XOI$Piu" role="3F10Kt">
+            <property role="VOm3f" value="true" />
           </node>
         </node>
-        <node concept="3F0ifn" id="1L74NXFNj3T" role="3EZMnx">
-          <property role="3F0ifm" value=")" />
-          <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
-        </node>
+      </node>
+      <node concept="3F0ifn" id="1L74NXFNj3T" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
       </node>
     </node>
   </node>
@@ -5862,34 +5856,6 @@
     <ref role="aqKnT" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
     <node concept="22hDWj" id="2TBKtozZDUR" role="22hAXT" />
   </node>
-  <node concept="3ICUPy" id="59P$gGg1q2o">
-    <ref role="aqKnT" to="wq2x:59P$gGfKABp" resolve="ItemLogicalClause" />
-    <node concept="22hDWj" id="2TBKtozZDUS" role="22hAXT" />
-    <node concept="1Qtc8_" id="59P$gGfME5G" role="IW6Ez">
-      <node concept="3cWJ9i" id="59P$gGfME5K" role="1Qtc8$">
-        <node concept="CtIbL" id="59P$gGfME5M" role="CtIbM">
-          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
-        </node>
-      </node>
-      <node concept="ulPW2" id="59P$gGg2tE2" role="1Qtc8A">
-        <node concept="2kknPI" id="59P$gGg2tE8" role="2ks2uz">
-          <ref role="2kkw0f" node="59P$gGg0n8Y" resolve="ItemLogicalClause_right" />
-        </node>
-      </node>
-    </node>
-    <node concept="1Qtc8_" id="59P$gGgcyoq" role="IW6Ez">
-      <node concept="ulPW2" id="59P$gGgcyoD" role="1Qtc8A">
-        <node concept="2kknPI" id="59P$gGgcyoE" role="2ks2uz">
-          <ref role="2kkw0f" node="59P$gGgcxm3" resolve="ItemLogicalClause_left" />
-        </node>
-      </node>
-      <node concept="3cWJ9i" id="59P$gGgcyoz" role="1Qtc8$">
-        <node concept="CtIbL" id="59P$gGgcyo_" role="CtIbM">
-          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="3ICUPy" id="JOGAOsxkwf">
     <ref role="aqKnT" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
     <node concept="22hDWj" id="2TBKtozZDUT" role="22hAXT" />
@@ -6285,318 +6251,6 @@
       </node>
     </node>
   </node>
-  <node concept="22mcaB" id="59P$gGg0n8Y">
-    <ref role="aqKnT" to="wq2x:59P$gGfKABp" resolve="ItemLogicalClause" />
-    <node concept="22hDWg" id="2TBKtozZDUX" role="22hAXT">
-      <property role="TrG5h" value="ItemLogicalClause_right" />
-    </node>
-    <node concept="3eGOop" id="59P$gGfKG70" role="3ft7WO">
-      <ref role="3EoQqy" to="wq2x:20Ay2VefOqF" resolve="LogicalClause" />
-      <node concept="ucgPf" id="59P$gGfKG72" role="3aKz83">
-        <node concept="3clFbS" id="59P$gGfKG74" role="2VODD2">
-          <node concept="3cpWs8" id="59P$gGfL6Ta" role="3cqZAp">
-            <node concept="3cpWsn" id="59P$gGfL6Tb" role="3cpWs9">
-              <property role="TrG5h" value="clc" />
-              <node concept="3Tqbb2" id="59P$gGfL6SG" role="1tU5fm">
-                <ref role="ehGHo" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
-              </node>
-              <node concept="2OqwBi" id="59P$gGfL6Tc" role="33vP2m">
-                <node concept="1yR$tW" id="59P$gGfL6Td" role="2Oq$k0" />
-                <node concept="2DeJnW" id="59P$gGfL6Te" role="2OqNvi">
-                  <ref role="1_rbq0" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs8" id="59P$gGfL4k5" role="3cqZAp">
-            <node concept="3cpWsn" id="59P$gGfL4k6" role="3cpWs9">
-              <property role="TrG5h" value="eqc" />
-              <node concept="3Tqbb2" id="59P$gGfL4jN" role="1tU5fm">
-                <ref role="ehGHo" to="wq2x:1CcQBrQdzwG" resolve="EqualsConstraint" />
-              </node>
-              <node concept="2OqwBi" id="59P$gGfL7BV" role="33vP2m">
-                <node concept="2OqwBi" id="59P$gGfL7bb" role="2Oq$k0">
-                  <node concept="37vLTw" id="59P$gGfL6Tf" role="2Oq$k0">
-                    <ref role="3cqZAo" node="59P$gGfL6Tb" resolve="clc" />
-                  </node>
-                  <node concept="3TrEf2" id="59P$gGfL7rb" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:20Ay2VefOBA" resolve="constraint" />
-                  </node>
-                </node>
-                <node concept="2DeJnY" id="59P$gGfL7O1" role="2OqNvi">
-                  <ref role="1A9B2P" to="wq2x:1CcQBrQdzwG" resolve="EqualsConstraint" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="59P$gGfL3Ir" role="3cqZAp">
-            <node concept="2OqwBi" id="59P$gGfL4R6" role="3clFbG">
-              <node concept="2OqwBi" id="59P$gGfL4xX" role="2Oq$k0">
-                <node concept="37vLTw" id="59P$gGfL4ka" role="2Oq$k0">
-                  <ref role="3cqZAo" node="59P$gGfL4k6" resolve="eqc" />
-                </node>
-                <node concept="3TrEf2" id="59P$gGfL4GQ" role="2OqNvi">
-                  <ref role="3Tt5mk" to="wq2x:1CcQBrQdzxt" resolve="left" />
-                </node>
-              </node>
-              <node concept="2oxUTD" id="59P$gGfL55R" role="2OqNvi">
-                <node concept="2OqwBi" id="59P$gGfL672" role="2oxUTC">
-                  <node concept="2OqwBi" id="59P$gGfL5r7" role="2Oq$k0">
-                    <node concept="1yR$tW" id="59P$gGfL59N" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="59P$gGfL5Wq" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:59P$gGfKABq" resolve="item" />
-                    </node>
-                  </node>
-                  <node concept="3YRAZt" id="59P$gGfL6oU" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="59P$gGfL6$_" role="3cqZAp">
-            <node concept="37vLTw" id="59P$gGfL84h" role="3clFbG">
-              <ref role="3cqZAo" node="59P$gGfL6Tb" resolve="clc" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="16NfWO" id="59P$gGfKGbA" role="upBLP">
-        <node concept="2h3Zct" id="59P$gGfKUDx" role="16NeZM">
-          <property role="2h4Kg1" value="==" />
-        </node>
-      </node>
-    </node>
-    <node concept="3eGOop" id="59P$gGfKUD$" role="3ft7WO">
-      <ref role="3EoQqy" to="wq2x:20Ay2VefOqF" resolve="LogicalClause" />
-      <node concept="ucgPf" id="59P$gGfKUD_" role="3aKz83">
-        <node concept="3clFbS" id="59P$gGfKUDA" role="2VODD2">
-          <node concept="3cpWs8" id="59P$gGfL8AS" role="3cqZAp">
-            <node concept="3cpWsn" id="59P$gGfL8AT" role="3cpWs9">
-              <property role="TrG5h" value="clc" />
-              <node concept="3Tqbb2" id="59P$gGfL8AU" role="1tU5fm">
-                <ref role="ehGHo" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
-              </node>
-              <node concept="2OqwBi" id="59P$gGfL8AV" role="33vP2m">
-                <node concept="1yR$tW" id="59P$gGfL8AW" role="2Oq$k0" />
-                <node concept="2DeJnW" id="59P$gGfL8AX" role="2OqNvi">
-                  <ref role="1_rbq0" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs8" id="59P$gGfL8AY" role="3cqZAp">
-            <node concept="3cpWsn" id="59P$gGfL8AZ" role="3cpWs9">
-              <property role="TrG5h" value="uc" />
-              <node concept="3Tqbb2" id="59P$gGfL8B0" role="1tU5fm">
-                <ref role="ehGHo" to="wq2x:6p0DfM0oBcI" resolve="UnifiesConstraint" />
-              </node>
-              <node concept="2OqwBi" id="59P$gGfL8B1" role="33vP2m">
-                <node concept="2OqwBi" id="59P$gGfL8B2" role="2Oq$k0">
-                  <node concept="37vLTw" id="59P$gGfL8B3" role="2Oq$k0">
-                    <ref role="3cqZAo" node="59P$gGfL8AT" resolve="clc" />
-                  </node>
-                  <node concept="3TrEf2" id="59P$gGfL8B4" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:20Ay2VefOBA" resolve="constraint" />
-                  </node>
-                </node>
-                <node concept="2DeJnY" id="59P$gGfL8B5" role="2OqNvi">
-                  <ref role="1A9B2P" to="wq2x:6p0DfM0oBcI" resolve="UnifiesConstraint" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="59P$gGfL8B6" role="3cqZAp">
-            <node concept="2OqwBi" id="59P$gGfL8B7" role="3clFbG">
-              <node concept="2OqwBi" id="59P$gGfL8B8" role="2Oq$k0">
-                <node concept="37vLTw" id="59P$gGfL8B9" role="2Oq$k0">
-                  <ref role="3cqZAo" node="59P$gGfL8AZ" resolve="uc" />
-                </node>
-                <node concept="3TrEf2" id="59P$gGfL9Ds" role="2OqNvi">
-                  <ref role="3Tt5mk" to="wq2x:6p0DfM0oEeG" resolve="assignee" />
-                </node>
-              </node>
-              <node concept="2oxUTD" id="59P$gGfL8Bb" role="2OqNvi">
-                <node concept="2OqwBi" id="59P$gGfL8Bc" role="2oxUTC">
-                  <node concept="2OqwBi" id="59P$gGfL8Bd" role="2Oq$k0">
-                    <node concept="1yR$tW" id="59P$gGfL8Be" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="59P$gGfL8Bf" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:59P$gGfKABq" resolve="item" />
-                    </node>
-                  </node>
-                  <node concept="3YRAZt" id="59P$gGfL8Bg" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="59P$gGfL8Bh" role="3cqZAp">
-            <node concept="37vLTw" id="59P$gGfL8Bi" role="3clFbG">
-              <ref role="3cqZAo" node="59P$gGfL8AT" resolve="clc" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="16NfWO" id="59P$gGfKUDC" role="upBLP">
-        <node concept="2h3Zct" id="59P$gGfKUDD" role="16NeZM">
-          <property role="2h4Kg1" value="=" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="22mcaB" id="59P$gGgcxm3">
-    <ref role="aqKnT" to="wq2x:59P$gGfKABp" resolve="ItemLogicalClause" />
-    <node concept="22hDWg" id="2TBKtozZDUY" role="22hAXT">
-      <property role="TrG5h" value="ItemLogicalClause_left" />
-    </node>
-    <node concept="3eGOop" id="59P$gGgcxm4" role="3ft7WO">
-      <ref role="3EoQqy" to="wq2x:20Ay2VefOqF" resolve="LogicalClause" />
-      <node concept="ucgPf" id="59P$gGgcxm5" role="3aKz83">
-        <node concept="3clFbS" id="59P$gGgcxm6" role="2VODD2">
-          <node concept="3cpWs8" id="59P$gGgcxm7" role="3cqZAp">
-            <node concept="3cpWsn" id="59P$gGgcxm8" role="3cpWs9">
-              <property role="TrG5h" value="clc" />
-              <node concept="3Tqbb2" id="59P$gGgcxm9" role="1tU5fm">
-                <ref role="ehGHo" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
-              </node>
-              <node concept="2OqwBi" id="59P$gGgcxma" role="33vP2m">
-                <node concept="1yR$tW" id="59P$gGgcxmb" role="2Oq$k0" />
-                <node concept="2DeJnW" id="59P$gGgcxmc" role="2OqNvi">
-                  <ref role="1_rbq0" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs8" id="59P$gGgcxmd" role="3cqZAp">
-            <node concept="3cpWsn" id="59P$gGgcxme" role="3cpWs9">
-              <property role="TrG5h" value="eqc" />
-              <node concept="3Tqbb2" id="59P$gGgcxmf" role="1tU5fm">
-                <ref role="ehGHo" to="wq2x:1CcQBrQdzwG" resolve="EqualsConstraint" />
-              </node>
-              <node concept="2OqwBi" id="59P$gGgcxmg" role="33vP2m">
-                <node concept="2OqwBi" id="59P$gGgcxmh" role="2Oq$k0">
-                  <node concept="37vLTw" id="59P$gGgcxmi" role="2Oq$k0">
-                    <ref role="3cqZAo" node="59P$gGgcxm8" resolve="clc" />
-                  </node>
-                  <node concept="3TrEf2" id="59P$gGgcxmj" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:20Ay2VefOBA" resolve="constraint" />
-                  </node>
-                </node>
-                <node concept="2DeJnY" id="59P$gGgcxmk" role="2OqNvi">
-                  <ref role="1A9B2P" to="wq2x:1CcQBrQdzwG" resolve="EqualsConstraint" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="59P$gGgcxml" role="3cqZAp">
-            <node concept="2OqwBi" id="59P$gGgcxmm" role="3clFbG">
-              <node concept="2OqwBi" id="59P$gGgcxmn" role="2Oq$k0">
-                <node concept="37vLTw" id="59P$gGgcxmo" role="2Oq$k0">
-                  <ref role="3cqZAo" node="59P$gGgcxme" resolve="eqc" />
-                </node>
-                <node concept="3TrEf2" id="59P$gGgcxQO" role="2OqNvi">
-                  <ref role="3Tt5mk" to="wq2x:1CcQBrQdzxv" resolve="right" />
-                </node>
-              </node>
-              <node concept="2oxUTD" id="59P$gGgcxmq" role="2OqNvi">
-                <node concept="2OqwBi" id="59P$gGgcxmr" role="2oxUTC">
-                  <node concept="2OqwBi" id="59P$gGgcxms" role="2Oq$k0">
-                    <node concept="1yR$tW" id="59P$gGgcxmt" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="59P$gGgcxmu" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:59P$gGfKABq" resolve="item" />
-                    </node>
-                  </node>
-                  <node concept="3YRAZt" id="59P$gGgcxmv" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="59P$gGgcxmw" role="3cqZAp">
-            <node concept="37vLTw" id="59P$gGgcxmx" role="3clFbG">
-              <ref role="3cqZAo" node="59P$gGgcxm8" resolve="clc" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="16NfWO" id="59P$gGgcxmy" role="upBLP">
-        <node concept="2h3Zct" id="59P$gGgcxmz" role="16NeZM">
-          <property role="2h4Kg1" value="==" />
-        </node>
-      </node>
-    </node>
-    <node concept="3eGOop" id="59P$gGgcxm$" role="3ft7WO">
-      <ref role="3EoQqy" to="wq2x:20Ay2VefOqF" resolve="LogicalClause" />
-      <node concept="ucgPf" id="59P$gGgcxm_" role="3aKz83">
-        <node concept="3clFbS" id="59P$gGgcxmA" role="2VODD2">
-          <node concept="3cpWs8" id="59P$gGgcxmB" role="3cqZAp">
-            <node concept="3cpWsn" id="59P$gGgcxmC" role="3cpWs9">
-              <property role="TrG5h" value="clc" />
-              <node concept="3Tqbb2" id="59P$gGgcxmD" role="1tU5fm">
-                <ref role="ehGHo" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
-              </node>
-              <node concept="2OqwBi" id="59P$gGgcxmE" role="33vP2m">
-                <node concept="1yR$tW" id="59P$gGgcxmF" role="2Oq$k0" />
-                <node concept="2DeJnW" id="59P$gGgcxmG" role="2OqNvi">
-                  <ref role="1_rbq0" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs8" id="59P$gGgcxmH" role="3cqZAp">
-            <node concept="3cpWsn" id="59P$gGgcxmI" role="3cpWs9">
-              <property role="TrG5h" value="uc" />
-              <node concept="3Tqbb2" id="59P$gGgcxmJ" role="1tU5fm">
-                <ref role="ehGHo" to="wq2x:6p0DfM0oBcI" resolve="UnifiesConstraint" />
-              </node>
-              <node concept="2OqwBi" id="59P$gGgcxmK" role="33vP2m">
-                <node concept="2OqwBi" id="59P$gGgcxmL" role="2Oq$k0">
-                  <node concept="37vLTw" id="59P$gGgcxmM" role="2Oq$k0">
-                    <ref role="3cqZAo" node="59P$gGgcxmC" resolve="clc" />
-                  </node>
-                  <node concept="3TrEf2" id="59P$gGgcxmN" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:20Ay2VefOBA" resolve="constraint" />
-                  </node>
-                </node>
-                <node concept="2DeJnY" id="59P$gGgcxmO" role="2OqNvi">
-                  <ref role="1A9B2P" to="wq2x:6p0DfM0oBcI" resolve="UnifiesConstraint" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="59P$gGgcxmP" role="3cqZAp">
-            <node concept="2OqwBi" id="59P$gGgcxmQ" role="3clFbG">
-              <node concept="2OqwBi" id="59P$gGgcxmR" role="2Oq$k0">
-                <node concept="37vLTw" id="59P$gGgcxmS" role="2Oq$k0">
-                  <ref role="3cqZAo" node="59P$gGgcxmI" resolve="uc" />
-                </node>
-                <node concept="3TrEf2" id="59P$gGgcy5l" role="2OqNvi">
-                  <ref role="3Tt5mk" to="wq2x:6p0DfM0oEna" resolve="value" />
-                </node>
-              </node>
-              <node concept="2oxUTD" id="59P$gGgcxmU" role="2OqNvi">
-                <node concept="2OqwBi" id="59P$gGgcxmV" role="2oxUTC">
-                  <node concept="2OqwBi" id="59P$gGgcxmW" role="2Oq$k0">
-                    <node concept="1yR$tW" id="59P$gGgcxmX" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="59P$gGgcxmY" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:59P$gGfKABq" resolve="item" />
-                    </node>
-                  </node>
-                  <node concept="3YRAZt" id="59P$gGgcxmZ" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="59P$gGgcxn0" role="3cqZAp">
-            <node concept="37vLTw" id="59P$gGgcxn1" role="3clFbG">
-              <ref role="3cqZAo" node="59P$gGgcxmC" resolve="clc" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="16NfWO" id="59P$gGgcxn2" role="upBLP">
-        <node concept="2h3Zct" id="59P$gGgcxn3" role="16NeZM">
-          <property role="2h4Kg1" value="=" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="22mcaB" id="5itBwM5nh5s">
     <ref role="aqKnT" to="tpee:fz3vP1J" resolve="Expression" />
     <node concept="22hDWg" id="2TBKtozZDUZ" role="22hAXT">
@@ -6725,9 +6379,6 @@
         </node>
       </node>
       <node concept="2VfDsV" id="4hPXq9JmeBe" role="3ft5RZ" />
-      <node concept="3ft5Ry" id="4hPXq9JmeBf" role="3ft5RZ">
-        <ref role="4PJHt" to="wq2x:4EfgX2EvF4i" resolve="ExpressionConstraint" />
-      </node>
     </node>
   </node>
   <node concept="22mcaB" id="4nIWweBNZTp">
@@ -7009,75 +6660,6 @@
       </node>
     </node>
   </node>
-  <node concept="22mcaB" id="59P$gGfZMFw">
-    <ref role="aqKnT" to="wq2x:59P$gGfKABp" resolve="ItemLogicalClause" />
-    <node concept="22hDWj" id="2TBKtozZDVa" role="22hAXT" />
-    <node concept="3N5dw7" id="59P$gGgaPq7" role="3ft7WO">
-      <node concept="3N5aqt" id="59P$gGgaPq9" role="3Na0zg">
-        <node concept="3clFbS" id="59P$gGgaPqb" role="2VODD2">
-          <node concept="3cpWs8" id="59P$gGgaPut" role="3cqZAp">
-            <node concept="3cpWsn" id="59P$gGgaPuu" role="3cpWs9">
-              <property role="TrG5h" value="ilc" />
-              <node concept="3Tqbb2" id="59P$gGgaPuv" role="1tU5fm">
-                <ref role="ehGHo" to="wq2x:59P$gGfKABp" resolve="ItemLogicalClause" />
-              </node>
-              <node concept="2ShNRf" id="5HLeEcfxdDw" role="33vP2m">
-                <node concept="3zrR0B" id="5HLeEcfxdZQ" role="2ShVmc">
-                  <node concept="3Tqbb2" id="5HLeEcfxdZS" role="3zrR0E">
-                    <ref role="ehGHo" to="wq2x:59P$gGfKABp" resolve="ItemLogicalClause" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="59P$gGgaPxe" role="3cqZAp">
-            <node concept="2OqwBi" id="59P$gGgaPxf" role="3clFbG">
-              <node concept="2OqwBi" id="59P$gGgaPxg" role="2Oq$k0">
-                <node concept="37vLTw" id="59P$gGgaPxh" role="2Oq$k0">
-                  <ref role="3cqZAo" node="59P$gGgaPuu" resolve="ilc" />
-                </node>
-                <node concept="3TrEf2" id="59P$gGgaPxi" role="2OqNvi">
-                  <ref role="3Tt5mk" to="wq2x:59P$gGfKABq" resolve="item" />
-                </node>
-              </node>
-              <node concept="2oxUTD" id="59P$gGgaPxj" role="2OqNvi">
-                <node concept="3N4pyC" id="59P$gGgaPQn" role="2oxUTC" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="59P$gGgaPCl" role="3cqZAp">
-            <node concept="37vLTw" id="59P$gGgaPCj" role="3clFbG">
-              <ref role="3cqZAo" node="59P$gGgaPuu" resolve="ilc" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2kknPJ" id="59P$gGgaPrJ" role="2klrvf">
-        <ref role="2ZyFGn" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
-      </node>
-      <node concept="16NL3D" id="5HLeEceSAQT" role="upBLP">
-        <node concept="16Na2f" id="5HLeEceSAQU" role="16NL3A">
-          <node concept="3clFbS" id="5HLeEceSAQV" role="2VODD2">
-            <node concept="3clFbF" id="5HLeEceSAVZ" role="3cqZAp">
-              <node concept="3fqX7Q" id="5HLeEceSCn3" role="3clFbG">
-                <node concept="2OqwBi" id="5HLeEceSCn5" role="3fr31v">
-                  <node concept="2OqwBi" id="5HLeEceSCn6" role="2Oq$k0">
-                    <node concept="3jrdc4" id="5HLeEceSCn7" role="2Oq$k0" />
-                    <node concept="3j5asz" id="5HLeEceSCn8" role="2OqNvi" />
-                  </node>
-                  <node concept="2Zo12i" id="5HLeEceSCn9" role="2OqNvi">
-                    <node concept="chp4Y" id="5HLeEceU1GB" role="2Zo12j">
-                      <ref role="cht4Q" to="wq2x:1HWyn8iLEBo" resolve="LateParameter" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="22mcaB" id="5itBwM6esH8">
     <ref role="aqKnT" to="wq2x:5itBwM6cWQh" resolve="ExpandMacroPrototype" />
     <node concept="22hDWj" id="2TBKtozZDVb" role="22hAXT" />
@@ -7636,39 +7218,36 @@
       <node concept="3eGOop" id="7XmdqtdOhD8" role="2$S_pN">
         <node concept="ucgPf" id="7XmdqtdOhDa" role="3aKz83">
           <node concept="3clFbS" id="7XmdqtdOhDc" role="2VODD2">
-            <node concept="3cpWs8" id="7XmdqtdOxrU" role="3cqZAp">
-              <node concept="3cpWsn" id="7XmdqtdOxrV" role="3cpWs9">
-                <property role="TrG5h" value="df" />
-                <node concept="3Tqbb2" id="7XmdqtdOxrT" role="1tU5fm">
-                  <ref role="ehGHo" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
-                </node>
-                <node concept="2ShNRf" id="7XmdqtdOxrW" role="33vP2m">
-                  <node concept="3zrR0B" id="7XmdqtdOxrX" role="2ShVmc">
-                    <node concept="3Tqbb2" id="7XmdqtdOxrY" role="3zrR0E">
-                      <ref role="ehGHo" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
+            <node concept="3clFbF" id="1PN9XOIvOCk" role="3cqZAp">
+              <node concept="2pJPEk" id="1PN9XOIvOCg" role="3clFbG">
+                <node concept="2pJPED" id="1PN9XOIvOCi" role="2pJPEn">
+                  <ref role="2pJxaS" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
+                  <node concept="2pIpSj" id="1PN9XOIvOIY" role="2pJxcM">
+                    <ref role="2pIpSl" to="wq2x:JOGAOsxaC6" resolve="decl" />
+                    <node concept="36biLy" id="1PN9XOIvOM1" role="28nt2d">
+                      <node concept="2ZBlsa" id="1PN9XOIvOP6" role="36biLW" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="7XmdqtdOwqy" role="3cqZAp">
-              <node concept="2OqwBi" id="7XmdqtdOy$8" role="3clFbG">
-                <node concept="2OqwBi" id="7XmdqtdOxL6" role="2Oq$k0">
-                  <node concept="37vLTw" id="7XmdqtdOxrZ" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7XmdqtdOxrV" resolve="df" />
+          </node>
+        </node>
+        <node concept="16NfWO" id="1PN9XOIFfEJ" role="upBLP">
+          <node concept="uGdhv" id="1PN9XOIFfHg" role="16NeZM">
+            <node concept="3clFbS" id="1PN9XOIFfHi" role="2VODD2">
+              <node concept="3clFbF" id="1PN9XOIFfMl" role="3cqZAp">
+                <node concept="3cpWs3" id="1PN9XOIFfZt" role="3clFbG">
+                  <node concept="Xl_RD" id="1PN9XOIFfZx" role="3uHU7w">
+                    <property role="Xl_RC" value="()" />
                   </node>
-                  <node concept="3TrEf2" id="JOGAOsy1U2" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:JOGAOsxaC6" resolve="decl" />
+                  <node concept="2OqwBi" id="1PN9XOIGwR$" role="3uHU7B">
+                    <node concept="2ZBlsa" id="1PN9XOIFfMk" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="1PN9XOIGxsv" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
                   </node>
                 </node>
-                <node concept="2oxUTD" id="7XmdqtdOyM9" role="2OqNvi">
-                  <node concept="2ZBlsa" id="7XmdqtdOzev" role="2oxUTC" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="7XmdqtdOzwb" role="3cqZAp">
-              <node concept="37vLTw" id="7XmdqtdOzw9" role="3clFbG">
-                <ref role="3cqZAo" node="7XmdqtdOxrV" resolve="df" />
               </node>
             </node>
           </node>
@@ -8794,9 +8373,9 @@
           <node concept="uGdhv" id="1PN9XOI9BD_" role="16NeZM">
             <node concept="3clFbS" id="1PN9XOI9BDB" role="2VODD2">
               <node concept="3clFbF" id="1PN9XOI9BIq" role="3cqZAp">
-                <node concept="3cpWs3" id="1PN9XOIfdQh" role="3clFbG">
-                  <node concept="Xl_RD" id="1PN9XOIfdQl" role="3uHU7w">
-                    <property role="Xl_RC" value="(" />
+                <node concept="3cpWs3" id="1PN9XOIFfvH" role="3clFbG">
+                  <node concept="Xl_RD" id="1PN9XOIFfvL" role="3uHU7w">
+                    <property role="Xl_RC" value="()" />
                   </node>
                   <node concept="2OqwBi" id="1PN9XOI9BTv" role="3uHU7B">
                     <node concept="2ZBlsa" id="1PN9XOI9BIp" role="2Oq$k0" />
@@ -8946,5 +8525,424 @@
       </node>
     </node>
   </node>
+  <node concept="22mcaB" id="59P$gGg0n8Y">
+    <ref role="aqKnT" to="wq2x:59P$gGfKABp" resolve="ItemLogicalClause" />
+    <node concept="22hDWg" id="2TBKtozZDUX" role="22hAXT">
+      <property role="TrG5h" value="ItemLogicalClause_right" />
+    </node>
+    <node concept="3eGOop" id="59P$gGfKG70" role="3ft7WO">
+      <ref role="3EoQqy" to="wq2x:20Ay2VefOqF" resolve="LogicalClause" />
+      <node concept="ucgPf" id="59P$gGfKG72" role="3aKz83">
+        <node concept="3clFbS" id="59P$gGfKG74" role="2VODD2">
+          <node concept="3cpWs8" id="59P$gGfL6Ta" role="3cqZAp">
+            <node concept="3cpWsn" id="59P$gGfL6Tb" role="3cpWs9">
+              <property role="TrG5h" value="clc" />
+              <node concept="3Tqbb2" id="59P$gGfL6SG" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
+              </node>
+              <node concept="2OqwBi" id="59P$gGfL6Tc" role="33vP2m">
+                <node concept="1yR$tW" id="59P$gGfL6Td" role="2Oq$k0" />
+                <node concept="2DeJnW" id="59P$gGfL6Te" role="2OqNvi">
+                  <ref role="1_rbq0" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="59P$gGfL4k5" role="3cqZAp">
+            <node concept="3cpWsn" id="59P$gGfL4k6" role="3cpWs9">
+              <property role="TrG5h" value="eqc" />
+              <node concept="3Tqbb2" id="59P$gGfL4jN" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:1CcQBrQdzwG" resolve="EqualsConstraint" />
+              </node>
+              <node concept="2OqwBi" id="59P$gGfL7BV" role="33vP2m">
+                <node concept="2OqwBi" id="59P$gGfL7bb" role="2Oq$k0">
+                  <node concept="37vLTw" id="59P$gGfL6Tf" role="2Oq$k0">
+                    <ref role="3cqZAo" node="59P$gGfL6Tb" resolve="clc" />
+                  </node>
+                  <node concept="3TrEf2" id="59P$gGfL7rb" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:20Ay2VefOBA" resolve="constraint" />
+                  </node>
+                </node>
+                <node concept="2DeJnY" id="59P$gGfL7O1" role="2OqNvi">
+                  <ref role="1A9B2P" to="wq2x:1CcQBrQdzwG" resolve="EqualsConstraint" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="59P$gGfL3Ir" role="3cqZAp">
+            <node concept="2OqwBi" id="59P$gGfL4R6" role="3clFbG">
+              <node concept="2OqwBi" id="59P$gGfL4xX" role="2Oq$k0">
+                <node concept="37vLTw" id="59P$gGfL4ka" role="2Oq$k0">
+                  <ref role="3cqZAo" node="59P$gGfL4k6" resolve="eqc" />
+                </node>
+                <node concept="3TrEf2" id="59P$gGfL4GQ" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:1CcQBrQdzxt" resolve="left" />
+                </node>
+              </node>
+              <node concept="2oxUTD" id="59P$gGfL55R" role="2OqNvi">
+                <node concept="2OqwBi" id="59P$gGfL672" role="2oxUTC">
+                  <node concept="2OqwBi" id="59P$gGfL5r7" role="2Oq$k0">
+                    <node concept="1yR$tW" id="59P$gGfL59N" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="59P$gGfL5Wq" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:59P$gGfKABq" resolve="item" />
+                    </node>
+                  </node>
+                  <node concept="3YRAZt" id="59P$gGfL6oU" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="59P$gGfL6$_" role="3cqZAp">
+            <node concept="37vLTw" id="59P$gGfL84h" role="3clFbG">
+              <ref role="3cqZAo" node="59P$gGfL6Tb" resolve="clc" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="16NfWO" id="59P$gGfKGbA" role="upBLP">
+        <node concept="2h3Zct" id="59P$gGfKUDx" role="16NeZM">
+          <property role="2h4Kg1" value="==" />
+        </node>
+      </node>
+    </node>
+    <node concept="3eGOop" id="59P$gGfKUD$" role="3ft7WO">
+      <ref role="3EoQqy" to="wq2x:20Ay2VefOqF" resolve="LogicalClause" />
+      <node concept="ucgPf" id="59P$gGfKUD_" role="3aKz83">
+        <node concept="3clFbS" id="59P$gGfKUDA" role="2VODD2">
+          <node concept="3cpWs8" id="59P$gGfL8AS" role="3cqZAp">
+            <node concept="3cpWsn" id="59P$gGfL8AT" role="3cpWs9">
+              <property role="TrG5h" value="clc" />
+              <node concept="3Tqbb2" id="59P$gGfL8AU" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
+              </node>
+              <node concept="2OqwBi" id="59P$gGfL8AV" role="33vP2m">
+                <node concept="1yR$tW" id="59P$gGfL8AW" role="2Oq$k0" />
+                <node concept="2DeJnW" id="59P$gGfL8AX" role="2OqNvi">
+                  <ref role="1_rbq0" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="59P$gGfL8AY" role="3cqZAp">
+            <node concept="3cpWsn" id="59P$gGfL8AZ" role="3cpWs9">
+              <property role="TrG5h" value="uc" />
+              <node concept="3Tqbb2" id="59P$gGfL8B0" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:6p0DfM0oBcI" resolve="UnifiesConstraint" />
+              </node>
+              <node concept="2OqwBi" id="59P$gGfL8B1" role="33vP2m">
+                <node concept="2OqwBi" id="59P$gGfL8B2" role="2Oq$k0">
+                  <node concept="37vLTw" id="59P$gGfL8B3" role="2Oq$k0">
+                    <ref role="3cqZAo" node="59P$gGfL8AT" resolve="clc" />
+                  </node>
+                  <node concept="3TrEf2" id="59P$gGfL8B4" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:20Ay2VefOBA" resolve="constraint" />
+                  </node>
+                </node>
+                <node concept="2DeJnY" id="59P$gGfL8B5" role="2OqNvi">
+                  <ref role="1A9B2P" to="wq2x:6p0DfM0oBcI" resolve="UnifiesConstraint" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="59P$gGfL8B6" role="3cqZAp">
+            <node concept="2OqwBi" id="59P$gGfL8B7" role="3clFbG">
+              <node concept="2OqwBi" id="59P$gGfL8B8" role="2Oq$k0">
+                <node concept="37vLTw" id="59P$gGfL8B9" role="2Oq$k0">
+                  <ref role="3cqZAo" node="59P$gGfL8AZ" resolve="uc" />
+                </node>
+                <node concept="3TrEf2" id="59P$gGfL9Ds" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:6p0DfM0oEeG" resolve="assignee" />
+                </node>
+              </node>
+              <node concept="2oxUTD" id="59P$gGfL8Bb" role="2OqNvi">
+                <node concept="2OqwBi" id="59P$gGfL8Bc" role="2oxUTC">
+                  <node concept="2OqwBi" id="59P$gGfL8Bd" role="2Oq$k0">
+                    <node concept="1yR$tW" id="59P$gGfL8Be" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="59P$gGfL8Bf" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:59P$gGfKABq" resolve="item" />
+                    </node>
+                  </node>
+                  <node concept="3YRAZt" id="59P$gGfL8Bg" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="59P$gGfL8Bh" role="3cqZAp">
+            <node concept="37vLTw" id="59P$gGfL8Bi" role="3clFbG">
+              <ref role="3cqZAo" node="59P$gGfL8AT" resolve="clc" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="16NfWO" id="59P$gGfKUDC" role="upBLP">
+        <node concept="2h3Zct" id="59P$gGfKUDD" role="16NeZM">
+          <property role="2h4Kg1" value="=" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="22mcaB" id="59P$gGfZMFw">
+    <ref role="aqKnT" to="wq2x:59P$gGfKABp" resolve="ItemLogicalClause" />
+    <node concept="22hDWj" id="2TBKtozZDVa" role="22hAXT" />
+    <node concept="3N5dw7" id="59P$gGgaPq7" role="3ft7WO">
+      <node concept="3N5aqt" id="59P$gGgaPq9" role="3Na0zg">
+        <node concept="3clFbS" id="59P$gGgaPqb" role="2VODD2">
+          <node concept="3cpWs8" id="59P$gGgaPut" role="3cqZAp">
+            <node concept="3cpWsn" id="59P$gGgaPuu" role="3cpWs9">
+              <property role="TrG5h" value="ilc" />
+              <node concept="3Tqbb2" id="59P$gGgaPuv" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:59P$gGfKABp" resolve="ItemLogicalClause" />
+              </node>
+              <node concept="2ShNRf" id="5HLeEcfxdDw" role="33vP2m">
+                <node concept="3zrR0B" id="5HLeEcfxdZQ" role="2ShVmc">
+                  <node concept="3Tqbb2" id="5HLeEcfxdZS" role="3zrR0E">
+                    <ref role="ehGHo" to="wq2x:59P$gGfKABp" resolve="ItemLogicalClause" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="59P$gGgaPxe" role="3cqZAp">
+            <node concept="2OqwBi" id="59P$gGgaPxf" role="3clFbG">
+              <node concept="2OqwBi" id="59P$gGgaPxg" role="2Oq$k0">
+                <node concept="37vLTw" id="59P$gGgaPxh" role="2Oq$k0">
+                  <ref role="3cqZAo" node="59P$gGgaPuu" resolve="ilc" />
+                </node>
+                <node concept="3TrEf2" id="59P$gGgaPxi" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:59P$gGfKABq" resolve="item" />
+                </node>
+              </node>
+              <node concept="2oxUTD" id="59P$gGgaPxj" role="2OqNvi">
+                <node concept="3N4pyC" id="59P$gGgaPQn" role="2oxUTC" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="59P$gGgaPCl" role="3cqZAp">
+            <node concept="37vLTw" id="59P$gGgaPCj" role="3clFbG">
+              <ref role="3cqZAo" node="59P$gGgaPuu" resolve="ilc" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2kknPJ" id="59P$gGgaPrJ" role="2klrvf">
+        <ref role="2ZyFGn" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
+      </node>
+      <node concept="16NL3D" id="5HLeEceSAQT" role="upBLP">
+        <node concept="16Na2f" id="5HLeEceSAQU" role="16NL3A">
+          <node concept="3clFbS" id="5HLeEceSAQV" role="2VODD2">
+            <node concept="3clFbF" id="5HLeEceSAVZ" role="3cqZAp">
+              <node concept="3fqX7Q" id="5HLeEceSCn3" role="3clFbG">
+                <node concept="2OqwBi" id="5HLeEceSCn5" role="3fr31v">
+                  <node concept="2OqwBi" id="5HLeEceSCn6" role="2Oq$k0">
+                    <node concept="3jrdc4" id="5HLeEceSCn7" role="2Oq$k0" />
+                    <node concept="3j5asz" id="5HLeEceSCn8" role="2OqNvi" />
+                  </node>
+                  <node concept="2Zo12i" id="5HLeEceSCn9" role="2OqNvi">
+                    <node concept="chp4Y" id="5HLeEceU1GB" role="2Zo12j">
+                      <ref role="cht4Q" to="wq2x:1HWyn8iLEBo" resolve="LateParameter" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="22mcaB" id="59P$gGgcxm3">
+    <ref role="aqKnT" to="wq2x:59P$gGfKABp" resolve="ItemLogicalClause" />
+    <node concept="22hDWg" id="2TBKtozZDUY" role="22hAXT">
+      <property role="TrG5h" value="ItemLogicalClause_left" />
+    </node>
+    <node concept="3eGOop" id="59P$gGgcxm4" role="3ft7WO">
+      <ref role="3EoQqy" to="wq2x:20Ay2VefOqF" resolve="LogicalClause" />
+      <node concept="ucgPf" id="59P$gGgcxm5" role="3aKz83">
+        <node concept="3clFbS" id="59P$gGgcxm6" role="2VODD2">
+          <node concept="3cpWs8" id="59P$gGgcxm7" role="3cqZAp">
+            <node concept="3cpWsn" id="59P$gGgcxm8" role="3cpWs9">
+              <property role="TrG5h" value="clc" />
+              <node concept="3Tqbb2" id="59P$gGgcxm9" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
+              </node>
+              <node concept="2OqwBi" id="59P$gGgcxma" role="33vP2m">
+                <node concept="1yR$tW" id="59P$gGgcxmb" role="2Oq$k0" />
+                <node concept="2DeJnW" id="59P$gGgcxmc" role="2OqNvi">
+                  <ref role="1_rbq0" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="59P$gGgcxmd" role="3cqZAp">
+            <node concept="3cpWsn" id="59P$gGgcxme" role="3cpWs9">
+              <property role="TrG5h" value="eqc" />
+              <node concept="3Tqbb2" id="59P$gGgcxmf" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:1CcQBrQdzwG" resolve="EqualsConstraint" />
+              </node>
+              <node concept="2OqwBi" id="59P$gGgcxmg" role="33vP2m">
+                <node concept="2OqwBi" id="59P$gGgcxmh" role="2Oq$k0">
+                  <node concept="37vLTw" id="59P$gGgcxmi" role="2Oq$k0">
+                    <ref role="3cqZAo" node="59P$gGgcxm8" resolve="clc" />
+                  </node>
+                  <node concept="3TrEf2" id="59P$gGgcxmj" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:20Ay2VefOBA" resolve="constraint" />
+                  </node>
+                </node>
+                <node concept="2DeJnY" id="59P$gGgcxmk" role="2OqNvi">
+                  <ref role="1A9B2P" to="wq2x:1CcQBrQdzwG" resolve="EqualsConstraint" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="59P$gGgcxml" role="3cqZAp">
+            <node concept="2OqwBi" id="59P$gGgcxmm" role="3clFbG">
+              <node concept="2OqwBi" id="59P$gGgcxmn" role="2Oq$k0">
+                <node concept="37vLTw" id="59P$gGgcxmo" role="2Oq$k0">
+                  <ref role="3cqZAo" node="59P$gGgcxme" resolve="eqc" />
+                </node>
+                <node concept="3TrEf2" id="59P$gGgcxQO" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:1CcQBrQdzxv" resolve="right" />
+                </node>
+              </node>
+              <node concept="2oxUTD" id="59P$gGgcxmq" role="2OqNvi">
+                <node concept="2OqwBi" id="59P$gGgcxmr" role="2oxUTC">
+                  <node concept="2OqwBi" id="59P$gGgcxms" role="2Oq$k0">
+                    <node concept="1yR$tW" id="59P$gGgcxmt" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="59P$gGgcxmu" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:59P$gGfKABq" resolve="item" />
+                    </node>
+                  </node>
+                  <node concept="3YRAZt" id="59P$gGgcxmv" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="59P$gGgcxmw" role="3cqZAp">
+            <node concept="37vLTw" id="59P$gGgcxmx" role="3clFbG">
+              <ref role="3cqZAo" node="59P$gGgcxm8" resolve="clc" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="16NfWO" id="59P$gGgcxmy" role="upBLP">
+        <node concept="2h3Zct" id="59P$gGgcxmz" role="16NeZM">
+          <property role="2h4Kg1" value="==" />
+        </node>
+      </node>
+    </node>
+    <node concept="3eGOop" id="59P$gGgcxm$" role="3ft7WO">
+      <ref role="3EoQqy" to="wq2x:20Ay2VefOqF" resolve="LogicalClause" />
+      <node concept="ucgPf" id="59P$gGgcxm_" role="3aKz83">
+        <node concept="3clFbS" id="59P$gGgcxmA" role="2VODD2">
+          <node concept="3cpWs8" id="59P$gGgcxmB" role="3cqZAp">
+            <node concept="3cpWsn" id="59P$gGgcxmC" role="3cpWs9">
+              <property role="TrG5h" value="clc" />
+              <node concept="3Tqbb2" id="59P$gGgcxmD" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
+              </node>
+              <node concept="2OqwBi" id="59P$gGgcxmE" role="33vP2m">
+                <node concept="1yR$tW" id="59P$gGgcxmF" role="2Oq$k0" />
+                <node concept="2DeJnW" id="59P$gGgcxmG" role="2OqNvi">
+                  <ref role="1_rbq0" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="59P$gGgcxmH" role="3cqZAp">
+            <node concept="3cpWsn" id="59P$gGgcxmI" role="3cpWs9">
+              <property role="TrG5h" value="uc" />
+              <node concept="3Tqbb2" id="59P$gGgcxmJ" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:6p0DfM0oBcI" resolve="UnifiesConstraint" />
+              </node>
+              <node concept="2OqwBi" id="59P$gGgcxmK" role="33vP2m">
+                <node concept="2OqwBi" id="59P$gGgcxmL" role="2Oq$k0">
+                  <node concept="37vLTw" id="59P$gGgcxmM" role="2Oq$k0">
+                    <ref role="3cqZAo" node="59P$gGgcxmC" resolve="clc" />
+                  </node>
+                  <node concept="3TrEf2" id="59P$gGgcxmN" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:20Ay2VefOBA" resolve="constraint" />
+                  </node>
+                </node>
+                <node concept="2DeJnY" id="59P$gGgcxmO" role="2OqNvi">
+                  <ref role="1A9B2P" to="wq2x:6p0DfM0oBcI" resolve="UnifiesConstraint" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="59P$gGgcxmP" role="3cqZAp">
+            <node concept="2OqwBi" id="59P$gGgcxmQ" role="3clFbG">
+              <node concept="2OqwBi" id="59P$gGgcxmR" role="2Oq$k0">
+                <node concept="37vLTw" id="59P$gGgcxmS" role="2Oq$k0">
+                  <ref role="3cqZAo" node="59P$gGgcxmI" resolve="uc" />
+                </node>
+                <node concept="3TrEf2" id="59P$gGgcy5l" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:6p0DfM0oEna" resolve="value" />
+                </node>
+              </node>
+              <node concept="2oxUTD" id="59P$gGgcxmU" role="2OqNvi">
+                <node concept="2OqwBi" id="59P$gGgcxmV" role="2oxUTC">
+                  <node concept="2OqwBi" id="59P$gGgcxmW" role="2Oq$k0">
+                    <node concept="1yR$tW" id="59P$gGgcxmX" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="59P$gGgcxmY" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:59P$gGfKABq" resolve="item" />
+                    </node>
+                  </node>
+                  <node concept="3YRAZt" id="59P$gGgcxmZ" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="59P$gGgcxn0" role="3cqZAp">
+            <node concept="37vLTw" id="59P$gGgcxn1" role="3clFbG">
+              <ref role="3cqZAo" node="59P$gGgcxmC" resolve="clc" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="16NfWO" id="59P$gGgcxn2" role="upBLP">
+        <node concept="2h3Zct" id="59P$gGgcxn3" role="16NeZM">
+          <property role="2h4Kg1" value="=" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="24kQdi" id="59P$gGfKFHA">
+    <property role="3GE5qa" value="rule.clause" />
+    <ref role="1XX52x" to="wq2x:59P$gGfKABp" resolve="ItemLogicalClause" />
+    <node concept="3EZMnI" id="59P$gGfKFHP" role="2wV5jI">
+      <node concept="3F1sOY" id="59P$gGfKFHZ" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:59P$gGfKABq" resolve="item" />
+      </node>
+      <node concept="l2Vlx" id="59P$gGfKFHS" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="3ICUPy" id="59P$gGg1q2o">
+    <ref role="aqKnT" to="wq2x:59P$gGfKABp" resolve="ItemLogicalClause" />
+    <node concept="22hDWj" id="2TBKtozZDUS" role="22hAXT" />
+    <node concept="1Qtc8_" id="59P$gGfME5G" role="IW6Ez">
+      <node concept="3cWJ9i" id="59P$gGfME5K" role="1Qtc8$">
+        <node concept="CtIbL" id="59P$gGfME5M" role="CtIbM">
+          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+        </node>
+      </node>
+      <node concept="ulPW2" id="59P$gGg2tE2" role="1Qtc8A">
+        <node concept="2kknPI" id="59P$gGg2tE8" role="2ks2uz">
+          <ref role="2kkw0f" node="59P$gGg0n8Y" resolve="ItemLogicalClause_right" />
+        </node>
+      </node>
+    </node>
+    <node concept="1Qtc8_" id="59P$gGgcyoq" role="IW6Ez">
+      <node concept="ulPW2" id="59P$gGgcyoD" role="1Qtc8A">
+        <node concept="2kknPI" id="59P$gGgcyoE" role="2ks2uz">
+          <ref role="2kkw0f" node="59P$gGgcxm3" resolve="ItemLogicalClause_left" />
+        </node>
+      </node>
+      <node concept="3cWJ9i" id="59P$gGgcyoz" role="1Qtc8$">
+        <node concept="CtIbL" id="59P$gGgcyo_" role="CtIbM">
+          <property role="CtIbK" value="1A4kJjlVmVt/LEFT" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index 99027d39..fc6aa41d 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -32,6 +32,8 @@
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="ykok" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.constraints(MPS.Core/)" />
     <import index="35tq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.scope(MPS.Core/)" />
+    <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" />
+    <import index="78sh" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.substitute(MPS.Editor/)" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -213,7 +215,6 @@
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
       <concept id="3622263992595020489" name="jetbrains.mps.lang.editor.structure.SubstituteMenuItem_DescriptionText_Operation" flags="ng" index="3j5asx" />
-      <concept id="3622263992595020491" name="jetbrains.mps.lang.editor.structure.SubstituteMenuItem_OutputConcept_Operation" flags="ng" index="3j5asz" />
       <concept id="3622263992595020486" name="jetbrains.mps.lang.editor.structure.SubstituteMenuItem_MatchingText_Operation" flags="ng" index="3j5asI" />
       <concept id="3622263992592371436" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_SubstituteMenu_WrappedItem" flags="ng" index="3jrdc4" />
       <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
@@ -352,10 +353,6 @@
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
-      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1068580123160" name="condition" index="3clFbw" />
-        <child id="1068580123161" name="ifTrue" index="3clFbx" />
-      </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
@@ -461,9 +458,6 @@
         <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="1180031783296" name="jetbrains.mps.lang.smodel.structure.Concept_IsSubConceptOfOperation" flags="nn" index="2Zo12i">
-        <child id="1180031783297" name="conceptArgument" index="2Zo12j" />
-      </concept>
       <concept id="2644386474301421077" name="jetbrains.mps.lang.smodel.structure.LinkIdRefExpression" flags="nn" index="359W_D">
         <reference id="2644386474301421078" name="conceptDeclaration" index="359W_E" />
         <reference id="2644386474301421079" name="linkDeclaration" index="359W_F" />
@@ -3867,86 +3861,13 @@
     <node concept="22hDWj" id="2TBKtozZDVB" role="22hAXT" />
     <node concept="3ft6gV" id="5HLeEcfozdc" role="3ft7WO">
       <node concept="3N5dw7" id="4hPXq9JmemJ" role="3ft5RZ">
-        <node concept="16NL3D" id="51ek2rSfDK3" role="upBLP">
-          <node concept="16Na2f" id="51ek2rSfDK5" role="16NL3A">
-            <node concept="3clFbS" id="51ek2rSfDK7" role="2VODD2">
-              <node concept="3clFbF" id="51ek2rSfDTV" role="3cqZAp">
-                <node concept="3fqX7Q" id="51ek2rSfDTW" role="3clFbG">
-                  <node concept="2OqwBi" id="51ek2rSfDTX" role="3fr31v">
-                    <node concept="2OqwBi" id="51ek2rSfDTY" role="2Oq$k0">
-                      <node concept="3jrdc4" id="51ek2rSfDTZ" role="2Oq$k0" />
-                      <node concept="3j5asz" id="51ek2rSfDU0" role="2OqNvi" />
-                    </node>
-                    <node concept="2Zo12i" id="51ek2rSfDU1" role="2OqNvi">
-                      <node concept="chp4Y" id="51ek2rSfE2B" role="2Zo12j">
-                        <ref role="cht4Q" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="16NfWO" id="oI9YrnjlN" role="upBLP">
           <node concept="uGdhv" id="59P$gGfNL6t" role="16NeZM">
             <node concept="3clFbS" id="59P$gGfNL6v" role="2VODD2">
-              <node concept="3clFbJ" id="5HLeEcfwthO" role="3cqZAp">
-                <node concept="3clFbS" id="5HLeEcfwti9" role="3clFbx">
-                  <node concept="3cpWs6" id="5HLeEcfwtAb" role="3cqZAp">
-                    <node concept="2OqwBi" id="5HLeEcfwtAc" role="3cqZAk">
-                      <node concept="3jrdc4" id="5HLeEcfwtAd" role="2Oq$k0" />
-                      <node concept="3j5asI" id="5HLeEcfwtAe" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="2YIFZM" id="5HLeEcfwsYQ" role="3clFbw">
-                  <ref role="37wK5l" node="5HLeEcfuAse" resolve="filterIgnored" />
-                  <ref role="1Pybhc" node="5HLeEcfuApQ" resolve="Workarounds" />
-                  <node concept="2OqwBi" id="5HLeEcfwt0Y" role="37wK5m">
-                    <node concept="3jrdc4" id="5HLeEcfwsZS" role="2Oq$k0" />
-                    <node concept="3j5asz" id="5HLeEcfwt6c" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3SKdUt" id="5HLeEcfwOQs" role="3cqZAp">
-                <node concept="1PaTwC" id="5HLeEcfwOYj" role="1aUNEU">
-                  <node concept="3oM_SD" id="5HLeEcfwOZl" role="1PaTwD">
-                    <property role="3oM_SC" value="intentionally" />
-                  </node>
-                  <node concept="3oM_SD" id="5HLeEcfwP0e" role="1PaTwD">
-                    <property role="3oM_SC" value="meaningless" />
-                  </node>
-                  <node concept="3oM_SD" id="5HLeEcfwP1U" role="1PaTwD">
-                    <property role="3oM_SC" value="pattern" />
-                  </node>
-                  <node concept="3oM_SD" id="5HLeEcfwP2b" role="1PaTwD">
-                    <property role="3oM_SC" value="to" />
-                  </node>
-                  <node concept="3oM_SD" id="5HLeEcfwP2t" role="1PaTwD">
-                    <property role="3oM_SC" value="avoid" />
-                  </node>
-                  <node concept="3oM_SD" id="5HLeEcfwP2A" role="1PaTwD">
-                    <property role="3oM_SC" value="entering" />
-                  </node>
-                  <node concept="3oM_SD" id="5HLeEcfwP2U" role="1PaTwD">
-                    <property role="3oM_SC" value="invalid" />
-                  </node>
-                  <node concept="3oM_SD" id="5HLeEcfwP3z" role="1PaTwD">
-                    <property role="3oM_SC" value="constructs" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3SKdUt" id="5HLeEcfyFik" role="3cqZAp">
-                <node concept="1PaTwC" id="5HLeEcfyFil" role="1aUNEU">
-                  <node concept="3oM_SD" id="5HLeEcfyFin" role="1PaTwD">
-                    <property role="3oM_SC" value="https://youtrack.jetbrains.com/issue/MPS-31790" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs6" id="5HLeEcfwtjA" role="3cqZAp">
-                <node concept="Xl_RD" id="5HLeEcfwtIR" role="3cqZAk">
-                  <property role="Xl_RC" value="???" />
+              <node concept="3cpWs6" id="5HLeEcfwtAb" role="3cqZAp">
+                <node concept="2OqwBi" id="5HLeEcfwtAc" role="3cqZAk">
+                  <node concept="3jrdc4" id="5HLeEcfwtAd" role="2Oq$k0" />
+                  <node concept="3j5asI" id="5HLeEcfwtAe" role="2OqNvi" />
                 </node>
               </node>
             </node>
@@ -4043,6 +3964,61 @@
           </node>
         </node>
       </node>
+      <node concept="3ft6gW" id="1PN9XOIo4yC" role="3ft5RY">
+        <node concept="3clFbS" id="1PN9XOIo4yD" role="2VODD2">
+          <node concept="3SKdUt" id="1PN9XOIo4Jo" role="3cqZAp">
+            <node concept="1PaTwC" id="1PN9XOIo4Jp" role="1aUNEU">
+              <node concept="3oM_SD" id="1PN9XOIo4No" role="1PaTwD">
+                <property role="3oM_SC" value="only" />
+              </node>
+              <node concept="3oM_SD" id="1PN9XOIo4Nu" role="1PaTwD">
+                <property role="3oM_SC" value="allow" />
+              </node>
+              <node concept="3oM_SD" id="1PN9XOIo4NB" role="1PaTwD">
+                <property role="3oM_SC" value="as" />
+              </node>
+              <node concept="3oM_SD" id="1PN9XOIo4NI" role="1PaTwD">
+                <property role="3oM_SC" value="constraint" />
+              </node>
+              <node concept="3oM_SD" id="1PN9XOIo4NY" role="1PaTwD">
+                <property role="3oM_SC" value="argument" />
+              </node>
+              <node concept="3oM_SD" id="1PN9XOIo4Od" role="1PaTwD">
+                <property role="3oM_SC" value="or" />
+              </node>
+              <node concept="3oM_SD" id="1PN9XOIo4On" role="1PaTwD">
+                <property role="3oM_SC" value="a" />
+              </node>
+              <node concept="3oM_SD" id="1PN9XOIo4Ox" role="1PaTwD">
+                <property role="3oM_SC" value="term's" />
+              </node>
+              <node concept="3oM_SD" id="1PN9XOIo4OR" role="1PaTwD">
+                <property role="3oM_SC" value="value" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="1PN9XOIA7Ao" role="3cqZAp">
+            <node concept="22lmx$" id="1PN9XOIA8ol" role="3clFbG">
+              <node concept="2OqwBi" id="1PN9XOIA8sa" role="3uHU7w">
+                <node concept="3bvxqY" id="1PN9XOIA8pv" role="2Oq$k0" />
+                <node concept="1mIQ4w" id="1PN9XOIA8BW" role="2OqNvi">
+                  <node concept="chp4Y" id="1PN9XOIA8Ox" role="cj9EA">
+                    <ref role="cht4Q" to="wq2x:JOGAOsxTDl" resolve="TermFeatureOverride" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="1PN9XOIA7Jh" role="3uHU7B">
+                <node concept="3bvxqY" id="1PN9XOIA7An" role="2Oq$k0" />
+                <node concept="1mIQ4w" id="1PN9XOIA7WK" role="2OqNvi">
+                  <node concept="chp4Y" id="1PN9XOIA82L" role="cj9EA">
+                    <ref role="cht4Q" to="wq2x:6p0DfM0ang5" resolve="UserConstraint" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="3VyMlK" id="51ek2rSfDF9" role="3ft7WO" />
   </node>
@@ -4254,5 +4230,12 @@
       <ref role="4PJHt" to="5j4j:1fvYCPAmuWc" resolve="ConsListNode" />
     </node>
   </node>
+  <node concept="22mcaB" id="1PN9XOIEe61">
+    <property role="3GE5qa" value="logical.item" />
+    <ref role="aqKnT" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
+    <node concept="2VfDsV" id="1PN9XOIEWTl" role="3ft7WO" />
+    <node concept="3VyMlK" id="1PN9XOIEs$L" role="3ft7WO" />
+    <node concept="22hDWj" id="1PN9XOIEe62" role="22hAXT" />
+  </node>
 </model>