diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 9d333c38..8c5f503b 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -458,18 +458,6 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
-    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-      </concept>
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </concept>
-    </language>
     <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
       <concept id="1217889725928" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_SessionObjectAccess" flags="nn" index="2fSANN" />
       <concept id="1217889960776" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_UserObjectAccessBase" flags="nn" index="2fTw9j">
@@ -646,7 +634,6 @@
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
-      <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="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
@@ -860,16 +847,6 @@
       <ref role="2rTdP9" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
       <ref role="2rZz_L" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
     </node>
-    <node concept="2rT7sh" id="7P_FdVPtAzR" role="2rTMjI">
-      <property role="TrG5h" value="query_class" />
-      <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
-      <ref role="2rTdP9" to="wq2x:6OXbTD$dU7b" resolve="Query" />
-    </node>
-    <node concept="2rT7sh" id="6OXbTD$ko7g" role="2rTMjI">
-      <property role="TrG5h" value="query_constructor" />
-      <ref role="2rTdP9" to="wq2x:6OXbTD$dU7b" resolve="Query" />
-      <ref role="2rZz_L" to="tpee:fzclF84" resolve="ConstructorDeclaration" />
-    </node>
     <node concept="2rT7sh" id="tbauFy55gk" role="2rTMjI">
       <property role="TrG5h" value="queryTable_constructor" />
       <ref role="2rZz_L" to="tpee:fzclF84" resolve="ConstructorDeclaration" />
@@ -890,11 +867,6 @@
       <ref role="2sgKRv" node="4MqhgXUaC7X" resolve="handler_template_class" />
       <ref role="3lhOvi" node="4MqhgXU9Ebr" resolve="_RuleTable" />
     </node>
-    <node concept="3lhOvk" id="7P_FdVQ_Uvo" role="3lj3bC">
-      <ref role="2sgKRv" node="7P_FdVPtAzR" resolve="query_class" />
-      <ref role="3lhOvi" node="6OXbTD$fBEY" resolve="QueryTemplateImpl" />
-      <ref role="30HIoZ" to="wq2x:6OXbTD$dU7b" resolve="Query" />
-    </node>
     <node concept="3lhOvk" id="tbauFy52k2" role="3lj3bC">
       <ref role="30HIoZ" to="wq2x:5EDW3XE0OAL" resolve="QueryTable" />
       <ref role="3lhOvi" node="tbauFy4LRo" resolve="_QueryTable" />
@@ -2506,56 +2478,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="429xoypVZhz" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:6infEALDvmn" resolve="AssertExpressionConstraint" />
-      <node concept="1Koe21" id="429xoypVZHz" role="1lVwrX">
-        <node concept="3clFb_" id="429xoypVZH$" role="1Koe22">
-          <property role="TrG5h" value="context" />
-          <node concept="3cqZAl" id="429xoypVZHB" role="3clF45" />
-          <node concept="3Tm1VV" id="429xoypVZHC" role="1B3o_S" />
-          <node concept="3clFbS" id="429xoypVZHD" role="3clF47">
-            <node concept="3clFbF" id="4sSe4$oNOYw" role="3cqZAp">
-              <node concept="2OqwBi" id="4sSe4$oNSWC" role="3clFbG">
-                <node concept="2OqwBi" id="4sSe4$oNR9p" role="2Oq$k0">
-                  <node concept="2ShNRf" id="4sSe4$oNOYs" role="2Oq$k0">
-                    <node concept="1pGfFk" id="4sSe4$oNQ1k" role="2ShVmc">
-                      <ref role="37wK5l" to="i348:4sSe4$oM2B4" resolve="PredicateBuilder" />
-                      <node concept="10M0yZ" id="4sSe4$oNQ_a" role="37wK5m">
-                        <ref role="1PxDUh" to="cxk7:6infEALAfer" resolve="AssertPredicate" />
-                        <ref role="3cqZAo" to="cxk7:5uFPQ7BZnLB" resolve="ASSERT_SYM" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="4sSe4$oNRL0" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:4sSe4$oM2Bb" resolve="withArguments" />
-                    <node concept="10Nm6u" id="3pMFS1zohV_" role="37wK5m">
-                      <node concept="29HgVG" id="3pMFS1zohXR" role="lGtFl">
-                        <node concept="3NFfHV" id="3pMFS1zohZ1" role="3NFExx">
-                          <node concept="3clFbS" id="3pMFS1zohZ2" role="2VODD2">
-                            <node concept="3clFbF" id="3pMFS1zoi7W" role="3cqZAp">
-                              <node concept="2OqwBi" id="3pMFS1zoikI" role="3clFbG">
-                                <node concept="30H73N" id="3pMFS1zoi7V" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="3pMFS1zoiya" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:4EfgX2EvGcc" resolve="expression" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="4sSe4$oNT_9" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:4sSe4$oM2Bs" resolve="toPredicate" />
-                </node>
-                <node concept="raruj" id="4sSe4$oNUc3" role="lGtFl" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="1HWyn8juIFL" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:1HWyn8iJ_xB" resolve="CopyItem" />
       <node concept="1Koe21" id="1HWyn8juJzy" role="1lVwrX">
@@ -12310,110 +12232,6 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbH" id="36tQV5AxhQU" role="3cqZAp">
-                          <node concept="1W57fq" id="36tQV5AxhQV" role="lGtFl">
-                            <node concept="3IZrLx" id="36tQV5AxhQW" role="3IZSJc">
-                              <node concept="3clFbS" id="36tQV5AxhQX" role="2VODD2">
-                                <node concept="3clFbF" id="36tQV5AxhQY" role="3cqZAp">
-                                  <node concept="2OqwBi" id="36tQV5AxhQZ" role="3clFbG">
-                                    <node concept="2OqwBi" id="36tQV5AxhR0" role="2Oq$k0">
-                                      <node concept="30H73N" id="36tQV5AxhR1" role="2Oq$k0" />
-                                      <node concept="3Tsc0h" id="36tQV5AxhR2" role="2OqNvi">
-                                        <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
-                                      </node>
-                                    </node>
-                                    <node concept="3GX2aA" id="36tQV5AxhR3" role="2OqNvi" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="29HgVG" id="36tQV5AxhR4" role="lGtFl">
-                            <node concept="3NFfHV" id="36tQV5AxhR5" role="3NFExx">
-                              <node concept="3clFbS" id="36tQV5AxhR6" role="2VODD2">
-                                <node concept="3clFbF" id="36tQV5AxhR7" role="3cqZAp">
-                                  <node concept="2OqwBi" id="36tQV5AxhR8" role="3clFbG">
-                                    <node concept="2OqwBi" id="36tQV5AxhR9" role="2Oq$k0">
-                                      <node concept="30H73N" id="36tQV5AxhRa" role="2Oq$k0" />
-                                      <node concept="3Tsc0h" id="36tQV5AxhRb" role="2OqNvi">
-                                        <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
-                                      </node>
-                                    </node>
-                                    <node concept="1uHKPH" id="36tQV5AxhRc" role="2OqNvi" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="9aQIb" id="36tQV5AxhRd" role="3cqZAp">
-                          <node concept="3clFbS" id="36tQV5AxhRe" role="9aQI4">
-                            <node concept="3clFbF" id="36tQV5AxhRf" role="3cqZAp">
-                              <node concept="2OqwBi" id="36tQV5AxhRg" role="3clFbG">
-                                <node concept="37vLTw" id="36tQV5AxhRh" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="36tQV5AxhQ2" resolve="builder" />
-                                </node>
-                                <node concept="liA8E" id="36tQV5AxhRi" role="2OqNvi">
-                                  <ref role="37wK5l" to="i348:32fHqDf8Vx1" resolve="appendAlternation" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3clFbH" id="36tQV5AxhRj" role="3cqZAp">
-                              <node concept="29HgVG" id="36tQV5AxhRk" role="lGtFl">
-                                <node concept="3NFfHV" id="36tQV5AxhRl" role="3NFExx">
-                                  <node concept="3clFbS" id="36tQV5AxhRm" role="2VODD2">
-                                    <node concept="3clFbF" id="36tQV5AxhRn" role="3cqZAp">
-                                      <node concept="30H73N" id="36tQV5AxhRo" role="3clFbG" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="1W57fq" id="36tQV5AxhRp" role="lGtFl">
-                            <node concept="3IZrLx" id="36tQV5AxhRq" role="3IZSJc">
-                              <node concept="3clFbS" id="36tQV5AxhRr" role="2VODD2">
-                                <node concept="3clFbF" id="36tQV5AxhRs" role="3cqZAp">
-                                  <node concept="3eOSWO" id="36tQV5AxhRt" role="3clFbG">
-                                    <node concept="3cmrfG" id="36tQV5AxhRu" role="3uHU7w">
-                                      <property role="3cmrfH" value="1" />
-                                    </node>
-                                    <node concept="2OqwBi" id="36tQV5AxhRv" role="3uHU7B">
-                                      <node concept="2OqwBi" id="36tQV5AxhRw" role="2Oq$k0">
-                                        <node concept="30H73N" id="36tQV5AxhRx" role="2Oq$k0" />
-                                        <node concept="3Tsc0h" id="36tQV5AxhRy" role="2OqNvi">
-                                          <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
-                                        </node>
-                                      </node>
-                                      <node concept="34oBXx" id="36tQV5AxhRz" role="2OqNvi" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="1WS0z7" id="36tQV5AxhR$" role="lGtFl">
-                            <node concept="3JmXsc" id="36tQV5AxhR_" role="3Jn$fo">
-                              <node concept="3clFbS" id="36tQV5AxhRA" role="2VODD2">
-                                <node concept="3clFbF" id="36tQV5AxhRB" role="3cqZAp">
-                                  <node concept="2OqwBi" id="36tQV5AxhRC" role="3clFbG">
-                                    <node concept="2OqwBi" id="36tQV5AxhRD" role="2Oq$k0">
-                                      <node concept="30H73N" id="36tQV5AxhRE" role="2Oq$k0" />
-                                      <node concept="3Tsc0h" id="36tQV5AxhRF" role="2OqNvi">
-                                        <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
-                                      </node>
-                                    </node>
-                                    <node concept="7r0gD" id="36tQV5AxhRG" role="2OqNvi">
-                                      <node concept="3cmrfG" id="36tQV5AxhRH" role="7T0AP">
-                                        <property role="3cmrfH" value="1" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
                         <node concept="3clFbH" id="6E2cNibq3pL" role="3cqZAp">
                           <node concept="1W57fq" id="6E2cNibq3pM" role="lGtFl">
                             <node concept="3IZrLx" id="6E2cNibq3pN" role="3IZSJc">
@@ -12649,614 +12467,6 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="6OXbTD$fBEY">
-    <property role="TrG5h" value="QueryTemplateImpl" />
-    <property role="3GE5qa" value="query" />
-    <node concept="2tJIrI" id="6OXbTD$fBKs" role="jymVt" />
-    <node concept="3clFbW" id="6OXbTD$juGj" role="jymVt">
-      <node concept="3cqZAl" id="6OXbTD$juGl" role="3clF45" />
-      <node concept="3Tmbuc" id="6OXbTD$jvav" role="1B3o_S" />
-      <node concept="3clFbS" id="6OXbTD$juGn" role="3clF47">
-        <node concept="XkiVB" id="6R6MIbU9lm1" role="3cqZAp">
-          <ref role="37wK5l" to="i348:6R6MIbU8QE_" resolve="AbstractQueryTemplate" />
-          <node concept="Xl_RD" id="6R6MIbU9lCr" role="37wK5m">
-            <node concept="17Uvod" id="6R6MIbU9lCs" role="lGtFl">
-              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-              <property role="2qtEX9" value="value" />
-              <node concept="3zFVjK" id="6R6MIbU9lCt" role="3zH0cK">
-                <node concept="3clFbS" id="6R6MIbU9lCu" role="2VODD2">
-                  <node concept="3clFbF" id="6R6MIbU9lCv" role="3cqZAp">
-                    <node concept="2OqwBi" id="6R6MIbU9lCw" role="3clFbG">
-                      <node concept="30H73N" id="6R6MIbU9lCx" role="2Oq$k0" />
-                      <node concept="3TrcHB" id="6R6MIbU9lCy" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="Xl_RD" id="6R6MIbU9lQB" role="37wK5m">
-            <property role="Xl_RC" value="" />
-            <node concept="17Uvod" id="6R6MIbU9lQC" role="lGtFl">
-              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-              <property role="2qtEX9" value="value" />
-              <node concept="3zFVjK" id="6R6MIbU9lQD" role="3zH0cK">
-                <node concept="3clFbS" id="6R6MIbU9lQE" role="2VODD2">
-                  <node concept="3clFbF" id="6R6MIbU9lQF" role="3cqZAp">
-                    <node concept="2OqwBi" id="6R6MIbU9lQG" role="3clFbG">
-                      <node concept="2qgKlT" id="6R6MIbU9lQH" role="2OqNvi">
-                        <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
-                      </node>
-                      <node concept="30H73N" id="6R6MIbU9lQI" role="2Oq$k0" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2YIFZM" id="6R6MIbU9lXG" role="37wK5m">
-            <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
-            <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
-            <node concept="Xl_RD" id="6R6MIbU9lXH" role="37wK5m">
-              <property role="Xl_RC" value="" />
-              <node concept="17Uvod" id="6R6MIbU9lXI" role="lGtFl">
-                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                <property role="2qtEX9" value="value" />
-                <node concept="3zFVjK" id="6R6MIbU9lXJ" role="3zH0cK">
-                  <node concept="3clFbS" id="6R6MIbU9lXK" role="2VODD2">
-                    <node concept="3clFbF" id="6R6MIbU9lXL" role="3cqZAp">
-                      <node concept="2OqwBi" id="6R6MIbU9lXM" role="3clFbG">
-                        <node concept="2OqwBi" id="6R6MIbU9lXN" role="2Oq$k0">
-                          <node concept="2JrnkZ" id="6R6MIbU9lXO" role="2Oq$k0">
-                            <node concept="2OqwBi" id="6R6MIbU9lXP" role="2JrQYb">
-                              <node concept="1iwH7S" id="6R6MIbU9lXQ" role="2Oq$k0" />
-                              <node concept="12$id9" id="6R6MIbU9lXR" role="2OqNvi">
-                                <node concept="30H73N" id="6R6MIbU9lXS" role="12$y8L" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="6R6MIbU9lXT" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="6R6MIbU9lXU" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2ZBi8u" id="6OXbTD$kqyO" role="lGtFl">
-        <ref role="2rW$FS" node="6OXbTD$ko7g" resolve="query_constructor" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6OXbTD$juj6" role="jymVt" />
-    <node concept="312cEu" id="6tPOoeT3Z1_" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Token" />
-      <node concept="2tJIrI" id="6tPOoeT3Z1A" role="jymVt" />
-      <node concept="3clFbW" id="6tPOoeT3Z1B" role="jymVt">
-        <node concept="3cqZAl" id="6tPOoeT3Z1H" role="3clF45" />
-        <node concept="3Tmbuc" id="6tPOoeT3Z1I" role="1B3o_S" />
-        <node concept="3clFbS" id="6tPOoeT3Z1J" role="3clF47">
-          <node concept="3clFbF" id="6R6MIbUt40G" role="3cqZAp">
-            <node concept="37vLTI" id="6R6MIbUt40I" role="3clFbG">
-              <node concept="2OqwBi" id="6R6MIbUt4Ws" role="37vLTJ">
-                <node concept="Xjq3P" id="6R6MIbUt4XP" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6R6MIbUt4Wv" role="2OqNvi">
-                  <ref role="2Oxat5" node="6R6MIbUt40C" resolve="session" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="6R6MIbUt40M" role="37vLTx">
-                <ref role="3cqZAo" node="6R6MIbUt2Bb" resolve="session" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="37vLTG" id="6R6MIbUt2Bb" role="3clF46">
-          <property role="TrG5h" value="session" />
-          <node concept="3uibUv" id="6R6MIbUt2Ba" role="1tU5fm">
-            <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="6R6MIbUsDsa" role="jymVt" />
-      <node concept="3clFb_" id="5EDW3XEgG0b" role="jymVt">
-        <property role="TrG5h" value="withQuery" />
-        <node concept="3Tm1VV" id="5EDW3XEgG0d" role="1B3o_S" />
-        <node concept="3uibUv" id="5EDW3XEgG0e" role="3clF45">
-          <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
-        </node>
-        <node concept="37vLTG" id="5EDW3XEgG0f" role="3clF46">
-          <property role="TrG5h" value="query" />
-          <node concept="3uibUv" id="5EDW3XEh098" role="1tU5fm">
-            <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
-            <node concept="1ZhdrF" id="5EDW3XEh099" role="lGtFl">
-              <property role="2qtEX8" value="classifier" />
-              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
-              <node concept="3$xsQk" id="5EDW3XEh09a" role="3$ytzL">
-                <node concept="3clFbS" id="5EDW3XEh09b" role="2VODD2">
-                  <node concept="3clFbF" id="5EDW3XEh09c" role="3cqZAp">
-                    <node concept="2OqwBi" id="5EDW3XEh09d" role="3clFbG">
-                      <node concept="1PxgMI" id="5EDW3XEh09e" role="2Oq$k0">
-                        <property role="1BlNFB" value="true" />
-                        <node concept="chp4Y" id="5EDW3XEh09f" role="3oSUPX">
-                          <ref role="cht4Q" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
-                        </node>
-                        <node concept="2OqwBi" id="5EDW3XEh09g" role="1m5AlR">
-                          <node concept="1iwH7S" id="5EDW3XEh09h" role="2Oq$k0" />
-                          <node concept="12$id9" id="5EDW3XEh09i" role="2OqNvi">
-                            <node concept="30H73N" id="5EDW3XEh09j" role="12$y8L" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3TrEf2" id="5EDW3XEh09k" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:5EDW3XE6suU" resolve="queryType" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbS" id="5EDW3XEgG0i" role="3clF47">
-          <node concept="3clFbF" id="5EDW3XEzeJY" role="3cqZAp">
-            <node concept="37vLTI" id="5EDW3XEzeK0" role="3clFbG">
-              <node concept="2OqwBi" id="5EDW3XEzgOP" role="37vLTJ">
-                <node concept="Xjq3P" id="5EDW3XEzgZI" role="2Oq$k0" />
-                <node concept="2OwXpG" id="5EDW3XEzgOS" role="2OqNvi">
-                  <ref role="2Oxat5" node="5EDW3XEzeJI" resolve="query" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="5EDW3XEzeK4" role="37vLTx">
-                <ref role="3cqZAo" node="5EDW3XEgG0f" resolve="query" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="5EDW3XEznvY" role="3cqZAp">
-            <node concept="Xjq3P" id="5EDW3XEznvW" role="3clFbG" />
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="5EDW3XEgG0j" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="5EDW3XEgGO8" role="jymVt" />
-      <node concept="3clFb_" id="6tPOoeT3Z2J" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="apply" />
-        <node concept="A3Dl8" id="6tPOoeT3Z2K" role="3clF45">
-          <node concept="3uibUv" id="6tPOoeT3Z2L" role="A3Ik2">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="6tPOoeT3Z2P" role="1B3o_S" />
-        <node concept="3clFbS" id="6tPOoeT3Z2Q" role="3clF47">
-          <node concept="3cpWs8" id="6R6MIbUtg13" role="3cqZAp">
-            <node concept="3cpWsn" id="6R6MIbUtg14" role="3cpWs9">
-              <property role="TrG5h" value="_session" />
-              <node concept="3uibUv" id="6R6MIbUtg15" role="1tU5fm">
-                <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-              </node>
-              <node concept="37vLTw" id="6R6MIbUtg16" role="33vP2m">
-                <ref role="3cqZAo" node="6R6MIbUt40C" resolve="session" />
-              </node>
-              <node concept="2ZBi8u" id="6R6MIbUtg17" role="lGtFl">
-                <ref role="2rW$FS" node="429xoypVg6q" resolve="apply_session_parameter" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="6tPOoeT3Z2A" role="3cqZAp">
-            <node concept="37vLTI" id="6tPOoeT3Z2B" role="3clFbG">
-              <node concept="2ShNRf" id="6R6MIbTvH3J" role="37vLTx">
-                <node concept="Tc6Ow" id="6R6MIbTvH_L" role="2ShVmc">
-                  <node concept="3uibUv" id="6R6MIbTvI3L" role="HW$YZ">
-                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="6tPOoeT3Z2F" role="37vLTJ">
-                <node concept="Xjq3P" id="6tPOoeT3Z2G" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6tPOoeT3Z2H" role="2OqNvi">
-                  <ref role="2Oxat5" node="6tPOoeT3Z41" resolve="ruleBuilders" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="6tPOoeT3Z2R" role="3cqZAp">
-            <node concept="2OqwBi" id="6tPOoeT3Z2S" role="3clFbG">
-              <node concept="37vLTw" id="6tPOoeT3Z2T" role="2Oq$k0">
-                <ref role="3cqZAo" node="6tPOoeT3Z41" resolve="ruleBuilders" />
-              </node>
-              <node concept="TSZUe" id="6R6MIbTAwKs" role="2OqNvi">
-                <node concept="10Nm6u" id="6R6MIbTAwT2" role="25WWJ7" />
-              </node>
-            </node>
-            <node concept="2b32R4" id="6tPOoeT3Z2W" role="lGtFl">
-              <node concept="3JmXsc" id="6tPOoeT3Z2X" role="2P8S$">
-                <node concept="3clFbS" id="6tPOoeT3Z2Y" role="2VODD2">
-                  <node concept="3clFbF" id="6tPOoeT3Z2Z" role="3cqZAp">
-                    <node concept="2OqwBi" id="6tPOoeT3Z30" role="3clFbG">
-                      <node concept="2OqwBi" id="6tPOoeT3Z31" role="2Oq$k0">
-                        <node concept="30H73N" id="6tPOoeT3Z32" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="6tPOoeT3Z33" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:6OXbTDyyU9U" resolve="code" />
-                        </node>
-                      </node>
-                      <node concept="3Tsc0h" id="6tPOoeT3Z34" role="2OqNvi">
-                        <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="6R6MIbTvIAV" role="3cqZAp">
-            <node concept="37vLTw" id="6R6MIbTvIAT" role="3clFbG">
-              <ref role="3cqZAo" node="6tPOoeT3Z41" resolve="ruleBuilders" />
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="6tPOoeT3Z37" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="6tPOoeT3Z38" role="jymVt" />
-      <node concept="3clFb_" id="6tPOoeT3Z39" role="jymVt">
-        <property role="TrG5h" value="token" />
-        <node concept="3uibUv" id="6tPOoeT3Z3a" role="3clF45">
-          <ref role="3uigEE" node="6tPOoeT3Z1_" resolve="QueryTemplateImpl.Token" />
-        </node>
-        <node concept="3Tmbuc" id="6tPOoeT3Z3b" role="1B3o_S" />
-        <node concept="3clFbS" id="6tPOoeT3Z3c" role="3clF47">
-          <node concept="3clFbF" id="6tPOoeT3Z3d" role="3cqZAp">
-            <node concept="Xjq3P" id="6tPOoeT3Z3e" role="3clFbG" />
-          </node>
-        </node>
-        <node concept="2ZBi8u" id="6tPOoeT3Z3f" role="lGtFl">
-          <ref role="2rW$FS" node="36tQV5AugIl" resolve="template_token_this" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="6tPOoeT3Z3o" role="jymVt" />
-      <node concept="312cEu" id="2J$kxDHYub7" role="jymVt">
-        <property role="TrG5h" value="ConstraintRule" />
-        <node concept="3Tm1VV" id="2J$kxDHYub8" role="1B3o_S" />
-        <node concept="1WS0z7" id="2J$kxDHYub9" role="lGtFl">
-          <node concept="3JmXsc" id="2J$kxDHYuba" role="3Jn$fo">
-            <node concept="3clFbS" id="2J$kxDHYubb" role="2VODD2">
-              <node concept="3clFbF" id="2J$kxDHYubc" role="3cqZAp">
-                <node concept="2OqwBi" id="2J$kxDHYubd" role="3clFbG">
-                  <node concept="2OqwBi" id="2J$kxDHYube" role="2Oq$k0">
-                    <node concept="2Rf3mk" id="2J$kxDHYubf" role="2OqNvi">
-                      <node concept="1xMEDy" id="2J$kxDHYubg" role="1xVPHs">
-                        <node concept="chp4Y" id="2J$kxDHYubh" role="ri$Ld">
-                          <ref role="cht4Q" to="wq2x:36tQV5AmIt0" resolve="ConstraintRuleStatement" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="30H73N" id="2J$kxDHYubi" role="2Oq$k0" />
-                  </node>
-                  <node concept="13MTOL" id="2J$kxDHYubj" role="2OqNvi">
-                    <ref role="13MTZf" to="wq2x:36tQV5AmIt1" resolve="rule" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="5jKBG" id="2J$kxDHYubk" role="lGtFl">
-          <ref role="v9R2y" node="2J$kxDHVnXC" resolve="ConstraintRule_class" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="2J$kxDHYsCN" role="jymVt" />
-      <node concept="2tJIrI" id="6tPOoeT3Z3p" role="jymVt" />
-      <node concept="312cEg" id="5EDW3XEzeJI" role="jymVt">
-        <property role="TrG5h" value="query" />
-        <node concept="3Tmbuc" id="5EDW3XECi6j" role="1B3o_S" />
-        <node concept="3uibUv" id="5EDW3XEzeJL" role="1tU5fm">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
-          <node concept="1ZhdrF" id="5EDW3XEzeJM" role="lGtFl">
-            <property role="2qtEX8" value="classifier" />
-            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
-            <node concept="3$xsQk" id="5EDW3XEzeJN" role="3$ytzL">
-              <node concept="3clFbS" id="5EDW3XEzeJO" role="2VODD2">
-                <node concept="3clFbF" id="5EDW3XEzeJP" role="3cqZAp">
-                  <node concept="2OqwBi" id="5EDW3XEzeJQ" role="3clFbG">
-                    <node concept="1PxgMI" id="5EDW3XEzeJR" role="2Oq$k0">
-                      <property role="1BlNFB" value="true" />
-                      <node concept="chp4Y" id="5EDW3XEzeJS" role="3oSUPX">
-                        <ref role="cht4Q" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
-                      </node>
-                      <node concept="2OqwBi" id="5EDW3XEzeJT" role="1m5AlR">
-                        <node concept="1iwH7S" id="5EDW3XEzeJU" role="2Oq$k0" />
-                        <node concept="12$id9" id="5EDW3XEzeJV" role="2OqNvi">
-                          <node concept="30H73N" id="5EDW3XEzeJW" role="12$y8L" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3TrEf2" id="5EDW3XEzeJX" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:5EDW3XE6suU" resolve="queryType" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2ZBi8u" id="5EDW3XEzlVK" role="lGtFl">
-          <ref role="2rW$FS" node="5EDW3XEzky_" resolve="query_field" />
-        </node>
-      </node>
-      <node concept="312cEg" id="6tPOoeT3Z41" role="jymVt">
-        <property role="TrG5h" value="ruleBuilders" />
-        <node concept="3Tmbuc" id="6tPOoeT3Z42" role="1B3o_S" />
-        <node concept="_YKpA" id="6R6MIbTvG$d" role="1tU5fm">
-          <node concept="3uibUv" id="6R6MIbTvG$e" role="_ZDj9">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-          </node>
-        </node>
-        <node concept="2ZBi8u" id="6R6MIbTk4wc" role="lGtFl">
-          <ref role="2rW$FS" node="6R6MIbTaGzw" resolve="builder_field" />
-        </node>
-      </node>
-      <node concept="312cEg" id="6R6MIbUt40C" role="jymVt">
-        <property role="TrG5h" value="session" />
-        <node concept="3Tmbuc" id="6R6MIbUt5do" role="1B3o_S" />
-        <node concept="3uibUv" id="6R6MIbUt40F" role="1tU5fm">
-          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-        </node>
-        <node concept="2ZBi8u" id="6R6MIbUt57d" role="lGtFl">
-          <ref role="2rW$FS" node="6R6MIbUtc6X" resolve="apply_session_field" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="6R6MIbU9rbU" role="jymVt" />
-      <node concept="3Tm1VV" id="6tPOoeT3Z48" role="1B3o_S" />
-      <node concept="3uibUv" id="6R6MIbUe0_f" role="EKbjA">
-        <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
-        <node concept="3uibUv" id="5EDW3XEgQpw" role="11_B2D">
-          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
-          <node concept="1ZhdrF" id="5EDW3XEgQZ6" role="lGtFl">
-            <property role="2qtEX8" value="classifier" />
-            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
-            <node concept="3$xsQk" id="5EDW3XEgQZ7" role="3$ytzL">
-              <node concept="3clFbS" id="5EDW3XEgQZ8" role="2VODD2">
-                <node concept="3clFbF" id="5EDW3XEgRqh" role="3cqZAp">
-                  <node concept="2OqwBi" id="5EDW3XEgZ1k" role="3clFbG">
-                    <node concept="1PxgMI" id="5EDW3XEgXUE" role="2Oq$k0">
-                      <property role="1BlNFB" value="true" />
-                      <node concept="chp4Y" id="5EDW3XEgYmr" role="3oSUPX">
-                        <ref role="cht4Q" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
-                      </node>
-                      <node concept="2OqwBi" id="5EDW3XEgSjB" role="1m5AlR">
-                        <node concept="1iwH7S" id="5EDW3XEgRqg" role="2Oq$k0" />
-                        <node concept="12$id9" id="5EDW3XEgSKt" role="2OqNvi">
-                          <node concept="30H73N" id="5EDW3XEgTL0" role="12$y8L" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3TrEf2" id="5EDW3XEgZF1" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:5EDW3XE6suU" resolve="queryType" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1WS0z7" id="6tPOoeT5Mwz" role="lGtFl">
-        <node concept="3JmXsc" id="6tPOoeT5Mw_" role="3Jn$fo">
-          <node concept="3clFbS" id="6tPOoeT5MwB" role="2VODD2">
-            <node concept="3clFbF" id="6tPOoeT5NTy" role="3cqZAp">
-              <node concept="2OqwBi" id="6tPOoeT5ON8" role="3clFbG">
-                <node concept="30H73N" id="6tPOoeT5NTx" role="2Oq$k0" />
-                <node concept="3Tsc0h" id="6tPOoeT5Rsl" role="2OqNvi">
-                  <ref role="3TtcxE" to="wq2x:6OXbTD$dU7c" resolve="queryStage" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6R6MIbU8GTs" role="jymVt" />
-    <node concept="2tJIrI" id="6OXbTD$fBKv" role="jymVt" />
-    <node concept="3clFb_" id="5EDW3XE0F7L" role="jymVt">
-      <property role="TrG5h" value="queryType" />
-      <node concept="3Tm1VV" id="5EDW3XE0F7N" role="1B3o_S" />
-      <node concept="3uibUv" id="5EDW3XE0F7O" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-        <node concept="3qUE_q" id="5EDW3XE0F7P" role="11_B2D">
-          <node concept="3uibUv" id="5EDW3XE0F7Q" role="3qUE_r">
-            <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbS" id="5EDW3XE0F7U" role="3clF47">
-        <node concept="3clFbF" id="5EDW3XEzG_s" role="3cqZAp">
-          <node concept="3VsKOn" id="5EDW3XEzGU2" role="3clFbG">
-            <ref role="3VsUkX" to="i348:5EDW3XDYeWv" resolve="Query" />
-            <node concept="1ZhdrF" id="5EDW3XEzHbM" role="lGtFl">
-              <property role="2qtEX8" value="classifier" />
-              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1116615150612/1116615189566" />
-              <node concept="3$xsQk" id="5EDW3XEzHbN" role="3$ytzL">
-                <node concept="3clFbS" id="5EDW3XEzHbO" role="2VODD2">
-                  <node concept="3clFbF" id="5EDW3XEzHHF" role="3cqZAp">
-                    <node concept="2OqwBi" id="5EDW3XEzUoL" role="3clFbG">
-                      <node concept="2OqwBi" id="5EDW3XEzPsr" role="2Oq$k0">
-                        <node concept="2OqwBi" id="5EDW3XEzLg_" role="2Oq$k0">
-                          <node concept="1PxgMI" id="5EDW3XEzKYv" role="2Oq$k0">
-                            <property role="1BlNFB" value="true" />
-                            <node concept="chp4Y" id="5EDW3XEzL0w" role="3oSUPX">
-                              <ref role="cht4Q" to="wq2x:6OXbTD$dU7b" resolve="Query" />
-                            </node>
-                            <node concept="2OqwBi" id="5EDW3XEzHSW" role="1m5AlR">
-                              <node concept="1iwH7S" id="5EDW3XEzHHE" role="2Oq$k0" />
-                              <node concept="12$id9" id="5EDW3XEzHZ4" role="2OqNvi">
-                                <node concept="30H73N" id="5EDW3XEzI61" role="12$y8L" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3Tsc0h" id="5EDW3XEzLrx" role="2OqNvi">
-                            <ref role="3TtcxE" to="wq2x:6OXbTD$dU7c" resolve="queryStage" />
-                          </node>
-                        </node>
-                        <node concept="1uHKPH" id="5EDW3XEzRHv" role="2OqNvi" />
-                      </node>
-                      <node concept="3TrEf2" id="5EDW3XEzUGV" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:5EDW3XE6suU" resolve="queryType" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5EDW3XE0F7V" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5EDW3XE0GCG" role="jymVt" />
-    <node concept="3clFb_" id="7P_FdVPsJk6" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="newQuery" />
-      <node concept="3uibUv" id="7P_FdVPsJka" role="3clF45">
-        <ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
-      </node>
-      <node concept="3Tm1VV" id="7P_FdVPsJkb" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVPsJkd" role="3clF47">
-        <node concept="3clFbF" id="7P_FdVQ_tYj" role="3cqZAp">
-          <node concept="2ShNRf" id="7P_FdVQ_tYh" role="3clFbG">
-            <node concept="HV5vD" id="7P_FdVQ_uet" role="2ShVmc">
-              <ref role="HV5vE" node="6OXbTD$r8hA" resolve="QueryTemplateImpl.Configurable" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="7P_FdVPsJke" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6R6MIbUswGA" role="jymVt" />
-    <node concept="3clFb_" id="6R6MIbUsyqI" role="jymVt">
-      <property role="TrG5h" value="createToken" />
-      <node concept="37vLTG" id="6R6MIbUsyqL" role="3clF46">
-        <property role="TrG5h" value="session" />
-        <node concept="3uibUv" id="6R6MIbUsyqM" role="1tU5fm">
-          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="6R6MIbUsyqT" role="3clF45">
-        <ref role="3uigEE" node="6tPOoeT3Z1_" resolve="QueryTemplateImpl.Token" />
-      </node>
-      <node concept="3Tm1VV" id="6R6MIbUsyqO" role="1B3o_S" />
-      <node concept="3clFbS" id="6R6MIbUsyqU" role="3clF47">
-        <node concept="3clFbF" id="6tPOoeT44h_" role="3cqZAp">
-          <node concept="2ShNRf" id="6tPOoeT44hA" role="3clFbG">
-            <node concept="1pGfFk" id="6tPOoeT44hB" role="2ShVmc">
-              <ref role="37wK5l" node="6tPOoeT3Z1B" resolve="QueryTemplateImpl.Token" />
-              <node concept="37vLTw" id="6R6MIbUt7_H" role="37wK5m">
-                <ref role="3cqZAo" node="6R6MIbUsyqL" resolve="session" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="6R6MIbUsyqV" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6tPOoeT3NWW" role="jymVt" />
-    <node concept="312cEu" id="6OXbTD$r8hA" role="jymVt">
-      <property role="2bfB8j" value="false" />
-      <property role="TrG5h" value="Configurable" />
-      <node concept="2tJIrI" id="6OXbTD$r8hB" role="jymVt" />
-      <node concept="3clFb_" id="6OXbTD$r8hC" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="configure" />
-        <node concept="37vLTG" id="6OXbTD$r8hD" role="3clF46">
-          <property role="TrG5h" value="stage" />
-          <node concept="17QB3L" id="6OXbTD$r8hE" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="6OXbTD$r8hF" role="3clF46">
-          <property role="TrG5h" value="config" />
-          <node concept="3uibUv" id="6OXbTD$r8hG" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
-          </node>
-        </node>
-        <node concept="3uibUv" id="6OXbTD$r8hH" role="3clF45">
-          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
-        </node>
-        <node concept="3Tm1VV" id="6OXbTD$r8hI" role="1B3o_S" />
-        <node concept="3clFbS" id="6OXbTD$r8hJ" role="3clF47">
-          <node concept="3clFbF" id="6OXbTD$r8hK" role="3cqZAp">
-            <node concept="37vLTw" id="6OXbTD$r8hL" role="3clFbG">
-              <ref role="3cqZAo" node="6OXbTD$r8hF" resolve="config" />
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="6OXbTD$r8hM" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="6OXbTD$r8hN" role="jymVt" />
-      <node concept="3Tm1VV" id="6OXbTD$r8hO" role="1B3o_S" />
-      <node concept="3uibUv" id="6OXbTD$r8hP" role="EKbjA">
-        <ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6OXbTD$joxi" role="jymVt" />
-    <node concept="3Tm1VV" id="6OXbTD$fBEZ" role="1B3o_S" />
-    <node concept="n94m4" id="6OXbTD$fBF0" role="lGtFl">
-      <ref role="n9lRv" to="wq2x:6OXbTD$dU7b" resolve="Query" />
-    </node>
-    <node concept="17Uvod" id="6R6MIbU9jV9" role="lGtFl">
-      <property role="2qtEX9" value="name" />
-      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-      <node concept="3zFVjK" id="6R6MIbU9jVa" role="3zH0cK">
-        <node concept="3clFbS" id="6R6MIbU9jVb" role="2VODD2">
-          <node concept="3clFbF" id="6OXbTDzn1Cc" role="3cqZAp">
-            <node concept="3cpWs3" id="6OXbTDzn8_I" role="3clFbG">
-              <node concept="2OqwBi" id="6OXbTDzna3X" role="3uHU7w">
-                <node concept="35c_gC" id="6OXbTDzn91I" role="2Oq$k0">
-                  <ref role="35c_gD" to="wq2x:6OXbTD$dU7b" resolve="Query" />
-                </node>
-                <node concept="3n3YKJ" id="6OXbTDznb3m" role="2OqNvi" />
-              </node>
-              <node concept="3cpWs3" id="6OXbTDzn6VY" role="3uHU7B">
-                <node concept="2OqwBi" id="6OXbTDzn1Ce" role="3uHU7B">
-                  <node concept="30H73N" id="6OXbTDzn1Cf" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="6OXbTDzn1Cg" role="2OqNvi">
-                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                  </node>
-                </node>
-                <node concept="Xl_RD" id="6OXbTDzn7j9" role="3uHU7w">
-                  <property role="Xl_RC" value="_" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3uibUv" id="6R6MIbU9dNK" role="1zkMxy">
-      <ref role="3uigEE" to="i348:6R6MIbU8KKa" resolve="AbstractQueryTemplate" />
-      <node concept="3uibUv" id="6R6MIbU9iLG" role="11_B2D">
-        <ref role="3uigEE" node="6tPOoeT3Z1_" resolve="QueryTemplateImpl.Token" />
-      </node>
-    </node>
-  </node>
   <node concept="bUwia" id="2BZXJecSPFv">
     <property role="3GE5qa" value="query" />
     <property role="TrG5h" value="query" />
@@ -17458,29 +16668,6 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="5EDW3XF6vVW" role="jymVt" />
-    <node concept="3clFb_" id="5EDW3XF6zkv" role="jymVt">
-      <property role="TrG5h" value="queryTemplates" />
-      <node concept="_YKpA" id="5EDW3XF6zkw" role="3clF45">
-        <node concept="3uibUv" id="5EDW3XF6zkx" role="_ZDj9">
-          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5EDW3XF6zky" role="1B3o_S" />
-      <node concept="2AHcQZ" id="5EDW3XF6zk$" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-      <node concept="3clFbS" id="5EDW3XF6zk_" role="3clF47">
-        <node concept="3clFbF" id="5EDW3XF6$ey" role="3cqZAp">
-          <node concept="37vLTw" id="5EDW3XF6$ex" role="3clFbG">
-            <ref role="3cqZAo" node="5EDW3XF6d9D" resolve="queryTemplates" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5EDW3XF6zkA" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="5EDW3XF6zXt" role="jymVt" />
     <node concept="3clFb_" id="5EDW3XF62NQ" role="jymVt">
       <property role="TrG5h" value="analyses" />
@@ -17677,93 +16864,6 @@
             </node>
           </node>
         </node>
-        <node concept="9aQIb" id="5EDW3XF6i5h" role="3cqZAp">
-          <node concept="3clFbS" id="5EDW3XF6i5j" role="9aQI4">
-            <node concept="3cpWs8" id="5EDW3XF6eoq" role="3cqZAp">
-              <node concept="3cpWsn" id="5EDW3XF6eor" role="3cpWs9">
-                <property role="TrG5h" value="qtpl" />
-                <node concept="_YKpA" id="5EDW3XF6eos" role="1tU5fm">
-                  <node concept="3uibUv" id="5EDW3XF6eot" role="_ZDj9">
-                    <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
-                  </node>
-                </node>
-                <node concept="2ShNRf" id="5EDW3XF6eou" role="33vP2m">
-                  <node concept="Tc6Ow" id="5EDW3XF6eov" role="2ShVmc">
-                    <node concept="3uibUv" id="5EDW3XF6eow" role="HW$YZ">
-                      <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="5EDW3XF6eox" role="3cqZAp">
-              <node concept="2OqwBi" id="5EDW3XF6eoy" role="3clFbG">
-                <node concept="37vLTw" id="5EDW3XF6eoz" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5EDW3XF6eor" resolve="qtpl" />
-                </node>
-                <node concept="TSZUe" id="5EDW3XF6eo$" role="2OqNvi">
-                  <node concept="2ShNRf" id="5EDW3XF6eo_" role="25WWJ7">
-                    <node concept="1pGfFk" id="5EDW3XF6eoA" role="2ShVmc">
-                      <ref role="37wK5l" node="6OXbTD$juGj" resolve="QueryTemplateImpl" />
-                      <node concept="1ZhdrF" id="5EDW3XF6eoB" role="lGtFl">
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                        <property role="2qtEX8" value="baseMethodDeclaration" />
-                        <node concept="3$xsQk" id="5EDW3XF6eoC" role="3$ytzL">
-                          <node concept="3clFbS" id="5EDW3XF6eoD" role="2VODD2">
-                            <node concept="3clFbF" id="5EDW3XF6eoE" role="3cqZAp">
-                              <node concept="2OqwBi" id="5EDW3XF6eoF" role="3clFbG">
-                                <node concept="1iwH7S" id="5EDW3XF6eoG" role="2Oq$k0" />
-                                <node concept="1iwH70" id="5EDW3XF6eoH" role="2OqNvi">
-                                  <ref role="1iwH77" node="6OXbTD$ko7g" resolve="query_constructor" />
-                                  <node concept="30H73N" id="5EDW3XF6eoI" role="1iwH7V" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1WS0z7" id="5EDW3XF6eoJ" role="lGtFl">
-                <node concept="3JmXsc" id="5EDW3XF6eoK" role="3Jn$fo">
-                  <node concept="3clFbS" id="5EDW3XF6eoL" role="2VODD2">
-                    <node concept="3clFbF" id="5EDW3XF6eoM" role="3cqZAp">
-                      <node concept="2OqwBi" id="5EDW3XF6eoN" role="3clFbG">
-                        <node concept="2OqwBi" id="5EDW3XF6eoO" role="2Oq$k0">
-                          <node concept="1iwH7S" id="5EDW3XF6eoP" role="2Oq$k0" />
-                          <node concept="1r8y6K" id="5EDW3XF6eoQ" role="2OqNvi" />
-                        </node>
-                        <node concept="2SmgA7" id="5EDW3XF6eoR" role="2OqNvi">
-                          <node concept="chp4Y" id="5EDW3XF6eoS" role="1dBWTz">
-                            <ref role="cht4Q" to="wq2x:6OXbTD$dU7b" resolve="Query" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="5EDW3XF6eoT" role="3cqZAp">
-              <node concept="37vLTI" id="5EDW3XF6eoU" role="3clFbG">
-                <node concept="2OqwBi" id="5EDW3XF6eoV" role="37vLTx">
-                  <node concept="37vLTw" id="5EDW3XF6eoW" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5EDW3XF6eor" resolve="qtpl" />
-                  </node>
-                  <node concept="26Dbio" id="5EDW3XF6eoX" role="2OqNvi" />
-                </node>
-                <node concept="2OqwBi" id="5EDW3XF6eoY" role="37vLTJ">
-                  <node concept="Xjq3P" id="5EDW3XF6eoZ" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="5EDW3XF6ep0" role="2OqNvi">
-                    <ref role="2Oxat5" node="5EDW3XF6d9D" resolve="queryTemplates" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="9aQIb" id="tbauFy4Dov" role="3cqZAp">
           <node concept="3clFbS" id="tbauFy4Dow" role="9aQI4">
             <node concept="3cpWs8" id="tbauFy4Dox" role="3cqZAp">
@@ -17929,22 +17029,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5EDW3XF6dvu" role="jymVt" />
-    <node concept="312cEg" id="5EDW3XF6d9D" role="jymVt">
-      <property role="TrG5h" value="queryTemplates" />
-      <node concept="3Tm6S6" id="5EDW3XF6d9E" role="1B3o_S" />
-      <node concept="_YKpA" id="5EDW3XF6d9F" role="1tU5fm">
-        <node concept="3uibUv" id="5EDW3XF6d9G" role="_ZDj9">
-          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
-        </node>
-      </node>
-      <node concept="z59LJ" id="5EDW3XF6dZg" role="lGtFl">
-        <node concept="TZ5HA" id="5EDW3XF6dZh" role="TZ5H$">
-          <node concept="1dT_AC" id="5EDW3XF6dZi" role="1dT_Ay">
-            <property role="1dT_AB" value="FIXME " />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="312cEg" id="tbauFy4C_W" role="jymVt">
       <property role="TrG5h" value="queryTables" />
       <node concept="3Tm6S6" id="tbauFy4C_X" role="1B3o_S" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index 56598fd1..204cb743 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -73,7 +73,6 @@
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
@@ -142,11 +141,6 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
-        <child id="1196350785114" name="quotedNode" index="2c44tc" />
-      </concept>
-    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -246,28 +240,6 @@
       <concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
     </language>
   </registry>
-  <node concept="13h7C7" id="6ntBQ9KFIzq">
-    <property role="3GE5qa" value="rule.code" />
-    <ref role="13h7C2" to="wq2x:4laj_h9P4cy" resolve="Condition" />
-    <node concept="13hLZK" id="6ntBQ9KFIzr" role="13h7CW">
-      <node concept="3clFbS" id="6ntBQ9KFIzs" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="6ntBQ9KHl13" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="TrG5h" value="getExpectedRetType" />
-      <property role="13i0it" value="false" />
-      <ref role="13i0hy" to="tpek:i2fhBNC" resolve="getExpectedRetType" />
-      <node concept="3Tm1VV" id="6ntBQ9KHl14" role="1B3o_S" />
-      <node concept="3clFbS" id="6ntBQ9KHl17" role="3clF47">
-        <node concept="3clFbF" id="6ntBQ9KHldy" role="3cqZAp">
-          <node concept="2c44tf" id="6ntBQ9KHldw" role="3clFbG">
-            <node concept="10P_77" id="6ntBQ9KHlgF" role="2c44tc" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="6ntBQ9KHl18" role="3clF45" />
-    </node>
-  </node>
   <node concept="13h7C7" id="5JTOzCQWtZa">
     <property role="3GE5qa" value="rule.component" />
     <ref role="13h7C2" to="wq2x:6p0DfM0a3TO" resolve="Body" />
@@ -372,59 +344,6 @@
       </node>
     </node>
   </node>
-  <node concept="13h7C7" id="1hX44vMIE6x">
-    <ref role="13h7C2" to="wq2x:1hX44vMFoce" resolve="CodeBlock" />
-    <node concept="13i0hz" id="1hX44vMIE7t" role="13h7CS">
-      <property role="TrG5h" value="isStatementListCompactable" />
-      <property role="13i0it" value="false" />
-      <property role="13i0iv" value="false" />
-      <ref role="13i0hy" to="tpek:i0zvp2S" resolve="isStatementListCompactable" />
-      <node concept="3Tm1VV" id="1hX44vMIE7u" role="1B3o_S" />
-      <node concept="3clFbS" id="1hX44vMIE7v" role="3clF47">
-        <node concept="3clFbF" id="1hX44vMIE7w" role="3cqZAp">
-          <node concept="3clFbT" id="1hX44vMIE7x" role="3clFbG">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-      <node concept="10P_77" id="1hX44vMIE7y" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="1hX44vMIE7z" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="TrG5h" value="getBody" />
-      <property role="13i0it" value="false" />
-      <ref role="13i0hy" to="tpek:i2fhZ_m" resolve="getBody" />
-      <node concept="3Tm1VV" id="1hX44vMIE7$" role="1B3o_S" />
-      <node concept="3clFbS" id="1hX44vMIE7_" role="3clF47">
-        <node concept="3clFbF" id="1hX44vMIE7A" role="3cqZAp">
-          <node concept="BsUDl" id="1hX44vMIE7B" role="3clFbG">
-            <ref role="37wK5l" to="tpek:i0zv5tb" resolve="getStatementList" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="1hX44vMIE7C" role="3clF45">
-        <ref role="ehGHo" to="tpee:fzclF80" resolve="StatementList" />
-      </node>
-    </node>
-    <node concept="13i0hz" id="1hX44vMIE7D" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="TrG5h" value="getThrowableTypes" />
-      <property role="13i0it" value="false" />
-      <ref role="13i0hy" to="tpek:5op8ooRkkc7" resolve="getThrowableTypes" />
-      <node concept="3Tm1VV" id="1hX44vMIE7E" role="1B3o_S" />
-      <node concept="3clFbS" id="1hX44vMIE7F" role="3clF47">
-        <node concept="3clFbF" id="1hX44vMIE7G" role="3cqZAp">
-          <node concept="10Nm6u" id="1hX44vMIE7H" role="3clFbG" />
-        </node>
-      </node>
-      <node concept="2I9FWS" id="1hX44vMIE7I" role="3clF45">
-        <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
-      </node>
-    </node>
-    <node concept="13hLZK" id="1hX44vMIE6y" role="13h7CW">
-      <node concept="3clFbS" id="1hX44vMIE6z" role="2VODD2" />
-    </node>
-  </node>
   <node concept="13h7C7" id="4MEOIDG83WW">
     <property role="3GE5qa" value="macro" />
     <ref role="13h7C2" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
@@ -655,40 +574,8 @@
         </node>
         <node concept="3clFbF" id="7lt0LtPIy7B" role="3cqZAp">
           <node concept="2OqwBi" id="4beNoh2th9$" role="3clFbG">
-            <node concept="2OqwBi" id="7lt0LtPIy7C" role="2Oq$k0">
-              <node concept="37vLTw" id="7lt0LtPIy7D" role="2Oq$k0">
-                <ref role="3cqZAo" node="7lt0LtPIy7n" resolve="varDecls" />
-              </node>
-              <node concept="3QWeyG" id="7lt0LtPIy7E" role="2OqNvi">
-                <node concept="2OqwBi" id="7lt0LtPIy7F" role="576Qk">
-                  <node concept="2OqwBi" id="7lt0LtPIy7G" role="2Oq$k0">
-                    <node concept="13iPFW" id="7lt0LtPIy7H" role="2Oq$k0" />
-                    <node concept="3Tsc0h" id="4beNoh2entW" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
-                    </node>
-                  </node>
-                  <node concept="3goQfb" id="7lt0LtPIy7J" role="2OqNvi">
-                    <node concept="1bVj0M" id="7lt0LtPIy7K" role="23t8la">
-                      <node concept="3clFbS" id="7lt0LtPIy7L" role="1bW5cS">
-                        <node concept="3clFbF" id="7lt0LtPIy7M" role="3cqZAp">
-                          <node concept="2OqwBi" id="7lt0LtPIy7N" role="3clFbG">
-                            <node concept="37vLTw" id="7lt0LtPIy7O" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7lt0LtPIy7Q" resolve="it" />
-                            </node>
-                            <node concept="2qgKlT" id="5TXeSYSxPiA" role="2OqNvi">
-                              <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Rh6nW" id="7lt0LtPIy7Q" role="1bW2Oz">
-                        <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7lt0LtPIy7R" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
+            <node concept="37vLTw" id="7lt0LtPIy7D" role="2Oq$k0">
+              <ref role="3cqZAo" node="7lt0LtPIy7n" resolve="varDecls" />
             </node>
             <node concept="3QWeyG" id="4beNoh2thmY" role="2OqNvi">
               <node concept="2OqwBi" id="4beNoh2thmZ" role="576Qk">
@@ -735,28 +622,18 @@
       <node concept="3clFbS" id="36tQV5ArDPT" role="3clF47">
         <node concept="3clFbF" id="36tQV5ArDPU" role="3cqZAp">
           <node concept="2OqwBi" id="6E2cNibpO_S" role="3clFbG">
-            <node concept="2OqwBi" id="36tQV5ArDPV" role="2Oq$k0">
-              <node concept="2OqwBi" id="36tQV5ArDPW" role="2Oq$k0">
-                <node concept="2OqwBi" id="36tQV5ArDPX" role="2Oq$k0">
-                  <node concept="13iPFW" id="36tQV5ArDPY" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="36tQV5ArDPZ" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:36tQV5AmIsU" resolve="head" />
-                  </node>
-                </node>
-                <node concept="3QWeyG" id="36tQV5ArDQ0" role="2OqNvi">
-                  <node concept="2OqwBi" id="36tQV5ArDQ1" role="576Qk">
-                    <node concept="13iPFW" id="36tQV5ArDQ2" role="2Oq$k0" />
-                    <node concept="3Tsc0h" id="36tQV5ArDQ3" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:36tQV5AmIsV" resolve="guard" />
-                    </node>
-                  </node>
+            <node concept="2OqwBi" id="36tQV5ArDPW" role="2Oq$k0">
+              <node concept="2OqwBi" id="36tQV5ArDPX" role="2Oq$k0">
+                <node concept="13iPFW" id="36tQV5ArDPY" role="2Oq$k0" />
+                <node concept="3Tsc0h" id="36tQV5ArDPZ" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:36tQV5AmIsU" resolve="head" />
                 </node>
               </node>
-              <node concept="3QWeyG" id="36tQV5ArDQ4" role="2OqNvi">
-                <node concept="2OqwBi" id="36tQV5ArDQ5" role="576Qk">
-                  <node concept="13iPFW" id="36tQV5ArDQ6" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="36tQV5ArDQ7" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
+              <node concept="3QWeyG" id="36tQV5ArDQ0" role="2OqNvi">
+                <node concept="2OqwBi" id="36tQV5ArDQ1" role="576Qk">
+                  <node concept="13iPFW" id="36tQV5ArDQ2" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="36tQV5ArDQ3" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:36tQV5AmIsV" resolve="guard" />
                   </node>
                 </node>
               </node>
@@ -819,55 +696,6 @@
       </node>
     </node>
   </node>
-  <node concept="13h7C7" id="7lt0LtPpOZD">
-    <property role="3GE5qa" value="rule.component" />
-    <ref role="13h7C2" to="wq2x:7lt0LtPpEVM" resolve="ParameterContainer" />
-    <node concept="13hLZK" id="7lt0LtPpOZE" role="13h7CW">
-      <node concept="3clFbS" id="7lt0LtPpOZF" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="5TXeSYSxSF9" role="13h7CS">
-      <property role="TrG5h" value="availableLogicalVariable" />
-      <ref role="13i0hy" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
-      <node concept="3Tm1VV" id="5TXeSYSxSFa" role="1B3o_S" />
-      <node concept="3clFbS" id="5TXeSYSxSFg" role="3clF47">
-        <node concept="3clFbF" id="7lt0LtPpPoS" role="3cqZAp">
-          <node concept="2OqwBi" id="7lt0LtPpPoT" role="3clFbG">
-            <node concept="2OqwBi" id="7lt0LtPpPoU" role="2Oq$k0">
-              <node concept="13iPFW" id="7lt0LtPpPoV" role="2Oq$k0" />
-              <node concept="3Tsc0h" id="7lt0LtPpPoW" role="2OqNvi">
-                <ref role="3TtcxE" to="wq2x:7lt0LtPpF3M" resolve="parameter" />
-              </node>
-            </node>
-            <node concept="3goQfb" id="7lt0LtPpPoX" role="2OqNvi">
-              <node concept="1bVj0M" id="7lt0LtPpPoY" role="23t8la">
-                <node concept="3clFbS" id="7lt0LtPpPoZ" role="1bW5cS">
-                  <node concept="3clFbF" id="7lt0LtPpPp0" role="3cqZAp">
-                    <node concept="2OqwBi" id="7lt0LtPpPp1" role="3clFbG">
-                      <node concept="37vLTw" id="7lt0LtPpPp2" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7lt0LtPpPp4" resolve="pd" />
-                      </node>
-                      <node concept="3Tsc0h" id="7lt0LtPpPp3" role="2OqNvi">
-                        <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="Rh6nW" id="7lt0LtPpPp4" role="1bW2Oz">
-                  <property role="TrG5h" value="pd" />
-                  <node concept="2jxLKc" id="7lt0LtPpPp5" role="1tU5fm" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="A3Dl8" id="5TXeSYSxSFh" role="3clF45">
-        <node concept="3Tqbb2" id="5TXeSYSxSFi" role="A3Ik2">
-          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="13h7C7" id="34$A1Mf3_W$">
     <property role="3GE5qa" value="rule" />
     <ref role="13h7C2" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index c0c8ac6f..e8255432 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -28,7 +28,6 @@
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
   </imports>
@@ -1356,34 +1355,6 @@
       <node concept="l2Vlx" id="6p0DfM0oEaq" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="4laj_h9P4sB">
-    <property role="3GE5qa" value="rule.code" />
-    <ref role="1XX52x" to="wq2x:4laj_h9P4cy" resolve="Condition" />
-    <node concept="3EZMnI" id="4laj_h9P4C7" role="2wV5jI">
-      <node concept="3EZMnI" id="6ntBQ9KCpY2" role="3EZMnx">
-        <node concept="VPM3Z" id="6ntBQ9KCpY4" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="l2Vlx" id="6ntBQ9KCpY7" role="2iSdaV" />
-        <node concept="3F0ifn" id="4laj_h9P4C8" role="3EZMnx">
-          <property role="3F0ifm" value="apply if" />
-          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="4laj_h9P4C9" role="3EZMnx">
-        <property role="3F0ifm" value="{" />
-        <ref role="1k5W1q" to="tpen:hFD5onb" resolve="LeftBrace" />
-      </node>
-      <node concept="PMmxH" id="3g$8GQC8vbw" role="3EZMnx">
-        <ref role="PMmxG" node="1hX44vMKXy$" resolve="CodeBlockComponent" />
-      </node>
-      <node concept="3F0ifn" id="4laj_h9P4Cd" role="3EZMnx">
-        <property role="3F0ifm" value="}" />
-        <ref role="1k5W1q" to="tpen:hFD5_7H" resolve="RightBrace" />
-      </node>
-      <node concept="l2Vlx" id="4laj_h9P4Cf" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="1h_SRR" id="12yN8DyB6zn">
     <property role="3GE5qa" value="rule" />
     <property role="TrG5h" value="RuleInput_ActionMap" />
@@ -1578,35 +1549,6 @@
       <node concept="l2Vlx" id="4EfgX2EvGmB" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="6infEALDvtu">
-    <property role="3GE5qa" value="constraint" />
-    <ref role="1XX52x" to="wq2x:6infEALDvmn" resolve="AssertExpressionConstraint" />
-    <node concept="3EZMnI" id="6infEALDvB0" role="2wV5jI">
-      <node concept="3F0ifn" id="6infEALDvB7" role="3EZMnx">
-        <property role="3F0ifm" value="assert" />
-        <ref role="1k5W1q" node="7ksQUDZpyGq" resolve="Constraint" />
-        <node concept="Vb9p2" id="6infEALDvDM" role="3F10Kt" />
-      </node>
-      <node concept="3F0ifn" id="6infEALDvWY" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
-        <node concept="11LMrY" id="6infEALDw9k" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F1sOY" id="6infEALEWJm" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:4EfgX2EvGcc" resolve="expression" />
-      </node>
-      <node concept="3F0ifn" id="6infEALDvX8" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-        <ref role="1k5W1q" to="tpen:hFD5_7H" resolve="RightBrace" />
-        <node concept="11L4FC" id="6infEALDw8t" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="l2Vlx" id="6infEALDvB3" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="1CgWc1Tyjl0">
     <property role="3GE5qa" value="comment" />
     <ref role="1XX52x" to="wq2x:1CgWc1Tyjkw" resolve="Comment" />
@@ -1889,96 +1831,6 @@
       <node concept="l2Vlx" id="PB1R3Y7Jd7" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="1hX44vMFocR">
-    <ref role="1XX52x" to="wq2x:1hX44vMFoce" resolve="CodeBlock" />
-    <node concept="PMmxH" id="1hX44vMKXQP" role="2wV5jI">
-      <ref role="PMmxG" node="1hX44vMKXy$" resolve="CodeBlockComponent" />
-    </node>
-  </node>
-  <node concept="PKFIW" id="1hX44vMKXy$">
-    <property role="TrG5h" value="CodeBlockComponent" />
-    <ref role="1XX52x" to="wq2x:1hX44vMFoce" resolve="CodeBlock" />
-    <node concept="3EZMnI" id="1hX44vMFqnP" role="2wV5jI">
-      <property role="S$Qs1" value="true" />
-      <node concept="VPM3Z" id="1hX44vMFqnQ" role="3F10Kt">
-        <property role="VOm3f" value="false" />
-      </node>
-      <node concept="pVoyu" id="1hX44vMFqnR" role="3F10Kt">
-        <property role="VOm3f" value="true" />
-        <node concept="3nzxsE" id="1hX44vMFqnS" role="3n$kyP">
-          <node concept="3clFbS" id="1hX44vMFqnT" role="2VODD2">
-            <node concept="3clFbF" id="1hX44vMFqnU" role="3cqZAp">
-              <node concept="3fqX7Q" id="1hX44vMFqnV" role="3clFbG">
-                <node concept="2OqwBi" id="1hX44vMFqnW" role="3fr31v">
-                  <node concept="2OqwBi" id="1hX44vMFqnX" role="2Oq$k0">
-                    <node concept="pncrf" id="1hX44vMFqnY" role="2Oq$k0" />
-                    <node concept="2qgKlT" id="1hX44vMFqnZ" role="2OqNvi">
-                      <ref role="37wK5l" to="tpek:i0zv5tb" resolve="getStatementList" />
-                    </node>
-                  </node>
-                  <node concept="2qgKlT" id="1hX44vMFqo0" role="2OqNvi">
-                    <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="lj46D" id="1hX44vMFqo1" role="3F10Kt">
-        <property role="VOm3f" value="true" />
-        <node concept="3nzxsE" id="1hX44vMFqo2" role="3n$kyP">
-          <node concept="3clFbS" id="1hX44vMFqo3" role="2VODD2">
-            <node concept="3clFbF" id="1hX44vMFqo4" role="3cqZAp">
-              <node concept="3fqX7Q" id="1hX44vMFqo5" role="3clFbG">
-                <node concept="2OqwBi" id="1hX44vMFqo6" role="3fr31v">
-                  <node concept="2OqwBi" id="1hX44vMFqo7" role="2Oq$k0">
-                    <node concept="pncrf" id="1hX44vMFqo8" role="2Oq$k0" />
-                    <node concept="2qgKlT" id="1hX44vMFqo9" role="2OqNvi">
-                      <ref role="37wK5l" to="tpek:i0zv5tb" resolve="getStatementList" />
-                    </node>
-                  </node>
-                  <node concept="2qgKlT" id="1hX44vMFqoa" role="2OqNvi">
-                    <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="ljvvj" id="1hX44vMFqob" role="3F10Kt">
-        <property role="VOm3f" value="true" />
-        <node concept="3nzxsE" id="1hX44vMFqoc" role="3n$kyP">
-          <node concept="3clFbS" id="1hX44vMFqod" role="2VODD2">
-            <node concept="3clFbF" id="1hX44vMFqoe" role="3cqZAp">
-              <node concept="3fqX7Q" id="1hX44vMFqof" role="3clFbG">
-                <node concept="2OqwBi" id="1hX44vMFqog" role="3fr31v">
-                  <node concept="2OqwBi" id="1hX44vMFqoh" role="2Oq$k0">
-                    <node concept="pncrf" id="1hX44vMFqoi" role="2Oq$k0" />
-                    <node concept="2qgKlT" id="1hX44vMFqoj" role="2OqNvi">
-                      <ref role="37wK5l" to="tpek:i0zv5tb" resolve="getStatementList" />
-                    </node>
-                  </node>
-                  <node concept="2qgKlT" id="1hX44vMFqok" role="2OqNvi">
-                    <ref role="37wK5l" to="tpek:i0z3USV" resolve="isOneLiner" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="l2Vlx" id="1hX44vMFqol" role="2iSdaV" />
-      <node concept="3F1sOY" id="1hX44vMFqom" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:tIwzd1_VRv" resolve="code" />
-      </node>
-      <node concept="3F0ifn" id="1hX44vMFqGR" role="AHCbl">
-        <property role="3F0ifm" value="{...}" />
-        <ref role="1k5W1q" to="tpen:4vxLnq9T43C" resolve="FoldedCell" />
-      </node>
-    </node>
-  </node>
   <node concept="24kQdi" id="7IysFe_ZPXL">
     <property role="3GE5qa" value="macro.decl" />
     <ref role="1XX52x" to="wq2x:7IysFe_ZPXH" resolve="MacroBodyLogicalDeclaration" />
@@ -3109,46 +2961,6 @@
           </node>
         </node>
       </node>
-      <node concept="3F2HdR" id="4beNoh26ehA" role="3EZMnx">
-        <property role="2czwfO" value=" " />
-        <ref role="1NtTu8" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
-        <node concept="l2Vlx" id="4beNoh26ehC" role="2czzBx" />
-        <node concept="pkWqt" id="4beNoh26ej3" role="pqm2j">
-          <node concept="3clFbS" id="4beNoh26ej4" role="2VODD2">
-            <node concept="3clFbF" id="4beNoh26ejP" role="3cqZAp">
-              <node concept="2OqwBi" id="4beNoh26gI1" role="3clFbG">
-                <node concept="2OqwBi" id="4beNoh26ey5" role="2Oq$k0">
-                  <node concept="pncrf" id="4beNoh26ejO" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="4beNoh26eMr" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
-                  </node>
-                </node>
-                <node concept="3GX2aA" id="4beNoh26iUr" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="tppnM" id="4beNoh26j0c" role="sWeuL">
-          <node concept="ljvvj" id="4beNoh26j7f" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="3nxI2P" id="4beNoh26j7k" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="pVoyu" id="4beNoh26jll" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="1Bsynf" id="4beNoh26jsq" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="1Bt7hp" id="4beNoh26jsr" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="VPM3Z" id="4beNoh26jss" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-      </node>
       <node concept="3F2HdR" id="36tQV5AmMLS" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:36tQV5AmIsU" resolve="head" />
         <node concept="l2Vlx" id="36tQV5AmMLT" role="2czzBx" />
@@ -3236,115 +3048,6 @@
           </node>
         </node>
       </node>
-      <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="3F0ifn" id="36tQV5AmMMd" role="3EZMnx">
-          <property role="3F0ifm" value="activate" />
-          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
-          <node concept="3nxI2P" id="6E2cNibusSy" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <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 concept="pkWqt" id="b5g$pBtXSZ" role="pqm2j">
-            <node concept="3clFbS" id="b5g$pBtXT0" role="2VODD2">
-              <node concept="3clFbF" id="b5g$pBtXT6" role="3cqZAp">
-                <node concept="2OqwBi" id="b5g$pBtXT7" role="3clFbG">
-                  <node concept="2OqwBi" id="b5g$pBtXT8" role="2Oq$k0">
-                    <node concept="pncrf" id="b5g$pBtXT9" role="2Oq$k0" />
-                    <node concept="3Tsc0h" id="6E2cNibut9U" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
-                    </node>
-                  </node>
-                  <node concept="3GX2aA" id="b5g$pBtXTb" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="l2Vlx" id="4TI9yUdqXuc" role="2iSdaV" />
-        <node concept="3F2HdR" id="36tQV5AmMMk" role="3EZMnx">
-          <property role="2czwfO" value="else" />
-          <ref role="1NtTu8" to="wq2x:36tQV5AmIsW" resolve="body" />
-          <node concept="lj46D" id="b5g$pBsS9o" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="pVoyu" id="b5g$pBsROj" role="3F10Kt">
-            <node concept="3nzxsE" id="b5g$pBsROk" role="3n$kyP">
-              <node concept="3clFbS" id="b5g$pBsROl" role="2VODD2">
-                <node concept="3clFbF" id="b5g$pBsROm" role="3cqZAp">
-                  <node concept="2OqwBi" id="b5g$pBsROn" role="3clFbG">
-                    <node concept="2OqwBi" id="b5g$pBsROo" role="2Oq$k0">
-                      <node concept="pncrf" id="b5g$pBsROp" role="2Oq$k0" />
-                      <node concept="3Tsc0h" id="6E2cNibKkzN" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
-                      </node>
-                    </node>
-                    <node concept="3GX2aA" id="b5g$pBsROr" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <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="3nxI2P" id="6E2cNibvc0o" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <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="g1_k_vY/BOLD" />
-            </node>
-          </node>
-        </node>
-        <node concept="pkWqt" id="6E2cNibKsrz" role="pqm2j">
-          <node concept="3clFbS" id="6E2cNibKsr$" role="2VODD2">
-            <node concept="3clFbF" id="6E2cNibKsuf" role="3cqZAp">
-              <node concept="2OqwBi" id="6E2cNibKuXc" role="3clFbG">
-                <node concept="2OqwBi" id="6E2cNibKsG9" role="2Oq$k0">
-                  <node concept="pncrf" id="6E2cNibKsue" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="6E2cNibKsLp" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
-                  </node>
-                </node>
-                <node concept="3GX2aA" id="6E2cNibKxhD" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="3EZMnI" id="6E2cNibus_$" role="3EZMnx">
         <node concept="VPM3Z" id="6E2cNibus__" role="3F10Kt" />
         <node concept="pVoyu" id="6E2cNibus_A" role="3F10Kt">
@@ -3541,52 +3244,6 @@
           </node>
         </node>
       </node>
-      <node concept="3EZMnI" id="36tQV5AmP0Z" role="3EZMnx">
-        <node concept="VPM3Z" id="36tQV5AmP10" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="pVoyu" id="6F9w2VbMZHf" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-          <node concept="3nzxsE" id="6F9w2VbMZI4" role="3n$kyP">
-            <node concept="3clFbS" id="6F9w2VbMZI5" role="2VODD2">
-              <node concept="3clFbF" id="6F9w2VbMZJ0" role="3cqZAp">
-                <node concept="2OqwBi" id="6F9w2VbN1bj" role="3clFbG">
-                  <node concept="2OqwBi" id="6F9w2VbMZZt" role="2Oq$k0">
-                    <node concept="pncrf" id="6F9w2VbMZIZ" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="6F9w2VbN0Ef" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:36tQV5AmQgD" resolve="condition" />
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="6F9w2VbN1QP" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="ljvvj" id="36tQV5AyoeJ" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="l2Vlx" id="36tQV5AmP1a" role="2iSdaV" />
-        <node concept="3F1sOY" id="36tQV5AmP1b" role="3EZMnx">
-          <property role="1$x2rV" value="&lt;always apply&gt;" />
-          <ref role="1NtTu8" to="wq2x:36tQV5AmQgD" resolve="condition" />
-        </node>
-        <node concept="pkWqt" id="6E2cNid0050" role="pqm2j">
-          <node concept="3clFbS" id="6E2cNid0051" role="2VODD2">
-            <node concept="3clFbF" id="6E2cNid005a" role="3cqZAp">
-              <node concept="2OqwBi" id="6E2cNid005c" role="3clFbG">
-                <node concept="2OqwBi" id="6E2cNid005d" role="2Oq$k0">
-                  <node concept="pncrf" id="6E2cNid005e" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="6E2cNid005f" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:36tQV5AmQgD" resolve="condition" />
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="6E2cNid005g" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="3EZMnI" id="6E2cNicUiLp" role="3EZMnx">
         <property role="S$Qs1" value="true" />
         <node concept="VPM3Z" id="6E2cNicUiLr" role="3F10Kt" />
@@ -3708,42 +3365,6 @@
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="7lt0LtPpFq5">
-    <property role="3GE5qa" value="rule.component" />
-    <ref role="1XX52x" to="wq2x:7lt0LtPpEVM" resolve="ParameterContainer" />
-    <node concept="3EZMnI" id="7lt0LtPpFq7" role="2wV5jI">
-      <node concept="3F0ifn" id="7lt0LtPpFqe" role="3EZMnx">
-        <property role="3F0ifm" value="&lt;" />
-        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
-        <node concept="11LMrY" id="7lt0LtPpFqf" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="3nxI2P" id="4beNoh2tGlB" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F2HdR" id="7lt0LtPpFqg" role="3EZMnx">
-        <property role="2czwfO" value="," />
-        <ref role="1NtTu8" to="wq2x:7lt0LtPpF3M" resolve="parameter" />
-        <node concept="l2Vlx" id="7lt0LtPpFqh" role="2czzBx" />
-        <node concept="3F0ifn" id="7lt0LtPpFqi" role="2czzBI" />
-        <node concept="3nxI2P" id="4beNoh2tGlM" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="7lt0LtPpFqj" role="3EZMnx">
-        <property role="3F0ifm" value="&gt;" />
-        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
-        <node concept="11L4FC" id="7lt0LtPpFqk" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="3nxI2P" id="4beNoh2tGlI" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="l2Vlx" id="7lt0LtPpFqa" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="IW6AY" id="7lt0LtPHSPP">
     <property role="3GE5qa" value="rule" />
     <ref role="aqKnT" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
@@ -4084,35 +3705,6 @@
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="6OXbTD$dU7D">
-    <property role="3GE5qa" value="query" />
-    <ref role="1XX52x" to="wq2x:6OXbTD$dU7b" resolve="Query" />
-    <node concept="3EZMnI" id="6OXbTD$dU7F" role="2wV5jI">
-      <node concept="3F0ifn" id="2BZXJecJG7U" role="3EZMnx">
-        <property role="3F0ifm" value="query" />
-      </node>
-      <node concept="3F0A7n" id="6OXbTD$dU81" role="3EZMnx">
-        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-        <node concept="ljvvj" id="5EDW3XEVcOi" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="6OXbTD$dU8b" role="3EZMnx">
-        <property role="3F0ifm" value="" />
-        <node concept="ljvvj" id="6OXbTD$dU8j" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F2HdR" id="6OXbTD$dU7M" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:6OXbTD$dU7c" resolve="queryStage" />
-        <node concept="l2Vlx" id="6OXbTD$dU7O" role="2czzBx" />
-        <node concept="lj46D" id="2BZXJecJGc3" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="l2Vlx" id="6OXbTD$dU7I" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="12QmIo$ySTG">
     <property role="3GE5qa" value="rule.code" />
     <ref role="1XX52x" to="wq2x:12QmIo$yS$B" resolve="RequireAllStatement" />
@@ -4962,10 +4554,6 @@
       <node concept="l2Vlx" id="6E2cNibqdSI" role="2iSdaV" />
     </node>
   </node>
-  <node concept="3p36aQ" id="6510ArmLUqS">
-    <property role="3GE5qa" value="constraint" />
-    <ref role="aqKnT" to="wq2x:6infEALDvmn" resolve="AssertExpressionConstraint" />
-  </node>
   <node concept="3ICXOK" id="3pRhUEY_We4">
     <property role="3GE5qa" value="constraint" />
     <property role="TrG5h" value="AddTarget" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
index 2db7a22d..1324ef1e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps
@@ -709,45 +709,33 @@
           </node>
           <node concept="2OqwBi" id="1RMe_qTchUU" role="2GsD0m">
             <node concept="1eOMI4" id="6E2cNibpBSF" role="2Oq$k0">
-              <node concept="2OqwBi" id="6E2cNibpEwf" role="1eOMHV">
-                <node concept="2OqwBi" id="1RMe_qTcfTT" role="2Oq$k0">
-                  <node concept="37vLTw" id="1RMe_qTcfec" role="2Oq$k0">
+              <node concept="2OqwBi" id="6E2cNibpKfT" role="1eOMHV">
+                <node concept="2OqwBi" id="6E2cNibpHAZ" role="2Oq$k0">
+                  <node concept="37vLTw" id="6E2cNibpHkV" role="2Oq$k0">
                     <ref role="3cqZAo" node="5VJ3UjC4JLn" resolve="node" />
                   </node>
-                  <node concept="3Tsc0h" id="1RMe_qTch5M" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
+                  <node concept="3Tsc0h" id="6E2cNibpIA7" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:6E2cNiboHlF" resolve="body" />
                   </node>
                 </node>
-                <node concept="3QWeyG" id="6E2cNibpHbH" role="2OqNvi">
-                  <node concept="2OqwBi" id="6E2cNibpKfT" role="576Qk">
-                    <node concept="2OqwBi" id="6E2cNibpHAZ" role="2Oq$k0">
-                      <node concept="37vLTw" id="6E2cNibpHkV" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5VJ3UjC4JLn" resolve="node" />
-                      </node>
-                      <node concept="3Tsc0h" id="6E2cNibpIA7" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:6E2cNiboHlF" resolve="body" />
-                      </node>
-                    </node>
-                    <node concept="3goQfb" id="6E2cNibpMuL" role="2OqNvi">
-                      <node concept="1bVj0M" id="6E2cNibpMuN" role="23t8la">
-                        <node concept="3clFbS" id="6E2cNibpMuO" role="1bW5cS">
-                          <node concept="3clFbF" id="6E2cNibpMIp" role="3cqZAp">
-                            <node concept="2OqwBi" id="6E2cNibpN3y" role="3clFbG">
-                              <node concept="37vLTw" id="6E2cNibpMIo" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E2cNibpMuP" resolve="it" />
-                              </node>
-                              <node concept="3Tsc0h" id="6E2cNibpNqQ" role="2OqNvi">
-                                <ref role="3TtcxE" to="wq2x:6E2cNiboHlB" resolve="body" />
-                              </node>
-                            </node>
+                <node concept="3goQfb" id="6E2cNibpMuL" role="2OqNvi">
+                  <node concept="1bVj0M" id="6E2cNibpMuN" role="23t8la">
+                    <node concept="3clFbS" id="6E2cNibpMuO" role="1bW5cS">
+                      <node concept="3clFbF" id="6E2cNibpMIp" role="3cqZAp">
+                        <node concept="2OqwBi" id="6E2cNibpN3y" role="3clFbG">
+                          <node concept="37vLTw" id="6E2cNibpMIo" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6E2cNibpMuP" resolve="it" />
+                          </node>
+                          <node concept="3Tsc0h" id="6E2cNibpNqQ" role="2OqNvi">
+                            <ref role="3TtcxE" to="wq2x:6E2cNiboHlB" resolve="body" />
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6E2cNibpMuP" role="1bW2Oz">
-                          <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6E2cNibpMuQ" role="1tU5fm" />
-                        </node>
                       </node>
                     </node>
+                    <node concept="Rh6nW" id="6E2cNibpMuP" role="1bW2Oz">
+                      <property role="TrG5h" value="it" />
+                      <node concept="2jxLKc" id="6E2cNibpMuQ" role="1tU5fm" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -2338,24 +2326,6 @@
         <node concept="H_c77" id="4e0TwrfEwsz" role="1tU5fm" />
       </node>
       <node concept="3clFbS" id="4e0TwrfEkak" role="3clF47">
-        <node concept="3cpWs8" id="1$LYeHxzeFg" role="3cqZAp">
-          <node concept="3cpWsn" id="1$LYeHxzeFj" role="3cpWs9">
-            <property role="TrG5h" value="queries" />
-            <node concept="A3Dl8" id="1$LYeHxzeFd" role="1tU5fm">
-              <node concept="3Tqbb2" id="1$LYeHxzeI0" role="A3Ik2">
-                <ref role="ehGHo" to="wq2x:6OXbTD$dU7b" resolve="Query" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="1$LYeHxzeMN" role="33vP2m">
-              <node concept="37vLTw" id="1$LYeHxzeMO" role="2Oq$k0">
-                <ref role="3cqZAo" node="4e0TwrfEw9e" resolve="inputModel" />
-              </node>
-              <node concept="2RRcyG" id="5u2z7mHjkSN" role="2OqNvi">
-                <ref role="2RRcyH" to="wq2x:6OXbTD$dU7b" resolve="Query" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3cpWs8" id="7LI_gNMgfSQ" role="3cqZAp">
           <node concept="3cpWsn" id="7LI_gNMgfSR" role="3cpWs9">
             <property role="TrG5h" value="queryTables" />
@@ -2414,15 +2384,8 @@
             </node>
             <node concept="liA8E" id="4e0TwrfEATx" role="2OqNvi">
               <ref role="37wK5l" node="1H_6AUSEEjh" resolve="doRun" />
-              <node concept="2OqwBi" id="4e0TwrfDVF9" role="37wK5m">
-                <node concept="37vLTw" id="4e0TwrfDVta" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1$LYeHxzeFj" resolve="queries" />
-                </node>
-                <node concept="3QWeyG" id="4e0TwrfDVRl" role="2OqNvi">
-                  <node concept="37vLTw" id="4e0TwrfDVWQ" role="576Qk">
-                    <ref role="3cqZAo" node="7LI_gNMgfSR" resolve="queryTables" />
-                  </node>
-                </node>
+              <node concept="37vLTw" id="7AMUQZUYHKf" role="37wK5m">
+                <ref role="3cqZAo" node="7LI_gNMgfSR" resolve="queryTables" />
               </node>
               <node concept="37vLTw" id="4e0TwrfDWn1" role="37wK5m">
                 <ref role="3cqZAo" node="1$LYeHxzeQI" resolve="rulesLists" />
@@ -2644,41 +2607,6 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="3MFPGC4UMNR" role="3cqZAp">
-          <node concept="3cpWsn" id="3MFPGC4UMNS" role="3cpWs9">
-            <property role="TrG5h" value="extQueries" />
-            <node concept="A3Dl8" id="3MFPGC4UMNT" role="1tU5fm">
-              <node concept="3Tqbb2" id="3MFPGC4UMNU" role="A3Ik2">
-                <ref role="ehGHo" to="wq2x:6OXbTD$dU7b" resolve="Query" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="3MFPGC4UONJ" role="33vP2m">
-              <node concept="37vLTw" id="3MFPGC4UOxX" role="2Oq$k0">
-                <ref role="3cqZAo" node="3MFPGC4UKOM" resolve="extModels" />
-              </node>
-              <node concept="3goQfb" id="3MFPGC4UP5b" role="2OqNvi">
-                <node concept="1bVj0M" id="3MFPGC4UP5d" role="23t8la">
-                  <node concept="3clFbS" id="3MFPGC4UP5e" role="1bW5cS">
-                    <node concept="3clFbF" id="3MFPGC4UPnO" role="3cqZAp">
-                      <node concept="2OqwBi" id="3MFPGC4UPzT" role="3clFbG">
-                        <node concept="37vLTw" id="3MFPGC4UPnN" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3MFPGC4UP5f" resolve="m" />
-                        </node>
-                        <node concept="2RRcyG" id="3MFPGC4UPIT" role="2OqNvi">
-                          <ref role="2RRcyH" to="wq2x:6OXbTD$dU7b" resolve="Query" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="Rh6nW" id="3MFPGC4UP5f" role="1bW2Oz">
-                    <property role="TrG5h" value="m" />
-                    <node concept="2jxLKc" id="3MFPGC4UP5g" role="1tU5fm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3cpWs8" id="3MFPGC4UR7p" role="3cqZAp">
           <node concept="3cpWsn" id="3MFPGC4UR7q" role="3cpWs9">
             <property role="TrG5h" value="extQueryTables" />
@@ -2742,8 +2670,8 @@
             <node concept="2OqwBi" id="3MFPGC4UVHG" role="33vP2m">
               <node concept="1rXfSq" id="3MFPGC4UVHH" role="2Oq$k0">
                 <ref role="37wK5l" node="1$LYeHxzh7f" resolve="getRules" />
-                <node concept="37vLTw" id="3MFPGC4UWJ1" role="37wK5m">
-                  <ref role="3cqZAo" node="3MFPGC4UMNS" resolve="extQueries" />
+                <node concept="37vLTw" id="7AMUQZUYId_" role="37wK5m">
+                  <ref role="3cqZAo" node="3MFPGC4UR7q" resolve="extQueryTables" />
                 </node>
               </node>
               <node concept="3QWeyG" id="3MFPGC4UVHJ" role="2OqNvi">
@@ -3531,45 +3459,33 @@
                 </node>
                 <node concept="1rXfSq" id="7ebSZkq0$6d" role="33vP2m">
                   <ref role="37wK5l" node="7ebSZkq0h1E" resolve="getCtrDecls" />
-                  <node concept="2OqwBi" id="6E2cNibp1Xw" role="37wK5m">
-                    <node concept="2OqwBi" id="7ebSZkq0$6e" role="2Oq$k0">
-                      <node concept="2GrUjf" id="7ebSZkq0$6f" role="2Oq$k0">
+                  <node concept="2OqwBi" id="6E2cNiboSQK" role="37wK5m">
+                    <node concept="2OqwBi" id="6E2cNiboPQI" role="2Oq$k0">
+                      <node concept="2GrUjf" id="6E2cNiboPtF" role="2Oq$k0">
                         <ref role="2Gs0qQ" node="1$LYeHx$LBc" resolve="rule" />
                       </node>
-                      <node concept="3Tsc0h" id="3MFPGC4W3Ci" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
+                      <node concept="3Tsc0h" id="6E2cNiboQvb" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:6E2cNiboHlF" resolve="body" />
                       </node>
                     </node>
-                    <node concept="3QWeyG" id="6E2cNiboMCm" role="2OqNvi">
-                      <node concept="2OqwBi" id="6E2cNiboSQK" role="576Qk">
-                        <node concept="2OqwBi" id="6E2cNiboPQI" role="2Oq$k0">
-                          <node concept="2GrUjf" id="6E2cNiboPtF" role="2Oq$k0">
-                            <ref role="2Gs0qQ" node="1$LYeHx$LBc" resolve="rule" />
-                          </node>
-                          <node concept="3Tsc0h" id="6E2cNiboQvb" role="2OqNvi">
-                            <ref role="3TtcxE" to="wq2x:6E2cNiboHlF" resolve="body" />
-                          </node>
-                        </node>
-                        <node concept="3goQfb" id="6E2cNiboUov" role="2OqNvi">
-                          <node concept="1bVj0M" id="6E2cNiboUox" role="23t8la">
-                            <node concept="3clFbS" id="6E2cNiboUoy" role="1bW5cS">
-                              <node concept="3clFbF" id="6E2cNiboVpE" role="3cqZAp">
-                                <node concept="2OqwBi" id="6E2cNiboWrN" role="3clFbG">
-                                  <node concept="37vLTw" id="6E2cNiboVpD" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E2cNiboUoz" resolve="it" />
-                                  </node>
-                                  <node concept="3Tsc0h" id="6E2cNiboXem" role="2OqNvi">
-                                    <ref role="3TtcxE" to="wq2x:6E2cNiboHlB" resolve="body" />
-                                  </node>
-                                </node>
+                    <node concept="3goQfb" id="6E2cNiboUov" role="2OqNvi">
+                      <node concept="1bVj0M" id="6E2cNiboUox" role="23t8la">
+                        <node concept="3clFbS" id="6E2cNiboUoy" role="1bW5cS">
+                          <node concept="3clFbF" id="6E2cNiboVpE" role="3cqZAp">
+                            <node concept="2OqwBi" id="6E2cNiboWrN" role="3clFbG">
+                              <node concept="37vLTw" id="6E2cNiboVpD" role="2Oq$k0">
+                                <ref role="3cqZAo" node="6E2cNiboUoz" resolve="it" />
+                              </node>
+                              <node concept="3Tsc0h" id="6E2cNiboXem" role="2OqNvi">
+                                <ref role="3TtcxE" to="wq2x:6E2cNiboHlB" resolve="body" />
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6E2cNiboUoz" role="1bW2Oz">
-                              <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6E2cNiboUo$" role="1tU5fm" />
-                            </node>
                           </node>
                         </node>
+                        <node concept="Rh6nW" id="6E2cNiboUoz" role="1bW2Oz">
+                          <property role="TrG5h" value="it" />
+                          <node concept="2jxLKc" id="6E2cNiboUo$" role="1tU5fm" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -4094,45 +4010,33 @@
               </node>
               <node concept="2OqwBi" id="2Ap6smyTrK" role="2GsD0m">
                 <node concept="1eOMI4" id="6E2cNibp5yp" role="2Oq$k0">
-                  <node concept="2OqwBi" id="6E2cNibp7FW" role="1eOMHV">
-                    <node concept="2OqwBi" id="6_dHUh85eUa" role="2Oq$k0">
-                      <node concept="2GrUjf" id="1$LYeHxA6td" role="2Oq$k0">
+                  <node concept="2OqwBi" id="6E2cNibpcIL" role="1eOMHV">
+                    <node concept="2OqwBi" id="6E2cNibpag4" role="2Oq$k0">
+                      <node concept="2GrUjf" id="6E2cNibp9YV" role="2Oq$k0">
                         <ref role="2Gs0qQ" node="1$LYeHxA4Px" resolve="rule" />
                       </node>
-                      <node concept="3Tsc0h" id="1$LYeHxA6NT" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
+                      <node concept="3Tsc0h" id="6E2cNibpaYD" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:6E2cNiboHlF" resolve="body" />
                       </node>
                     </node>
-                    <node concept="3QWeyG" id="6E2cNibp9MC" role="2OqNvi">
-                      <node concept="2OqwBi" id="6E2cNibpcIL" role="576Qk">
-                        <node concept="2OqwBi" id="6E2cNibpag4" role="2Oq$k0">
-                          <node concept="2GrUjf" id="6E2cNibp9YV" role="2Oq$k0">
-                            <ref role="2Gs0qQ" node="1$LYeHxA4Px" resolve="rule" />
-                          </node>
-                          <node concept="3Tsc0h" id="6E2cNibpaYD" role="2OqNvi">
-                            <ref role="3TtcxE" to="wq2x:6E2cNiboHlF" resolve="body" />
-                          </node>
-                        </node>
-                        <node concept="3goQfb" id="6E2cNibpewx" role="2OqNvi">
-                          <node concept="1bVj0M" id="6E2cNibpewz" role="23t8la">
-                            <node concept="3clFbS" id="6E2cNibpew$" role="1bW5cS">
-                              <node concept="3clFbF" id="6E2cNibpeNt" role="3cqZAp">
-                                <node concept="2OqwBi" id="6E2cNibpfxE" role="3clFbG">
-                                  <node concept="37vLTw" id="6E2cNibpeNs" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E2cNibpew_" resolve="it" />
-                                  </node>
-                                  <node concept="3Tsc0h" id="6E2cNibpfS3" role="2OqNvi">
-                                    <ref role="3TtcxE" to="wq2x:6E2cNiboHlB" resolve="body" />
-                                  </node>
-                                </node>
+                    <node concept="3goQfb" id="6E2cNibpewx" role="2OqNvi">
+                      <node concept="1bVj0M" id="6E2cNibpewz" role="23t8la">
+                        <node concept="3clFbS" id="6E2cNibpew$" role="1bW5cS">
+                          <node concept="3clFbF" id="6E2cNibpeNt" role="3cqZAp">
+                            <node concept="2OqwBi" id="6E2cNibpfxE" role="3clFbG">
+                              <node concept="37vLTw" id="6E2cNibpeNs" role="2Oq$k0">
+                                <ref role="3cqZAo" node="6E2cNibpew_" resolve="it" />
+                              </node>
+                              <node concept="3Tsc0h" id="6E2cNibpfS3" role="2OqNvi">
+                                <ref role="3TtcxE" to="wq2x:6E2cNiboHlB" resolve="body" />
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6E2cNibpew_" role="1bW2Oz">
-                              <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6E2cNibpewA" role="1tU5fm" />
-                            </node>
                           </node>
                         </node>
+                        <node concept="Rh6nW" id="6E2cNibpew_" role="1bW2Oz">
+                          <property role="TrG5h" value="it" />
+                          <node concept="2jxLKc" id="6E2cNibpewA" role="1tU5fm" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -5958,45 +5862,33 @@
             <node concept="2OqwBi" id="2NnDL4GakDs" role="33vP2m">
               <node concept="2OqwBi" id="2NnDL4GafR7" role="2Oq$k0">
                 <node concept="1eOMI4" id="6E2cNibphqm" role="2Oq$k0">
-                  <node concept="2OqwBi" id="6E2cNibpk1K" role="1eOMHV">
-                    <node concept="2OqwBi" id="2NnDL4GadFf" role="2Oq$k0">
-                      <node concept="37vLTw" id="2NnDL4GadwC" role="2Oq$k0">
+                  <node concept="2OqwBi" id="6E2cNibpqg2" role="1eOMHV">
+                    <node concept="2OqwBi" id="6E2cNibpnmf" role="2Oq$k0">
+                      <node concept="37vLTw" id="6E2cNibpmHV" role="2Oq$k0">
                         <ref role="3cqZAo" node="2NnDL4G9WvN" resolve="rule" />
                       </node>
-                      <node concept="3Tsc0h" id="2NnDL4GadPR" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
+                      <node concept="3Tsc0h" id="6E2cNibpo9Y" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:6E2cNiboHlF" resolve="body" />
                       </node>
                     </node>
-                    <node concept="3QWeyG" id="6E2cNibpm9X" role="2OqNvi">
-                      <node concept="2OqwBi" id="6E2cNibpqg2" role="576Qk">
-                        <node concept="2OqwBi" id="6E2cNibpnmf" role="2Oq$k0">
-                          <node concept="37vLTw" id="6E2cNibpmHV" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2NnDL4G9WvN" resolve="rule" />
-                          </node>
-                          <node concept="3Tsc0h" id="6E2cNibpo9Y" role="2OqNvi">
-                            <ref role="3TtcxE" to="wq2x:6E2cNiboHlF" resolve="body" />
-                          </node>
-                        </node>
-                        <node concept="3goQfb" id="6E2cNibpsoY" role="2OqNvi">
-                          <node concept="1bVj0M" id="6E2cNibpsp0" role="23t8la">
-                            <node concept="3clFbS" id="6E2cNibpsp1" role="1bW5cS">
-                              <node concept="3clFbF" id="6E2cNibptaX" role="3cqZAp">
-                                <node concept="2OqwBi" id="6E2cNibptRg" role="3clFbG">
-                                  <node concept="37vLTw" id="6E2cNibptaW" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E2cNibpsp2" resolve="it" />
-                                  </node>
-                                  <node concept="3Tsc0h" id="6E2cNibpu_C" role="2OqNvi">
-                                    <ref role="3TtcxE" to="wq2x:6E2cNiboHlB" resolve="body" />
-                                  </node>
-                                </node>
+                    <node concept="3goQfb" id="6E2cNibpsoY" role="2OqNvi">
+                      <node concept="1bVj0M" id="6E2cNibpsp0" role="23t8la">
+                        <node concept="3clFbS" id="6E2cNibpsp1" role="1bW5cS">
+                          <node concept="3clFbF" id="6E2cNibptaX" role="3cqZAp">
+                            <node concept="2OqwBi" id="6E2cNibptRg" role="3clFbG">
+                              <node concept="37vLTw" id="6E2cNibptaW" role="2Oq$k0">
+                                <ref role="3cqZAo" node="6E2cNibpsp2" resolve="it" />
+                              </node>
+                              <node concept="3Tsc0h" id="6E2cNibpu_C" role="2OqNvi">
+                                <ref role="3TtcxE" to="wq2x:6E2cNiboHlB" resolve="body" />
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="6E2cNibpsp2" role="1bW2Oz">
-                              <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="6E2cNibpsp3" role="1tU5fm" />
-                            </node>
                           </node>
                         </node>
+                        <node concept="Rh6nW" id="6E2cNibpsp2" role="1bW2Oz">
+                          <property role="TrG5h" value="it" />
+                          <node concept="2jxLKc" id="6E2cNibpsp3" role="1tU5fm" />
+                        </node>
                       </node>
                     </node>
                   </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
index 4f230e34..b69e4bb9 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
@@ -38,16 +38,10 @@
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
-      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
-        <child id="1154032183016" name="body" index="2LFqv$" />
-      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
-      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
-        <child id="1145553007750" name="creator" index="2ShVmc" />
-      </concept>
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
@@ -55,9 +49,6 @@
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -70,30 +61,12 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
-      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
-      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
-      <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>
-      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
-        <property id="1068580320021" name="value" index="3cmrfH" />
-      </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
@@ -107,14 +80,7 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
-      <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
-        <child id="1144226360166" name="iterable" index="1DdaDG" />
-      </concept>
-      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
-        <child id="1144230900587" name="variable" index="1Duv9x" />
-      </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@@ -164,9 +130,6 @@
         <reference id="8182547171709614741" name="target" index="36bGnp" />
       </concept>
     </language>
-    <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
-      <concept id="767145758118872830" name="jetbrains.mps.lang.actions.structure.NF_Link_SetNewChildOperation" flags="nn" index="2DeJnY" />
-    </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
       <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
         <property id="2034914114981261751" name="severity" index="RRSoG" />
@@ -177,37 +140,13 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
-        <child id="1140725362529" name="linkTarget" index="2oxUTC" />
-      </concept>
-      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
-        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
-      </concept>
-      <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="1227264722563" name="jetbrains.mps.lang.smodel.structure.EqualsStructurallyExpression" flags="nn" index="2YFouu" />
-      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
-        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
-      </concept>
-      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1139867745658" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithNewOperation" flags="nn" index="1_qnLN">
         <reference id="1139867957129" name="concept" index="1_rbq0" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <property id="1238684351431" name="asCast" index="1BlNFB" />
-      </concept>
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
-        <reference id="1138405853777" name="concept" index="ehGHo" />
-      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
-      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
-        <reference id="1138056546658" name="link" index="3TtcxE" />
-      </concept>
-      <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
@@ -236,37 +175,15 @@
       <concept id="4307205004131544317" name="jetbrains.mps.lang.smodel.query.structure.QueryExpression" flags="ng" index="1dNuzs">
         <child id="4307205004132279624" name="parameter" index="1dOa5D" />
       </concept>
-      <concept id="4307205004132277753" name="jetbrains.mps.lang.smodel.query.structure.QueryParameterList" flags="ng" index="1dO9Bo">
-        <child id="4307205004141421222" name="parameter" index="1dp2q7" />
-      </concept>
-      <concept id="677787792397344112" name="jetbrains.mps.lang.smodel.query.structure.QueryParameterExact" flags="ng" index="3Z_Q4n" />
+      <concept id="4307205004132277753" name="jetbrains.mps.lang.smodel.query.structure.QueryParameterList" flags="ng" index="1dO9Bo" />
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
-        <child id="540871147943773366" name="argument" index="25WWJ7" />
-      </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
-        <child id="1151688676805" name="elementType" index="_ZDj9" />
-      </concept>
-      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
-        <child id="1151689745422" name="elementType" index="A3Ik2" />
-      </concept>
-      <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
-        <child id="1237721435807" name="elementType" index="HW$YZ" />
-      </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
-      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
-      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
-      <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
-      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <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" />
     </language>
   </registry>
   <node concept="3SyAh_" id="7smgEqgGBKb">
@@ -1203,7 +1120,7 @@
         <node concept="RRSsy" id="631nQp400EH" role="3cqZAp">
           <property role="RRSoG" value="gZ5fh_4/error" />
           <node concept="Xl_RD" id="631nQp400EI" role="RRSoy">
-            <property role="Xl_RC" value="Migration has been truncated, please downgrade. (ReplaceEqWithUni)" />
+            <property role="Xl_RC" value="Migration has been truncated, please downgrade. (DropNodeAnchor)" />
           </node>
         </node>
       </node>
@@ -1263,122 +1180,10 @@
       <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
       <node concept="3Tm1VV" id="1TH_SRmeb$O" role="1B3o_S" />
       <node concept="3clFbS" id="1TH_SRmeb$Q" role="3clF47">
-        <node concept="L3pyB" id="1TH_SRmegQW" role="3cqZAp">
-          <node concept="3clFbS" id="1TH_SRmegQX" role="L3pyw">
-            <node concept="3clFbF" id="1TH_SRmegQY" role="3cqZAp">
-              <node concept="2OqwBi" id="1TH_SRmegQZ" role="3clFbG">
-                <node concept="qVDSY" id="1TH_SRmegR0" role="2Oq$k0">
-                  <node concept="chp4Y" id="1TH_SRmehG$" role="qVDSX">
-                    <ref role="cht4Q" to="wq2x:6p0DfM0ang5" resolve="UserConstraint" />
-                  </node>
-                  <node concept="1dO9Bo" id="1TH_SRmegR2" role="1dOa5D">
-                    <node concept="3Z_Q4n" id="1TH_SRmegR3" role="1dp2q7" />
-                  </node>
-                </node>
-                <node concept="2es0OD" id="1TH_SRmegR4" role="2OqNvi">
-                  <node concept="1bVj0M" id="1TH_SRmegR5" role="23t8la">
-                    <node concept="3clFbS" id="1TH_SRmegR6" role="1bW5cS">
-                      <node concept="3clFbH" id="1TH_SRmegR7" role="3cqZAp" />
-                      <node concept="1DcWWT" id="1TH_SRmeo80" role="3cqZAp">
-                        <node concept="3clFbS" id="1TH_SRmeo83" role="2LFqv$">
-                          <node concept="3clFbJ" id="1TH_SRmerwA" role="3cqZAp">
-                            <node concept="2OqwBi" id="1TH_SRmeEC4" role="3clFbw">
-                              <node concept="2OqwBi" id="1TH_SRmeC8H" role="2Oq$k0">
-                                <node concept="1PxgMI" id="1TH_SRme_HQ" role="2Oq$k0">
-                                  <property role="1BlNFB" value="true" />
-                                  <node concept="chp4Y" id="1TH_SRmeB8c" role="3oSUPX">
-                                    <ref role="cht4Q" to="tpee:hqOqwz4" resolve="DotExpression" />
-                                  </node>
-                                  <node concept="37vLTw" id="1TH_SRmeytR" role="1m5AlR">
-                                    <ref role="3cqZAo" node="1TH_SRmeo84" resolve="a" />
-                                  </node>
-                                </node>
-                                <node concept="3TrEf2" id="1TH_SRmeDCz" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                                </node>
-                              </node>
-                              <node concept="1mIQ4w" id="1TH_SRmeFQl" role="2OqNvi">
-                                <node concept="chp4Y" id="1TH_SRmeHd1" role="cj9EA">
-                                  <ref role="cht4Q" to="tp25:4o40NPkYE0z" resolve="Node_PointerOperation" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3clFbS" id="1TH_SRmerwC" role="3clFbx">
-                              <node concept="3clFbH" id="1TH_SRmeKyb" role="3cqZAp" />
-                              <node concept="3cpWs8" id="1TH_SRmf1Yo" role="3cqZAp">
-                                <node concept="3cpWsn" id="1TH_SRmf1Yp" role="3cpWs9">
-                                  <property role="TrG5h" value="e" />
-                                  <node concept="3Tqbb2" id="1TH_SRmeQ1o" role="1tU5fm">
-                                    <ref role="ehGHo" to="5j4j:7lt0LtQg3tE" resolve="ExpressionItem" />
-                                  </node>
-                                  <node concept="2OqwBi" id="1TH_SRmf1Yq" role="33vP2m">
-                                    <node concept="37vLTw" id="1TH_SRmf1Yr" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1TH_SRmeo84" resolve="a" />
-                                    </node>
-                                    <node concept="1_qnLN" id="1TH_SRmf1Ys" role="2OqNvi">
-                                      <ref role="1_rbq0" to="5j4j:7lt0LtQg3tE" resolve="ExpressionItem" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbF" id="1TH_SRmeLJE" role="3cqZAp">
-                                <node concept="2OqwBi" id="1TH_SRmf6Dx" role="3clFbG">
-                                  <node concept="2OqwBi" id="1TH_SRmf3Wq" role="2Oq$k0">
-                                    <node concept="37vLTw" id="1TH_SRmf1Yt" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1TH_SRmf1Yp" resolve="e" />
-                                    </node>
-                                    <node concept="3TrEf2" id="1TH_SRmf5zd" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="5j4j:7lt0LtQg3vl" resolve="code" />
-                                    </node>
-                                  </node>
-                                  <node concept="2oxUTD" id="1TH_SRmf7Rs" role="2OqNvi">
-                                    <node concept="1PxgMI" id="1TH_SRmfnjI" role="2oxUTC">
-                                      <node concept="chp4Y" id="1TH_SRmfoks" role="3oSUPX">
-                                        <ref role="cht4Q" to="tpee:fz3vP1J" resolve="Expression" />
-                                      </node>
-                                      <node concept="2OqwBi" id="1TH_SRmffjo" role="1m5AlR">
-                                        <node concept="37vLTw" id="1TH_SRmfel5" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="1TH_SRmeo84" resolve="a" />
-                                        </node>
-                                        <node concept="3YRAZt" id="1TH_SRmfgvn" role="2OqNvi" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbH" id="1TH_SRmeKyk" role="3cqZAp" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3cpWsn" id="1TH_SRmeo84" role="1Duv9x">
-                          <property role="TrG5h" value="a" />
-                          <node concept="3Tqbb2" id="1TH_SRmeo88" role="1tU5fm" />
-                        </node>
-                        <node concept="2OqwBi" id="1TH_SRmeo89" role="1DdaDG">
-                          <node concept="2OqwBi" id="1TH_SRmeo8a" role="2Oq$k0">
-                            <node concept="37vLTw" id="1TH_SRmeo8b" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1TH_SRmegR_" resolve="uc" />
-                            </node>
-                            <node concept="3Tsc0h" id="1TH_SRmeo8c" role="2OqNvi">
-                              <ref role="3TtcxE" to="wq2x:6p0DfM0et2r" resolve="argument" />
-                            </node>
-                          </node>
-                          <node concept="ANE8D" id="1TH_SRmeo8d" role="2OqNvi" />
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="1TH_SRmegR$" role="3cqZAp" />
-                    </node>
-                    <node concept="Rh6nW" id="1TH_SRmegR_" role="1bW2Oz">
-                      <property role="TrG5h" value="uc" />
-                      <node concept="2jxLKc" id="1TH_SRmegRA" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="1TH_SRmegRB" role="L3pyr">
-            <ref role="3cqZAo" node="1TH_SRmeb$S" resolve="m" />
+        <node concept="RRSsy" id="7AMUQZV6a9B" role="3cqZAp">
+          <property role="RRSoG" value="gZ5fh_4/error" />
+          <node concept="Xl_RD" id="7AMUQZV6a9C" role="RRSoy">
+            <property role="Xl_RC" value="Migration has been truncated, please downgrade. (FixNodePointerInUserConstraint)" />
           </node>
         </node>
       </node>
@@ -1438,167 +1243,10 @@
       <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
       <node concept="3Tm1VV" id="4beNoh2FimD" role="1B3o_S" />
       <node concept="3clFbS" id="4beNoh2FimF" role="3clF47">
-        <node concept="L3pyB" id="4beNoh2FiHT" role="3cqZAp">
-          <node concept="3clFbS" id="4beNoh2FiHU" role="L3pyw">
-            <node concept="3clFbF" id="4beNoh2FiHV" role="3cqZAp">
-              <node concept="2OqwBi" id="4beNoh2FiHW" role="3clFbG">
-                <node concept="2OqwBi" id="4beNoh2FjCf" role="2Oq$k0">
-                  <node concept="qVDSY" id="4beNoh2FiHX" role="2Oq$k0">
-                    <node concept="chp4Y" id="4beNoh2Fj3d" role="qVDSX">
-                      <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
-                    </node>
-                    <node concept="1dO9Bo" id="4beNoh2FiHZ" role="1dOa5D">
-                      <node concept="3Z_Q4n" id="4beNoh2FiI0" role="1dp2q7" />
-                    </node>
-                  </node>
-                  <node concept="3zZkjj" id="4beNoh2FkeY" role="2OqNvi">
-                    <node concept="1bVj0M" id="4beNoh2Fkf0" role="23t8la">
-                      <node concept="3clFbS" id="4beNoh2Fkf1" role="1bW5cS">
-                        <node concept="3clFbF" id="4beNoh2Fk_S" role="3cqZAp">
-                          <node concept="2OqwBi" id="4beNoh2FnOT" role="3clFbG">
-                            <node concept="2OqwBi" id="4beNoh2FkSk" role="2Oq$k0">
-                              <node concept="37vLTw" id="4beNoh2Fk_R" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4beNoh2Fkf2" resolve="cr" />
-                              </node>
-                              <node concept="3Tsc0h" id="4beNoh2FlkV" role="2OqNvi">
-                                <ref role="3TtcxE" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
-                              </node>
-                            </node>
-                            <node concept="3GX2aA" id="4beNoh2FqIE" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Rh6nW" id="4beNoh2Fkf2" role="1bW2Oz">
-                        <property role="TrG5h" value="cr" />
-                        <node concept="2jxLKc" id="4beNoh2Fkf3" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2es0OD" id="4beNoh2FiI1" role="2OqNvi">
-                  <node concept="1bVj0M" id="4beNoh2FiI2" role="23t8la">
-                    <node concept="3clFbS" id="4beNoh2FiI3" role="1bW5cS">
-                      <node concept="3cpWs8" id="4beNoh2FAnI" role="3cqZAp">
-                        <node concept="3cpWsn" id="4beNoh2FAnJ" role="3cpWs9">
-                          <property role="TrG5h" value="allpd" />
-                          <node concept="_YKpA" id="4beNoh2FAkE" role="1tU5fm">
-                            <node concept="3Tqbb2" id="4beNoh2FAkH" role="_ZDj9">
-                              <ref role="ehGHo" to="wq2x:PB1R3Y7Ed7" resolve="RulePartParameterDeclaration" />
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="4beNoh2FAnK" role="33vP2m">
-                            <node concept="2OqwBi" id="4beNoh2FAnL" role="2Oq$k0">
-                              <node concept="2OqwBi" id="4beNoh2FAnM" role="2Oq$k0">
-                                <node concept="37vLTw" id="4beNoh2FAnN" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4beNoh2FiIy" resolve="cr" />
-                                </node>
-                                <node concept="3Tsc0h" id="4beNoh2FAnO" role="2OqNvi">
-                                  <ref role="3TtcxE" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
-                                </node>
-                              </node>
-                              <node concept="3goQfb" id="4beNoh2FAnP" role="2OqNvi">
-                                <node concept="1bVj0M" id="4beNoh2FAnQ" role="23t8la">
-                                  <node concept="3clFbS" id="4beNoh2FAnR" role="1bW5cS">
-                                    <node concept="3clFbF" id="4beNoh2FAnS" role="3cqZAp">
-                                      <node concept="2OqwBi" id="4beNoh2FAnT" role="3clFbG">
-                                        <node concept="37vLTw" id="4beNoh2FAnU" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4beNoh2FAnW" resolve="it" />
-                                        </node>
-                                        <node concept="3Tsc0h" id="4beNoh2FAnV" role="2OqNvi">
-                                          <ref role="3TtcxE" to="wq2x:7lt0LtPpF3M" resolve="parameter" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="Rh6nW" id="4beNoh2FAnW" role="1bW2Oz">
-                                    <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="4beNoh2FAnX" role="1tU5fm" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="ANE8D" id="4beNoh2FAnY" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1DcWWT" id="4beNoh2FBo$" role="3cqZAp">
-                        <node concept="3clFbS" id="4beNoh2FBoB" role="2LFqv$">
-                          <node concept="3clFbF" id="4beNoh2G03X" role="3cqZAp">
-                            <node concept="2OqwBi" id="4beNoh2G6Km" role="3clFbG">
-                              <node concept="2OqwBi" id="4beNoh2G1HD" role="2Oq$k0">
-                                <node concept="37vLTw" id="4beNoh2G03V" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4beNoh2FiIy" resolve="cr" />
-                                </node>
-                                <node concept="3Tsc0h" id="4beNoh2G3I6" role="2OqNvi">
-                                  <ref role="3TtcxE" to="wq2x:4beNoh24Wi0" resolve="parameter" />
-                                </node>
-                              </node>
-                              <node concept="TSZUe" id="4beNoh2GbvW" role="2OqNvi">
-                                <node concept="2OqwBi" id="4beNoh2Gf3S" role="25WWJ7">
-                                  <node concept="37vLTw" id="4beNoh2Gdhu" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4beNoh2FBoC" resolve="pd" />
-                                  </node>
-                                  <node concept="3YRAZt" id="4beNoh2GgGu" role="2OqNvi" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3cpWsn" id="4beNoh2FBoC" role="1Duv9x">
-                          <property role="TrG5h" value="pd" />
-                          <node concept="3Tqbb2" id="4beNoh2FBoG" role="1tU5fm">
-                            <ref role="ehGHo" to="wq2x:PB1R3Y7Ed7" resolve="RulePartParameterDeclaration" />
-                          </node>
-                        </node>
-                        <node concept="37vLTw" id="4beNoh2FBoH" role="1DdaDG">
-                          <ref role="3cqZAo" node="4beNoh2FAnJ" resolve="allpd" />
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="4beNoh2HRON" role="3cqZAp">
-                        <node concept="2OqwBi" id="4beNoh2IkBJ" role="3clFbG">
-                          <node concept="2OqwBi" id="4beNoh2Idi$" role="2Oq$k0">
-                            <node concept="2OqwBi" id="4beNoh2HTdR" role="2Oq$k0">
-                              <node concept="37vLTw" id="4beNoh2HROL" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4beNoh2FiIy" resolve="cr" />
-                              </node>
-                              <node concept="3Tsc0h" id="4beNoh2I9IB" role="2OqNvi">
-                                <ref role="3TtcxE" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
-                              </node>
-                            </node>
-                            <node concept="ANE8D" id="4beNoh2IhPJ" role="2OqNvi" />
-                          </node>
-                          <node concept="2es0OD" id="4beNoh2IoHt" role="2OqNvi">
-                            <node concept="1bVj0M" id="4beNoh2IoHv" role="23t8la">
-                              <node concept="3clFbS" id="4beNoh2IoHw" role="1bW5cS">
-                                <node concept="3clFbF" id="4beNoh2Iqen" role="3cqZAp">
-                                  <node concept="2OqwBi" id="4beNoh2IrEW" role="3clFbG">
-                                    <node concept="37vLTw" id="4beNoh2Iqem" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4beNoh2IoHx" resolve="it" />
-                                    </node>
-                                    <node concept="3YRAZt" id="4beNoh2ItlR" role="2OqNvi" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="Rh6nW" id="4beNoh2IoHx" role="1bW2Oz">
-                                <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="4beNoh2IoHy" role="1tU5fm" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="4beNoh2FiIy" role="1bW2Oz">
-                      <property role="TrG5h" value="cr" />
-                      <node concept="2jxLKc" id="4beNoh2FiIz" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="4beNoh2FiI$" role="L3pyr">
-            <ref role="3cqZAo" node="4beNoh2FimH" resolve="m" />
+        <node concept="RRSsy" id="7AMUQZV6a5B" role="3cqZAp">
+          <property role="RRSoG" value="gZ5fh_4/error" />
+          <node concept="Xl_RD" id="7AMUQZV6a5C" role="RRSoy">
+            <property role="Xl_RC" value="Migration has been truncated, please downgrade. (DropParameterContainer)" />
           </node>
         </node>
       </node>
@@ -1658,118 +1306,10 @@
       <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
       <node concept="3Tm1VV" id="6E2cNibLTGz" role="1B3o_S" />
       <node concept="3clFbS" id="6E2cNibLTG_" role="3clF47">
-        <node concept="L3pyB" id="6E2cNibLVtd" role="3cqZAp">
-          <node concept="3clFbS" id="6E2cNibLVte" role="L3pyw">
-            <node concept="3clFbF" id="6E2cNibLVtf" role="3cqZAp">
-              <node concept="2OqwBi" id="6E2cNibLVtg" role="3clFbG">
-                <node concept="2OqwBi" id="6E2cNibLVth" role="2Oq$k0">
-                  <node concept="qVDSY" id="6E2cNibLVti" role="2Oq$k0">
-                    <node concept="chp4Y" id="6E2cNibLVtj" role="qVDSX">
-                      <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
-                    </node>
-                    <node concept="1dO9Bo" id="6E2cNibLVtk" role="1dOa5D">
-                      <node concept="3Z_Q4n" id="6E2cNibLVtl" role="1dp2q7" />
-                    </node>
-                  </node>
-                  <node concept="3zZkjj" id="6E2cNibLVtm" role="2OqNvi">
-                    <node concept="1bVj0M" id="6E2cNibLVtn" role="23t8la">
-                      <node concept="3clFbS" id="6E2cNibLVto" role="1bW5cS">
-                        <node concept="3clFbF" id="6E2cNibLVtp" role="3cqZAp">
-                          <node concept="2OqwBi" id="6E2cNibLVtq" role="3clFbG">
-                            <node concept="2OqwBi" id="6E2cNibLVtr" role="2Oq$k0">
-                              <node concept="37vLTw" id="6E2cNibLVts" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6E2cNibLVtv" resolve="cr" />
-                              </node>
-                              <node concept="3Tsc0h" id="6E2cNibLYBV" role="2OqNvi">
-                                <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
-                              </node>
-                            </node>
-                            <node concept="3GX2aA" id="6E2cNibLVtu" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Rh6nW" id="6E2cNibLVtv" role="1bW2Oz">
-                        <property role="TrG5h" value="cr" />
-                        <node concept="2jxLKc" id="6E2cNibLVtw" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2es0OD" id="6E2cNibLVtx" role="2OqNvi">
-                  <node concept="1bVj0M" id="6E2cNibLVty" role="23t8la">
-                    <node concept="3clFbS" id="6E2cNibLVtz" role="1bW5cS">
-                      <node concept="1DcWWT" id="6E2cNibM6aM" role="3cqZAp">
-                        <node concept="3clFbS" id="6E2cNibM6aP" role="2LFqv$">
-                          <node concept="3cpWs8" id="6E2cNibMyKl" role="3cqZAp">
-                            <node concept="3cpWsn" id="6E2cNibMyKm" role="3cpWs9">
-                              <property role="TrG5h" value="bb" />
-                              <node concept="3Tqbb2" id="6E2cNibMywZ" role="1tU5fm">
-                                <ref role="ehGHo" to="wq2x:6E2cNiboHlA" resolve="BodyBlock" />
-                              </node>
-                              <node concept="2OqwBi" id="6E2cNibMyKn" role="33vP2m">
-                                <node concept="2OqwBi" id="6E2cNibMyKo" role="2Oq$k0">
-                                  <node concept="37vLTw" id="6E2cNibMyKp" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E2cNibLVul" resolve="cr" />
-                                  </node>
-                                  <node concept="3Tsc0h" id="6E2cNibMyKq" role="2OqNvi">
-                                    <ref role="3TtcxE" to="wq2x:6E2cNiboHlF" resolve="body" />
-                                  </node>
-                                </node>
-                                <node concept="WFELt" id="6E2cNicc9AS" role="2OqNvi" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3clFbF" id="6E2cNibMhfV" role="3cqZAp">
-                            <node concept="2OqwBi" id="6E2cNibMKoS" role="3clFbG">
-                              <node concept="2OqwBi" id="6E2cNibMCdU" role="2Oq$k0">
-                                <node concept="37vLTw" id="6E2cNibMyKs" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6E2cNibMyKm" resolve="bb" />
-                                </node>
-                                <node concept="3Tsc0h" id="6E2cNibMFsZ" role="2OqNvi">
-                                  <ref role="3TtcxE" to="wq2x:6E2cNiboHlB" resolve="body" />
-                                </node>
-                              </node>
-                              <node concept="TSZUe" id="6E2cNibMZ0n" role="2OqNvi">
-                                <node concept="2OqwBi" id="6E2cNibNe6V" role="25WWJ7">
-                                  <node concept="37vLTw" id="6E2cNibNbu1" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6E2cNibM6aQ" resolve="b" />
-                                  </node>
-                                  <node concept="3YRAZt" id="6E2cNibNgH3" role="2OqNvi" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3cpWsn" id="6E2cNibM6aQ" role="1Duv9x">
-                          <property role="TrG5h" value="b" />
-                          <node concept="3Tqbb2" id="6E2cNibM96Y" role="1tU5fm">
-                            <ref role="ehGHo" to="wq2x:6p0DfM0a3TO" resolve="Body" />
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="6E2cNibN3Tw" role="1DdaDG">
-                          <node concept="2OqwBi" id="6E2cNibM6aV" role="2Oq$k0">
-                            <node concept="37vLTw" id="6E2cNibM6aW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6E2cNibLVul" resolve="cr" />
-                            </node>
-                            <node concept="3Tsc0h" id="6E2cNibM6aX" role="2OqNvi">
-                              <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
-                            </node>
-                          </node>
-                          <node concept="ANE8D" id="6E2cNibN91t" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="6E2cNibLVul" role="1bW2Oz">
-                      <property role="TrG5h" value="cr" />
-                      <node concept="2jxLKc" id="6E2cNibLVum" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="6E2cNibLVun" role="L3pyr">
-            <ref role="3cqZAo" node="6E2cNibLTGB" resolve="m" />
+        <node concept="RRSsy" id="7AMUQZV6lgk" role="3cqZAp">
+          <property role="RRSoG" value="gZ5fh_4/error" />
+          <node concept="Xl_RD" id="7AMUQZV6lgl" role="RRSoy">
+            <property role="Xl_RC" value="Migration has been truncated, please downgrade. (MoveBodyToBodyBlock)" />
           </node>
         </node>
       </node>
@@ -1829,254 +1369,10 @@
       <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
       <node concept="3Tm1VV" id="3c$Di5OgByP" role="1B3o_S" />
       <node concept="3clFbS" id="3c$Di5OgByR" role="3clF47">
-        <node concept="L3pyB" id="3c$Di5OgF7z" role="3cqZAp">
-          <node concept="3clFbS" id="3c$Di5OgF7$" role="L3pyw">
-            <node concept="3clFbF" id="3c$Di5OgF7_" role="3cqZAp">
-              <node concept="2OqwBi" id="3c$Di5OgF7A" role="3clFbG">
-                <node concept="2OqwBi" id="3c$Di5OgF7B" role="2Oq$k0">
-                  <node concept="qVDSY" id="3c$Di5OgF7C" role="2Oq$k0">
-                    <node concept="chp4Y" id="3c$Di5OgHPN" role="qVDSX">
-                      <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
-                    </node>
-                    <node concept="1dO9Bo" id="3c$Di5OgF7E" role="1dOa5D">
-                      <node concept="3Z_Q4n" id="3c$Di5OgF7F" role="1dp2q7" />
-                    </node>
-                  </node>
-                  <node concept="3zZkjj" id="3c$Di5OgF7G" role="2OqNvi">
-                    <node concept="1bVj0M" id="3c$Di5OgF7H" role="23t8la">
-                      <node concept="3clFbS" id="3c$Di5OgF7I" role="1bW5cS">
-                        <node concept="3clFbF" id="3c$Di5OgF7J" role="3cqZAp">
-                          <node concept="1Wc70l" id="3c$Di5Onymg" role="3clFbG">
-                            <node concept="1Wc70l" id="3c$Di5OmHMS" role="3uHU7B">
-                              <node concept="2OqwBi" id="3c$Di5OgF7K" role="3uHU7B">
-                                <node concept="2OqwBi" id="3c$Di5OgF7L" role="2Oq$k0">
-                                  <node concept="37vLTw" id="3c$Di5OgF7M" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3c$Di5OgF7P" resolve="rt" />
-                                  </node>
-                                  <node concept="3TrEf2" id="3c$Di5OgSc5" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:36tQV5AmQgD" resolve="condition" />
-                                  </node>
-                                </node>
-                                <node concept="3x8VRR" id="3c$Di5OgTQk" role="2OqNvi" />
-                              </node>
-                              <node concept="3clFbC" id="3c$Di5Onqku" role="3uHU7w">
-                                <node concept="2OqwBi" id="3c$Di5Onf8G" role="3uHU7B">
-                                  <node concept="2OqwBi" id="3c$Di5On4Sh" role="2Oq$k0">
-                                    <node concept="2OqwBi" id="3c$Di5OmXp5" role="2Oq$k0">
-                                      <node concept="2OqwBi" id="3c$Di5OmPQy" role="2Oq$k0">
-                                        <node concept="37vLTw" id="3c$Di5OmLTF" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3c$Di5OgF7P" resolve="rt" />
-                                        </node>
-                                        <node concept="3TrEf2" id="3c$Di5OmT2E" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="wq2x:36tQV5AmQgD" resolve="condition" />
-                                        </node>
-                                      </node>
-                                      <node concept="3TrEf2" id="3c$Di5On0Ld" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
-                                      </node>
-                                    </node>
-                                    <node concept="3Tsc0h" id="3c$Di5On8IL" role="2OqNvi">
-                                      <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                                    </node>
-                                  </node>
-                                  <node concept="34oBXx" id="3c$Di5Onlv7" role="2OqNvi" />
-                                </node>
-                                <node concept="3cmrfG" id="3c$Di5Onu66" role="3uHU7w">
-                                  <property role="3cmrfH" value="1" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="2OqwBi" id="3c$Di5OnW4J" role="3uHU7w">
-                              <node concept="2OqwBi" id="3c$Di5OnKON" role="2Oq$k0">
-                                <node concept="2OqwBi" id="3c$Di5OnAXg" role="2Oq$k0">
-                                  <node concept="2OqwBi" id="3c$Di5OnAXh" role="2Oq$k0">
-                                    <node concept="2OqwBi" id="3c$Di5OnAXi" role="2Oq$k0">
-                                      <node concept="37vLTw" id="3c$Di5OnAXj" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3c$Di5OgF7P" resolve="rt" />
-                                      </node>
-                                      <node concept="3TrEf2" id="3c$Di5OnAXk" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="wq2x:36tQV5AmQgD" resolve="condition" />
-                                      </node>
-                                    </node>
-                                    <node concept="3TrEf2" id="3c$Di5OnAXl" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
-                                    </node>
-                                  </node>
-                                  <node concept="3Tsc0h" id="3c$Di5OnAXm" role="2OqNvi">
-                                    <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                                  </node>
-                                </node>
-                                <node concept="1uHKPH" id="3c$Di5OnR$O" role="2OqNvi" />
-                              </node>
-                              <node concept="1mIQ4w" id="3c$Di5Oo748" role="2OqNvi">
-                                <node concept="chp4Y" id="3c$Di5Oo9Ya" role="cj9EA">
-                                  <ref role="cht4Q" to="tpee:fzclF8j" resolve="ExpressionStatement" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Rh6nW" id="3c$Di5OgF7P" role="1bW2Oz">
-                        <property role="TrG5h" value="rt" />
-                        <node concept="2jxLKc" id="3c$Di5OgF7Q" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2es0OD" id="3c$Di5OgF7R" role="2OqNvi">
-                  <node concept="1bVj0M" id="3c$Di5OgF7S" role="23t8la">
-                    <node concept="3clFbS" id="3c$Di5OgF7T" role="1bW5cS">
-                      <node concept="3cpWs8" id="3c$Di5OjWWu" role="3cqZAp">
-                        <node concept="3cpWsn" id="3c$Di5OjWWv" role="3cpWs9">
-                          <property role="TrG5h" value="oldcode" />
-                          <node concept="3Tqbb2" id="3c$Di5OjWLU" role="1tU5fm">
-                            <ref role="ehGHo" to="tpee:fzclF80" resolve="StatementList" />
-                          </node>
-                          <node concept="2OqwBi" id="3c$Di5Ok0by" role="33vP2m">
-                            <node concept="2OqwBi" id="3c$Di5OjWWw" role="2Oq$k0">
-                              <node concept="37vLTw" id="3c$Di5OjWWx" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3c$Di5OgF8k" resolve="rt" />
-                              </node>
-                              <node concept="3TrEf2" id="3c$Di5OjWWy" role="2OqNvi">
-                                <ref role="3Tt5mk" to="wq2x:36tQV5AmIss" resolve="code" />
-                              </node>
-                            </node>
-                            <node concept="3YRAZt" id="3c$Di5Ok4Ik" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3cpWs8" id="3c$Di5OkwjT" role="3cqZAp">
-                        <node concept="3cpWsn" id="3c$Di5OkwjU" role="3cpWs9">
-                          <property role="TrG5h" value="newcode" />
-                          <node concept="3Tqbb2" id="3c$Di5Okvv6" role="1tU5fm">
-                            <ref role="ehGHo" to="tpee:fzclF80" resolve="StatementList" />
-                          </node>
-                          <node concept="2OqwBi" id="3c$Di5OkwjV" role="33vP2m">
-                            <node concept="2OqwBi" id="3c$Di5OkwjW" role="2Oq$k0">
-                              <node concept="37vLTw" id="3c$Di5OkwjX" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3c$Di5OgF8k" resolve="rt" />
-                              </node>
-                              <node concept="3TrEf2" id="3c$Di5OkwjY" role="2OqNvi">
-                                <ref role="3Tt5mk" to="wq2x:36tQV5AmIss" resolve="code" />
-                              </node>
-                            </node>
-                            <node concept="2DeJnY" id="3c$Di5OkwjZ" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3cpWs8" id="3c$Di5Olhsa" role="3cqZAp">
-                        <node concept="3cpWsn" id="3c$Di5Olhsb" role="3cpWs9">
-                          <property role="TrG5h" value="ifstmt" />
-                          <node concept="3Tqbb2" id="3c$Di5OlgDB" role="1tU5fm">
-                            <ref role="ehGHo" to="tpee:fzclF8n" resolve="IfStatement" />
-                          </node>
-                          <node concept="2OqwBi" id="3c$Di5Olhsc" role="33vP2m">
-                            <node concept="2OqwBi" id="3c$Di5Olhsd" role="2Oq$k0">
-                              <node concept="37vLTw" id="3c$Di5Olhse" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3c$Di5OkwjU" resolve="newcode" />
-                              </node>
-                              <node concept="3Tsc0h" id="3c$Di5Olhsf" role="2OqNvi">
-                                <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                              </node>
-                            </node>
-                            <node concept="WFELt" id="3c$Di5Olhsg" role="2OqNvi">
-                              <ref role="1A0vxQ" to="tpee:fzclF8n" resolve="IfStatement" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="3c$Di5OkdER" role="3cqZAp">
-                        <node concept="2OqwBi" id="3c$Di5Ol$e0" role="3clFbG">
-                          <node concept="2OqwBi" id="3c$Di5OlspJ" role="2Oq$k0">
-                            <node concept="37vLTw" id="3c$Di5Olhsh" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3c$Di5Olhsb" resolve="ifstmt" />
-                            </node>
-                            <node concept="3TrEf2" id="3c$Di5OlvxO" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tpee:fzclF8p" resolve="ifTrue" />
-                            </node>
-                          </node>
-                          <node concept="2oxUTD" id="3c$Di5OlBoJ" role="2OqNvi">
-                            <node concept="37vLTw" id="3c$Di5OlE8d" role="2oxUTC">
-                              <ref role="3cqZAo" node="3c$Di5OjWWv" resolve="oldcode" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="3c$Di5OlOoG" role="3cqZAp">
-                        <node concept="2OqwBi" id="3c$Di5OlZ3z" role="3clFbG">
-                          <node concept="2OqwBi" id="3c$Di5OlT4H" role="2Oq$k0">
-                            <node concept="37vLTw" id="3c$Di5OlOoE" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3c$Di5Olhsb" resolve="ifstmt" />
-                            </node>
-                            <node concept="3TrEf2" id="3c$Di5OlWbz" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tpee:fzclF8o" resolve="condition" />
-                            </node>
-                          </node>
-                          <node concept="2oxUTD" id="3c$Di5Om3So" role="2OqNvi">
-                            <node concept="2OqwBi" id="3c$Di5Op5ow" role="2oxUTC">
-                              <node concept="2OqwBi" id="3c$Di5OoFjY" role="2Oq$k0">
-                                <node concept="1PxgMI" id="3c$Di5Oorfg" role="2Oq$k0">
-                                  <property role="1BlNFB" value="true" />
-                                  <node concept="chp4Y" id="3c$Di5OoBdR" role="3oSUPX">
-                                    <ref role="cht4Q" to="tpee:fzclF8j" resolve="ExpressionStatement" />
-                                  </node>
-                                  <node concept="2OqwBi" id="3c$Di5OoeVC" role="1m5AlR">
-                                    <node concept="2OqwBi" id="3c$Di5OoeVD" role="2Oq$k0">
-                                      <node concept="2OqwBi" id="3c$Di5OoeVE" role="2Oq$k0">
-                                        <node concept="2OqwBi" id="3c$Di5OoeVF" role="2Oq$k0">
-                                          <node concept="37vLTw" id="3c$Di5OoeVG" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3c$Di5OgF8k" resolve="rt" />
-                                          </node>
-                                          <node concept="3TrEf2" id="3c$Di5OoeVH" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="wq2x:36tQV5AmQgD" resolve="condition" />
-                                          </node>
-                                        </node>
-                                        <node concept="3TrEf2" id="3c$Di5OoeVI" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
-                                        </node>
-                                      </node>
-                                      <node concept="3Tsc0h" id="3c$Di5OoeVJ" role="2OqNvi">
-                                        <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                                      </node>
-                                    </node>
-                                    <node concept="1uHKPH" id="3c$Di5OoeVK" role="2OqNvi" />
-                                  </node>
-                                </node>
-                                <node concept="3TrEf2" id="3c$Di5OoIxr" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tpee:fzclF8k" resolve="expression" />
-                                </node>
-                              </node>
-                              <node concept="3YRAZt" id="3c$Di5Opak5" role="2OqNvi" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="3c$Di5Opekc" role="3cqZAp">
-                        <node concept="2OqwBi" id="3c$Di5Opqfq" role="3clFbG">
-                          <node concept="2OqwBi" id="3c$Di5Opijc" role="2Oq$k0">
-                            <node concept="37vLTw" id="3c$Di5Opeka" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3c$Di5OgF8k" resolve="rt" />
-                            </node>
-                            <node concept="3TrEf2" id="3c$Di5Opnqi" role="2OqNvi">
-                              <ref role="3Tt5mk" to="wq2x:36tQV5AmQgD" resolve="condition" />
-                            </node>
-                          </node>
-                          <node concept="3YRAZt" id="3c$Di5OptLE" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="3c$Di5OgF8k" role="1bW2Oz">
-                      <property role="TrG5h" value="rt" />
-                      <node concept="2jxLKc" id="3c$Di5OgF8l" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="3c$Di5OgF8m" role="L3pyr">
-            <ref role="3cqZAo" node="3c$Di5OgByT" resolve="m" />
+        <node concept="RRSsy" id="7AMUQZV6xlT" role="3cqZAp">
+          <property role="RRSoG" value="gZ5fh_4/error" />
+          <node concept="Xl_RD" id="7AMUQZV6xlU" role="RRSoy">
+            <property role="Xl_RC" value="Migration has been truncated, please downgrade. (MigrateAwayFromCondition)" />
           </node>
         </node>
       </node>
@@ -2092,121 +1388,9 @@
         <ref role="1QQUv3" node="3c$Di5OgByN" resolve="execute" />
       </node>
     </node>
-    <node concept="q3mfD" id="3c$Di5OocQX" role="jymVt">
-      <property role="TrG5h" value="check" />
-      <ref role="2VtyIY" to="slm6:1JWcQ2VeXpD" resolve="check" />
-      <node concept="3Tm1VV" id="3c$Di5OocQZ" role="1B3o_S" />
-      <node concept="3clFbS" id="3c$Di5OocR1" role="3clF47">
-        <node concept="3cpWs8" id="e2eVnzKP$N" role="3cqZAp">
-          <node concept="3cpWsn" id="e2eVnzKP$Q" role="3cpWs9">
-            <property role="TrG5h" value="problems" />
-            <node concept="_YKpA" id="e2eVnzKP$J" role="1tU5fm">
-              <node concept="3uibUv" id="e2eVnzL6xw" role="_ZDj9">
-                <ref role="3uigEE" to="6f4m:3n7MNzO_IjP" resolve="Problem" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="e2eVnzKQdi" role="33vP2m">
-              <node concept="Tc6Ow" id="e2eVnzKQcV" role="2ShVmc">
-                <node concept="3uibUv" id="e2eVnzKQcW" role="HW$YZ">
-                  <ref role="3uigEE" to="6f4m:3n7MNzO_IjP" resolve="Problem" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="L3pyB" id="3c$Di5OpyIx" role="3cqZAp">
-          <node concept="3clFbS" id="3c$Di5OpyIy" role="L3pyw">
-            <node concept="3clFbF" id="3c$Di5OpyIz" role="3cqZAp">
-              <node concept="2OqwBi" id="3c$Di5OpyI$" role="3clFbG">
-                <node concept="2OqwBi" id="3c$Di5OpyI_" role="2Oq$k0">
-                  <node concept="qVDSY" id="3c$Di5OpyIA" role="2Oq$k0">
-                    <node concept="chp4Y" id="3c$Di5OpyIB" role="qVDSX">
-                      <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
-                    </node>
-                    <node concept="1dO9Bo" id="3c$Di5OpyIC" role="1dOa5D">
-                      <node concept="3Z_Q4n" id="3c$Di5OpyID" role="1dp2q7" />
-                    </node>
-                  </node>
-                  <node concept="3zZkjj" id="3c$Di5OpyIE" role="2OqNvi">
-                    <node concept="1bVj0M" id="3c$Di5OpyIF" role="23t8la">
-                      <node concept="3clFbS" id="3c$Di5OpyIG" role="1bW5cS">
-                        <node concept="3clFbF" id="3c$Di5OpyIH" role="3cqZAp">
-                          <node concept="2OqwBi" id="3c$Di5OpyIK" role="3clFbG">
-                            <node concept="2OqwBi" id="3c$Di5OpyIL" role="2Oq$k0">
-                              <node concept="37vLTw" id="3c$Di5OpyIM" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3c$Di5OpyJc" resolve="rt" />
-                              </node>
-                              <node concept="3TrEf2" id="3c$Di5OpyIN" role="2OqNvi">
-                                <ref role="3Tt5mk" to="wq2x:36tQV5AmQgD" resolve="condition" />
-                              </node>
-                            </node>
-                            <node concept="3x8VRR" id="3c$Di5OpyIO" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Rh6nW" id="3c$Di5OpyJc" role="1bW2Oz">
-                        <property role="TrG5h" value="rt" />
-                        <node concept="2jxLKc" id="3c$Di5OpyJd" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2es0OD" id="3c$Di5OpyJe" role="2OqNvi">
-                  <node concept="1bVj0M" id="3c$Di5OpyJf" role="23t8la">
-                    <node concept="3clFbS" id="3c$Di5OpyJg" role="1bW5cS">
-                      <node concept="3clFbH" id="3c$Di5OpBxv" role="3cqZAp" />
-                      <node concept="3clFbF" id="3c$Di5OpCFn" role="3cqZAp">
-                        <node concept="2OqwBi" id="3c$Di5OpDTd" role="3clFbG">
-                          <node concept="37vLTw" id="3c$Di5OpCFl" role="2Oq$k0">
-                            <ref role="3cqZAo" node="e2eVnzKP$Q" resolve="problems" />
-                          </node>
-                          <node concept="TSZUe" id="3c$Di5OpFl2" role="2OqNvi">
-                            <node concept="2ShNRf" id="3c$Di5OpFWh" role="25WWJ7">
-                              <node concept="1pGfFk" id="3c$Di5OpGy1" role="2ShVmc">
-                                <ref role="37wK5l" to="6f4m:1lWwAy3eOun" resolve="MigrateManually" />
-                                <node concept="Xl_RD" id="3c$Di5OpHor" role="37wK5m">
-                                  <property role="Xl_RC" value="Could not migrate condition to simple if statement" />
-                                </node>
-                                <node concept="37vLTw" id="3c$Di5OpK0S" role="37wK5m">
-                                  <ref role="3cqZAo" node="3c$Di5OpyKb" resolve="rt" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="3c$Di5OpyKb" role="1bW2Oz">
-                      <property role="TrG5h" value="rt" />
-                      <node concept="2jxLKc" id="3c$Di5OpyKc" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="3c$Di5OpyKd" role="L3pyr">
-            <ref role="3cqZAo" node="3c$Di5OocR3" resolve="m" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="3c$Di5OpKze" role="3cqZAp">
-          <node concept="37vLTw" id="3c$Di5OpKzc" role="3clFbG">
-            <ref role="3cqZAo" node="e2eVnzKP$Q" resolve="problems" />
-          </node>
-        </node>
-      </node>
-      <node concept="ffn8J" id="3c$Di5OocR3" role="3clF46">
-        <property role="TrG5h" value="m" />
-        <ref role="ffrpq" to="slm6:1JWcQ2VeXI5" resolve="m" />
-        <node concept="3uibUv" id="3c$Di5OocR2" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-        </node>
-      </node>
-      <node concept="A3Dl8" id="3c$Di5OocR4" role="3clF45">
-        <node concept="3uibUv" id="3c$Di5OocR5" role="A3Ik2">
-          <ref role="3uigEE" to="6f4m:3n7MNzO_IjP" resolve="Problem" />
-        </node>
-      </node>
+    <node concept="3tTeZs" id="7AMUQZV6xpp" role="jymVt">
+      <property role="3tTeZt" value="&lt;no result checking&gt;" />
+      <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
     </node>
     <node concept="3uibUv" id="3c$Di5OgByW" role="1zkMxy">
       <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 61efa6be..862de0b0 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -28,7 +28,6 @@
       <concept id="6491077959632463275" name="jetbrains.mps.lang.structure.structure.EnumPropertyMigrationInfo" flags="ng" index="3l_iC">
         <child id="6491077959632463286" name="oldProperty" index="3l_iP" />
       </concept>
-      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
       <concept id="7862711839422615209" name="jetbrains.mps.lang.structure.structure.DocumentedNodeAnnotation" flags="ng" index="t5JxF">
         <property id="7862711839422615217" name="text" index="t5JxN" />
         <child id="7862711839422615224" name="seeAlso" index="t5JxU" />
@@ -305,19 +304,6 @@
       <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     </node>
   </node>
-  <node concept="1TIwiD" id="4laj_h9P4cy">
-    <property role="3GE5qa" value="rule.code" />
-    <property role="TrG5h" value="Condition" />
-    <property role="EcuMT" value="4992889260816483106" />
-    <ref role="1TJDcQ" node="1hX44vMFoce" resolve="CodeBlock" />
-    <node concept="PrWs8" id="6ntBQ9KFIud" role="PzmwI">
-      <ref role="PrY4T" to="tpee:i0zv2NF" resolve="IContainsStatementList" />
-    </node>
-    <node concept="PrWs8" id="6ntBQ9KHkM6" role="PzmwI">
-      <ref role="PrY4T" to="tpee:i2fhoOR" resolve="IMethodLike" />
-    </node>
-    <node concept="asaX9" id="6E2cNicZZLL" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="5NuEpF1if3e">
     <property role="3GE5qa" value="rule" />
     <property role="TrG5h" value="RuleInputSpecification" />
@@ -388,14 +374,6 @@
       <ref role="PrY4T" node="1HWyn8iLEBo" resolve="LateParameter" />
     </node>
   </node>
-  <node concept="1TIwiD" id="6infEALDvmn">
-    <property role="3GE5qa" value="constraint" />
-    <property role="TrG5h" value="AssertExpressionConstraint" />
-    <property role="34LRSv" value="assert" />
-    <property role="EcuMT" value="7248331023826941335" />
-    <ref role="1TJDcQ" node="4EfgX2EvF4i" resolve="ExpressionConstraint" />
-    <node concept="asaX9" id="6510ArmLUqT" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="1CgWc1Tyjkw">
     <property role="TrG5h" value="Comment" />
     <property role="3GE5qa" value="comment" />
@@ -483,27 +461,6 @@
       <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
     </node>
   </node>
-  <node concept="1TIwiD" id="1hX44vMFoce">
-    <property role="EcuMT" value="1476354154047570702" />
-    <property role="TrG5h" value="CodeBlock" />
-    <property role="R5$K7" value="true" />
-    <property role="R5$K2" value="false" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="PrWs8" id="1hX44vMFocf" role="PzmwI">
-      <ref role="PrY4T" to="tpee:i0zv2NF" resolve="IContainsStatementList" />
-    </node>
-    <node concept="PrWs8" id="1hX44vMFocg" role="PzmwI">
-      <ref role="PrY4T" to="tpee:i2fhoOR" resolve="IMethodLike" />
-    </node>
-    <node concept="1TJgyj" id="tIwzd1_VRv" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="code" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <property role="IQ2ns" value="535508562359074271" />
-      <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
-    </node>
-    <node concept="asaX9" id="7LI_gNMWvbt" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="18kNIl0mxXI">
     <property role="EcuMT" value="1302893676239396718" />
     <property role="3GE5qa" value="constraint" />
@@ -684,13 +641,6 @@
       <property role="IQ2ns" value="3575255234174969633" />
       <ref role="20lvS9" node="5NuEpF1if3e" resolve="RuleInputSpecification" />
     </node>
-    <node concept="1TJgyj" id="36tQV5AmQgD" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="condition" />
-      <property role="IQ2ns" value="3575255234175001641" />
-      <ref role="20lvS9" node="4laj_h9P4cy" resolve="Condition" />
-      <node concept="asaX9" id="6E2cNicZZLJ" role="lGtFl" />
-    </node>
     <node concept="1TJgyj" id="36tQV5AmIss" role="1TKVEi">
       <property role="IQ2ns" value="3575255234174969628" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -716,14 +666,6 @@
     <property role="3GE5qa" value="rule" />
     <property role="TrG5h" value="ConstraintRule" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="7lt0LtPHSaf" role="1TKVEi">
-      <property role="IQ2ns" value="8456919074565751439" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="7lt0LtPpEVM" resolve="ParameterContainer" />
-      <node concept="asaX9" id="4beNoh250AK" role="lGtFl" />
-    </node>
     <node concept="1TJgyj" id="4beNoh24Wi0" role="1TKVEi">
       <property role="IQ2ns" value="4814011019633607808" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -745,14 +687,6 @@
       <property role="IQ2ns" value="3575255234174969659" />
       <ref role="20lvS9" node="6p0DfM0a3Qe" resolve="Guard" />
     </node>
-    <node concept="1TJgyj" id="36tQV5AmIsW" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="body" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <property role="IQ2ns" value="3575255234174969660" />
-      <ref role="20lvS9" node="6p0DfM0a3TO" resolve="Body" />
-      <node concept="asaX9" id="6E2cNiboHlD" role="lGtFl" />
-    </node>
     <node concept="1TJgyj" id="6E2cNiboHlF" role="1TKVEi">
       <property role="IQ2ns" value="7674753015762572651" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -796,23 +730,6 @@
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
-  <node concept="1TIwiD" id="7lt0LtPpEVM">
-    <property role="EcuMT" value="8456919074560454386" />
-    <property role="3GE5qa" value="rule.component" />
-    <property role="TrG5h" value="ParameterContainer" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="7lt0LtPpF3M" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="parameter" />
-      <property role="20lbJX" value="fLJekj6/_1__n" />
-      <property role="IQ2ns" value="8456919074560454898" />
-      <ref role="20lvS9" node="PB1R3Y7Ed7" resolve="RulePartParameterDeclaration" />
-    </node>
-    <node concept="PrWs8" id="7lt0LtPpF3K" role="PzmwI">
-      <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
-    </node>
-    <node concept="asaX9" id="4beNoh24WhY" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="1mdVbTS8GIV">
     <property role="EcuMT" value="1553157749316176827" />
     <property role="3GE5qa" value="constraint" />
@@ -879,26 +796,6 @@
       <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
     </node>
   </node>
-  <node concept="1TIwiD" id="6OXbTD$dU7b">
-    <property role="EcuMT" value="7871500063866331595" />
-    <property role="TrG5h" value="Query" />
-    <property role="19KtqR" value="true" />
-    <property role="34LRSv" value="query" />
-    <property role="3GE5qa" value="query" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="6OXbTD$dU7c" role="1TKVEi">
-      <property role="IQ2ns" value="7871500063866331596" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="queryStage" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="7P_FdVQ_S6B" resolve="QueryTemplate" />
-      <node concept="asaX9" id="6tPOoeT5KFi" role="lGtFl" />
-    </node>
-    <node concept="PrWs8" id="6OXbTD$dU7e" role="PzmwI">
-      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
-    </node>
-    <node concept="asaX9" id="tbauFy501R" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="12QmIo$yS$B">
     <property role="EcuMT" value="1204249894870288679" />
     <property role="3GE5qa" value="rule.code" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
index 970436f1..38013247 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
@@ -198,9 +198,6 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1803469493727536395" name="jetbrains.mps.lang.smodel.structure.OperationParm_StopConceptList" flags="ng" index="hTh3S">
-        <child id="1803469493727536396" name="concept" index="hTh3Z" />
-      </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
@@ -213,7 +210,6 @@
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
-      <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1154546920561" name="jetbrains.mps.lang.smodel.structure.OperationParm_ConceptList" flags="ng" index="3gmYPX">
         <child id="1154546920563" name="concept" index="3gmYPZ" />
@@ -226,9 +222,6 @@
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
-      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
-        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
-      </concept>
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
       </concept>
@@ -262,7 +255,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
@@ -965,153 +957,6 @@
       <ref role="1YaFvo" to="wq2x:6p0DfM0ang5" resolve="UserConstraint" />
     </node>
   </node>
-  <node concept="1YbPZF" id="7feMCq_1rI_">
-    <property role="TrG5h" value="typeof_CodeBlock" />
-    <property role="3GE5qa" value="" />
-    <node concept="3clFbS" id="7feMCq_1rIA" role="18ibNy">
-      <node concept="3cpWs8" id="7feMCq_2cHx" role="3cqZAp">
-        <node concept="3cpWsn" id="7feMCq_2cHy" role="3cpWs9">
-          <property role="TrG5h" value="lastStatement" />
-          <node concept="3Tqbb2" id="7feMCq_2cHv" role="1tU5fm">
-            <ref role="ehGHo" to="tpee:fzclF8l" resolve="Statement" />
-          </node>
-          <node concept="2OqwBi" id="7feMCq_2cHz" role="33vP2m">
-            <node concept="1YBJjd" id="7feMCq_2cH$" role="2Oq$k0">
-              <ref role="1YBMHb" node="7feMCq_1rIC" resolve="codeBlock" />
-            </node>
-            <node concept="2qgKlT" id="7feMCq_2cH_" role="2OqNvi">
-              <ref role="37wK5l" to="tpek:i2fhS7A" resolve="getLastStatement" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbJ" id="7feMCq_2cME" role="3cqZAp">
-        <node concept="3clFbS" id="7feMCq_2cMG" role="3clFbx">
-          <node concept="1ZobV4" id="7feMCq_1s5Y" role="3cqZAp">
-            <node concept="mw_s8" id="7feMCq_1s8h" role="1ZfhKB">
-              <node concept="2OqwBi" id="7feMCq_1sbC" role="mwGJk">
-                <node concept="1YBJjd" id="7feMCq_1s8f" role="2Oq$k0">
-                  <ref role="1YBMHb" node="7feMCq_1rIC" resolve="codeBlock" />
-                </node>
-                <node concept="2qgKlT" id="7feMCq_1sjh" role="2OqNvi">
-                  <ref role="37wK5l" to="tpek:i2fhBNC" resolve="getExpectedRetType" />
-                </node>
-              </node>
-            </node>
-            <node concept="mw_s8" id="7feMCq_1s61" role="1ZfhK$">
-              <node concept="1Z2H0r" id="7feMCq_1rII" role="mwGJk">
-                <node concept="2OqwBi" id="7feMCq_2dkE" role="1Z2MuG">
-                  <node concept="1PxgMI" id="7feMCq_2dfm" role="2Oq$k0">
-                    <node concept="37vLTw" id="7feMCq_2cHA" role="1m5AlR">
-                      <ref role="3cqZAo" node="7feMCq_2cHy" resolve="lastStatement" />
-                    </node>
-                    <node concept="chp4Y" id="6fXjIfxgneP" role="3oSUPX">
-                      <ref role="cht4Q" to="tpee:fzclF8j" resolve="ExpressionStatement" />
-                    </node>
-                  </node>
-                  <node concept="3TrEf2" id="7feMCq_2d$e" role="2OqNvi">
-                    <ref role="3Tt5mk" to="tpee:fzclF8k" resolve="expression" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="1hX44vMN_yD" role="3cqZAp" />
-        </node>
-        <node concept="2OqwBi" id="7feMCq_2cSa" role="3clFbw">
-          <node concept="37vLTw" id="7feMCq_2cPl" role="2Oq$k0">
-            <ref role="3cqZAo" node="7feMCq_2cHy" resolve="lastStatement" />
-          </node>
-          <node concept="1mIQ4w" id="7feMCq_2d36" role="2OqNvi">
-            <node concept="chp4Y" id="7feMCq_2d3p" role="cj9EA">
-              <ref role="cht4Q" to="tpee:fzclF8j" resolve="ExpressionStatement" />
-            </node>
-          </node>
-        </node>
-        <node concept="3eNFk2" id="1hX44vMNIoL" role="3eNLev">
-          <node concept="3clFbS" id="1hX44vMNIoM" role="3eOfB_">
-            <node concept="2MkqsV" id="1hX44vMNIoP" role="3cqZAp">
-              <node concept="Xl_RD" id="1hX44vMNIoQ" role="2MkJ7o">
-                <property role="Xl_RC" value="value expected" />
-              </node>
-              <node concept="1YBJjd" id="1hX44vMNIoR" role="1urrMF">
-                <ref role="1YBMHb" node="7feMCq_1rIC" resolve="codeBlock" />
-              </node>
-            </node>
-          </node>
-          <node concept="3fqX7Q" id="1hX44vMNM6t" role="3eO9$A">
-            <node concept="2OqwBi" id="1hX44vMNM6v" role="3fr31v">
-              <node concept="2OqwBi" id="1hX44vMNM6w" role="2Oq$k0">
-                <node concept="1YBJjd" id="1hX44vMNM6x" role="2Oq$k0">
-                  <ref role="1YBMHb" node="7feMCq_1rIC" resolve="codeBlock" />
-                </node>
-                <node concept="2qgKlT" id="1hX44vMNM6y" role="2OqNvi">
-                  <ref role="37wK5l" to="tpek:i2fhBNC" resolve="getExpectedRetType" />
-                </node>
-              </node>
-              <node concept="1mIQ4w" id="1hX44vMNM6z" role="2OqNvi">
-                <node concept="chp4Y" id="1hX44vMNM6$" role="cj9EA">
-                  <ref role="cht4Q" to="tpee:fzcqZ_H" resolve="VoidType" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="7feMCq_1rIC" role="1YuTPh">
-      <property role="TrG5h" value="codeBlock" />
-      <ref role="1YaFvo" to="wq2x:1hX44vMFoce" resolve="CodeBlock" />
-    </node>
-  </node>
-  <node concept="18kY7G" id="1hX44vMMkUy">
-    <property role="TrG5h" value="check_CodeBlock" />
-    <node concept="3clFbS" id="1hX44vMMkUz" role="18ibNy">
-      <node concept="3clFbF" id="1hX44vMMHZB" role="3cqZAp">
-        <node concept="2OqwBi" id="1hX44vMMK5d" role="3clFbG">
-          <node concept="2OqwBi" id="1hX44vMMHZD" role="2Oq$k0">
-            <node concept="1YBJjd" id="1hX44vMMHZE" role="2Oq$k0">
-              <ref role="1YBMHb" node="1hX44vMMkU_" resolve="codeBlock" />
-            </node>
-            <node concept="2Rf3mk" id="1hX44vMMHZF" role="2OqNvi">
-              <node concept="1xMEDy" id="1hX44vMMHZG" role="1xVPHs">
-                <node concept="chp4Y" id="1hX44vMMHZH" role="ri$Ld">
-                  <ref role="cht4Q" to="tpee:fzcpWvY" resolve="ReturnStatement" />
-                </node>
-              </node>
-              <node concept="hTh3S" id="1hX44vMMHZI" role="1xVPHs">
-                <node concept="3gn64h" id="1hX44vMMHZJ" role="hTh3Z">
-                  <ref role="3gnhBz" to="tpee:htgVS9_" resolve="IStatementListContainer" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2es0OD" id="1hX44vMMOZZ" role="2OqNvi">
-            <node concept="1bVj0M" id="1hX44vMMP01" role="23t8la">
-              <node concept="3clFbS" id="1hX44vMMP02" role="1bW5cS">
-                <node concept="2MkqsV" id="1hX44vMMP4S" role="3cqZAp">
-                  <node concept="Xl_RD" id="1hX44vMMP7z" role="2MkJ7o">
-                    <property role="Xl_RC" value="return statement is not allowed here" />
-                  </node>
-                  <node concept="37vLTw" id="1hX44vMMPad" role="1urrMF">
-                    <ref role="3cqZAo" node="1hX44vMMP03" resolve="it" />
-                  </node>
-                </node>
-              </node>
-              <node concept="Rh6nW" id="1hX44vMMP03" role="1bW2Oz">
-                <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="1hX44vMMP04" role="1tU5fm" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="1hX44vMMkU_" role="1YuTPh">
-      <property role="TrG5h" value="codeBlock" />
-      <ref role="1YaFvo" to="wq2x:1hX44vMFoce" resolve="CodeBlock" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="60zk4o7revn">
     <property role="TrG5h" value="typeof_LogicalContextExpression" />
     <node concept="3clFbS" id="60zk4o7revo" role="18ibNy">
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
index e653fe4f..17e413c6 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
@@ -3563,21 +3563,6 @@
       <node concept="3clFbS" id="5EDW3XF60ai" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="5EDW3XF5Zaw" role="jymVt" />
-    <node concept="3clFb_" id="7P_FdVPtq7Z" role="jymVt">
-      <property role="TrG5h" value="queryTemplates" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="_YKpA" id="7P_FdVPtqGB" role="3clF45">
-        <node concept="3uibUv" id="6OXbTD$jYJi" role="_ZDj9">
-          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7P_FdVPtq82" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVPtq83" role="3clF47" />
-      <node concept="2AHcQZ" id="5EDW3XF6yGO" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5EDW3XF6yEU" role="jymVt" />
     <node concept="3clFb_" id="2WtKs4tZlCC" role="jymVt">
       <property role="1EzhhJ" value="true" />
       <property role="TrG5h" value="analyses" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index 76d08554..ecd50b08 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -6712,74 +6712,6 @@
     </node>
     <node concept="2tJIrI" id="4U$Q3dLryje" role="jymVt" />
     <node concept="3Tm1VV" id="1pPth$m7IVG" role="1B3o_S" />
-    <node concept="3clFb_" id="4KRwoelAtxl" role="jymVt">
-      <property role="TrG5h" value="macroTemplate" />
-      <node concept="3uibUv" id="4KRwoelAyo8" role="3clF45">
-        <ref role="3uigEE" node="1hX44vNnjJ$" resolve="MacroTemplate" />
-        <node concept="16syzq" id="4KRwoelDRZs" role="11_B2D">
-          <ref role="16sUi3" node="4KRwoelDRX0" resolve="T" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="4KRwoelAtxp" role="1B3o_S" />
-      <node concept="3clFbS" id="4KRwoelAtxq" role="3clF47">
-        <node concept="YS8fn" id="631nQp3ZlPl" role="3cqZAp">
-          <node concept="2ShNRf" id="631nQp3ZlPP" role="YScLw">
-            <node concept="1pGfFk" id="631nQp3Zn5D" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="4KRwoelAyUd" role="3clF46">
-        <property role="TrG5h" value="concept" />
-        <node concept="3bZ5Sz" id="4KRwoelAyUc" role="1tU5fm" />
-      </node>
-      <node concept="16euLQ" id="4KRwoelDRX0" role="16eVyc">
-        <property role="TrG5h" value="T" />
-        <node concept="3uibUv" id="1eKXYsjxDj6" role="3ztrMU">
-          <ref role="3uigEE" node="1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7qAd7" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5itBwM8SKbL" role="jymVt" />
-    <node concept="3clFb_" id="5itBwM8SJDJ" role="jymVt">
-      <property role="TrG5h" value="macroTemplate" />
-      <node concept="3uibUv" id="5itBwM8SJDK" role="3clF45">
-        <ref role="3uigEE" node="1hX44vNnjJ$" resolve="MacroTemplate" />
-        <node concept="16syzq" id="5itBwM8SJDL" role="11_B2D">
-          <ref role="16sUi3" node="5itBwM8SJDQ" resolve="T" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5itBwM8SJDM" role="1B3o_S" />
-      <node concept="3clFbS" id="5itBwM8SJDN" role="3clF47">
-        <node concept="YS8fn" id="631nQp3ZLIO" role="3cqZAp">
-          <node concept="2ShNRf" id="631nQp3ZLIP" role="YScLw">
-            <node concept="1pGfFk" id="631nQp3ZLIQ" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="5itBwM8SK_e" role="3clF46">
-        <property role="TrG5h" value="templateRef" />
-        <node concept="3uibUv" id="5itBwM8SK_f" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="16euLQ" id="5itBwM8SJDQ" role="16eVyc">
-        <property role="TrG5h" value="T" />
-        <node concept="3uibUv" id="5itBwM8SJDR" role="3ztrMU">
-          <ref role="3uigEE" node="1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM8SJDS" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4MEOIDEgpw7" role="jymVt" />
     <node concept="3clFb_" id="5itBwM7qDtj" role="jymVt">
       <property role="1EzhhJ" value="true" />
       <property role="TrG5h" value="expandMacroTemplate" />
@@ -6830,26 +6762,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5itBwM7qCDt" role="jymVt" />
-    <node concept="3clFb_" id="6UWSvq4Vn1v" role="jymVt">
-      <property role="TrG5h" value="allMacroConcepts" />
-      <node concept="3vKaQO" id="6UWSvq4Vn1w" role="3clF45">
-        <node concept="3bZ5Sz" id="6UWSvq4VpUS" role="3O5elw" />
-      </node>
-      <node concept="3Tm1VV" id="6UWSvq4Vn1y" role="1B3o_S" />
-      <node concept="3clFbS" id="6UWSvq4Vn1z" role="3clF47">
-        <node concept="YS8fn" id="631nQp3ZXzf" role="3cqZAp">
-          <node concept="2ShNRf" id="631nQp3ZXzg" role="YScLw">
-            <node concept="1pGfFk" id="631nQp3ZXzh" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7qscB" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4MEOIDEWLmE" role="jymVt" />
     <node concept="3clFb_" id="4MEOIDEWLkY" role="jymVt">
       <property role="TrG5h" value="allMacroTemplateRefs" />
       <property role="1EzhhJ" value="true" />