diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index 875d3eb4..3482d3e6 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -303,7 +303,6 @@
       <concept id="1114729360583" name="jetbrains.mps.lang.generator.structure.CopySrcListMacro" flags="ln" index="2b32R4">
         <child id="1168278589236" name="sourceNodesQuery" index="2P8S$" />
       </concept>
-      <concept id="1202776937179" name="jetbrains.mps.lang.generator.structure.AbandonInput_RuleConsequence" flags="lg" index="b5Tf3" />
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
         <child id="1219952894531" name="dropRootRule" index="aQYdv" />
         <child id="1200911492601" name="mappingLabel" index="2rTMjI" />
@@ -556,6 +555,9 @@
       <concept id="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
         <child id="1138662048170" name="value" index="tz02z" />
       </concept>
+      <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
+        <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
+      </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
@@ -682,6 +684,7 @@
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
+      <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
@@ -1475,10 +1478,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="20Ay2VexgkL" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:20Ay2VepLqo" resolve="CodeLogicalClause" />
-      <node concept="b5Tf3" id="20Ay2Ve_l5G" role="1lVwrX" />
-    </node>
     <node concept="3aamgX" id="20Ay2VewH3T" role="3acgRq">
       <property role="36QftV" value="true" />
       <ref role="30HIoZ" to="wq2x:6p0DfM0a3d3" resolve="RuleComponent" />
@@ -3753,37 +3752,66 @@
                 <node concept="A3Dl8" id="4vbeH84Np3D" role="1tU5fm">
                   <node concept="3Tqbb2" id="4vbeH84Np3G" role="A3Ik2" />
                 </node>
-                <node concept="2OqwBi" id="4vbeH84Np3R" role="33vP2m">
-                  <node concept="2OqwBi" id="4vbeH84Np3S" role="2Oq$k0">
-                    <node concept="2OqwBi" id="4vbeH84Np3T" role="2Oq$k0">
-                      <node concept="3TrEf2" id="4vbeH84Np3U" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:6p0DfM0a5m9" resolve="code" />
+                <node concept="2OqwBi" id="4nIWweBKx0Y" role="33vP2m">
+                  <node concept="2OqwBi" id="4nIWweBKoa5" role="2Oq$k0">
+                    <node concept="2OqwBi" id="4nIWweBKmb1" role="2Oq$k0">
+                      <node concept="2OqwBi" id="4vbeH84Np3T" role="2Oq$k0">
+                        <node concept="3TrEf2" id="4nIWweBKg5t" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:20Ay2VegCfd" resolve="logic" />
+                        </node>
+                        <node concept="37vLTw" id="4vbeH84Np3V" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4vbeH84NjXz" resolve="rp" />
+                        </node>
                       </node>
-                      <node concept="37vLTw" id="4vbeH84Np3V" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4vbeH84NjXz" resolve="rp" />
+                      <node concept="3Tsc0h" id="4nIWweBKmwW" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:20Ay2VefOqD" resolve="clauses" />
+                      </node>
+                    </node>
+                    <node concept="v3k3i" id="4nIWweBKwhm" role="2OqNvi">
+                      <node concept="chp4Y" id="4nIWweBKwwx" role="v3oSu">
+                        <ref role="cht4Q" to="wq2x:20Ay2Vei7FH" resolve="TemplateLogicalClause" />
                       </node>
                     </node>
-                    <node concept="32TBzR" id="4vbeH84Np3W" role="2OqNvi" />
                   </node>
-                  <node concept="3zZkjj" id="4vbeH84Np3X" role="2OqNvi">
-                    <node concept="1bVj0M" id="4vbeH84Np3Y" role="23t8la">
-                      <node concept="3clFbS" id="4vbeH84Np3Z" role="1bW5cS">
-                        <node concept="3clFbF" id="4vbeH84Np40" role="3cqZAp">
-                          <node concept="2OqwBi" id="4vbeH84Np41" role="3clFbG">
-                            <node concept="37vLTw" id="4vbeH84Np42" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4vbeH84Np45" resolve="c" />
+                  <node concept="3goQfb" id="4nIWweBKxvK" role="2OqNvi">
+                    <node concept="1bVj0M" id="4nIWweBKxvM" role="23t8la">
+                      <node concept="3clFbS" id="4nIWweBKxvN" role="1bW5cS">
+                        <node concept="3clFbF" id="4nIWweBKxLV" role="3cqZAp">
+                          <node concept="2OqwBi" id="4nIWweBKzCG" role="3clFbG">
+                            <node concept="2OqwBi" id="4nIWweBKybC" role="2Oq$k0">
+                              <node concept="37vLTw" id="4nIWweBKxLU" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4nIWweBKxvO" resolve="it" />
+                              </node>
+                              <node concept="32TBzR" id="4nIWweBKy_a" role="2OqNvi" />
                             </node>
-                            <node concept="1mIQ4w" id="4vbeH84Np43" role="2OqNvi">
-                              <node concept="chp4Y" id="4vbeH84Np44" role="cj9EA">
-                                <ref role="cht4Q" to="tpee:fzcpWvK" resolve="LocalVariableDeclarationStatement" />
+                            <node concept="3zZkjj" id="4nIWweBKzVH" role="2OqNvi">
+                              <node concept="1bVj0M" id="4nIWweBKzVI" role="23t8la">
+                                <node concept="3clFbS" id="4nIWweBKzVJ" role="1bW5cS">
+                                  <node concept="3clFbF" id="4nIWweBKzVK" role="3cqZAp">
+                                    <node concept="2OqwBi" id="4nIWweBKzVL" role="3clFbG">
+                                      <node concept="37vLTw" id="4nIWweBKzVM" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="4nIWweBKzVP" resolve="c" />
+                                      </node>
+                                      <node concept="1mIQ4w" id="4nIWweBKzVN" role="2OqNvi">
+                                        <node concept="chp4Y" id="4nIWweBKzVO" role="cj9EA">
+                                          <ref role="cht4Q" to="tpee:fzcpWvK" resolve="LocalVariableDeclarationStatement" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="Rh6nW" id="4nIWweBKzVP" role="1bW2Oz">
+                                  <property role="TrG5h" value="c" />
+                                  <node concept="2jxLKc" id="4nIWweBKzVQ" role="1tU5fm" />
+                                </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="4vbeH84Np45" role="1bW2Oz">
-                        <property role="TrG5h" value="c" />
-                        <node concept="2jxLKc" id="4vbeH84Np46" role="1tU5fm" />
+                      <node concept="Rh6nW" id="4nIWweBKxvO" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="4nIWweBKxvP" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -20760,60 +20788,6 @@
   <node concept="jVnub" id="20Ay2VewuOL">
     <property role="3GE5qa" value="rule" />
     <property role="TrG5h" value="ruleComponent_statements" />
-    <node concept="3aamgX" id="20Ay2Vewv1x" role="3aUrZf">
-      <property role="36QftV" value="true" />
-      <ref role="30HIoZ" to="wq2x:6p0DfM0a3d3" resolve="RuleComponent" />
-      <node concept="1Koe21" id="20Ay2Vewzgd" role="1lVwrX">
-        <node concept="3clFbS" id="20Ay2VewzsG" role="1Koe22">
-          <node concept="raruj" id="20Ay2VewzsI" role="lGtFl" />
-          <node concept="2b32R4" id="20Ay2VewzxJ" role="lGtFl">
-            <node concept="3JmXsc" id="20Ay2VewzxL" role="2P8S$">
-              <node concept="3clFbS" id="20Ay2VewzxM" role="2VODD2">
-                <node concept="3clFbF" id="20Ay2VewzAF" role="3cqZAp">
-                  <node concept="2OqwBi" id="20Ay2Vew$jZ" role="3clFbG">
-                    <node concept="2OqwBi" id="20Ay2VewzMA" role="2Oq$k0">
-                      <node concept="30H73N" id="20Ay2VewzAE" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="20Ay2VewzWf" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:6p0DfM0a5m9" resolve="code" />
-                      </node>
-                    </node>
-                    <node concept="3Tsc0h" id="20Ay2Vew$We" role="2OqNvi">
-                      <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="20Ay2Veww6Y" role="30HLyM">
-        <node concept="3clFbS" id="20Ay2Veww6Z" role="2VODD2">
-          <node concept="3clFbF" id="20Ay2Vewwe8" role="3cqZAp">
-            <node concept="1Wc70l" id="20Ay2VeB9Uc" role="3clFbG">
-              <node concept="2OqwBi" id="20Ay2VeBaVE" role="3uHU7w">
-                <node concept="2OqwBi" id="20Ay2VeBakn" role="2Oq$k0">
-                  <node concept="30H73N" id="20Ay2VeBa7a" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="20Ay2VeBaCd" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:20Ay2VegCfd" resolve="logic" />
-                  </node>
-                </node>
-                <node concept="3w_OXm" id="20Ay2VeBbfS" role="2OqNvi" />
-              </node>
-              <node concept="2OqwBi" id="20Ay2Vewx4f" role="3uHU7B">
-                <node concept="2OqwBi" id="20Ay2Vewwr5" role="2Oq$k0">
-                  <node concept="30H73N" id="20Ay2Vewwe7" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="20Ay2Veww_T" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:6p0DfM0a5m9" resolve="code" />
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="20Ay2VewxIO" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="20Ay2Vex72i" role="3aUrZf">
       <property role="36QftV" value="true" />
       <ref role="30HIoZ" to="wq2x:6p0DfM0a3d3" resolve="RuleComponent" />
@@ -20841,32 +20815,6 @@
           </node>
         </node>
       </node>
-      <node concept="30G5F_" id="20Ay2Vex72v" role="30HLyM">
-        <node concept="3clFbS" id="20Ay2Vex72w" role="2VODD2">
-          <node concept="3clFbF" id="20Ay2Vex72x" role="3cqZAp">
-            <node concept="1Wc70l" id="20Ay2VeBc4x" role="3clFbG">
-              <node concept="2OqwBi" id="20Ay2VeBd8Q" role="3uHU7w">
-                <node concept="2OqwBi" id="20Ay2VeBctk" role="2Oq$k0">
-                  <node concept="30H73N" id="20Ay2VeBcg7" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="20Ay2VeBcCs" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:6p0DfM0a5m9" resolve="code" />
-                  </node>
-                </node>
-                <node concept="3w_OXm" id="20Ay2VeBdPB" role="2OqNvi" />
-              </node>
-              <node concept="2OqwBi" id="20Ay2Vex72y" role="3uHU7B">
-                <node concept="2OqwBi" id="20Ay2Vex72z" role="2Oq$k0">
-                  <node concept="30H73N" id="20Ay2Vex72$" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="20Ay2Vex7wG" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:20Ay2VegCfd" resolve="logic" />
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="20Ay2Vexe_L" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="j$LIH" id="20Ay2VewAbF" role="jxRDz">
       <node concept="1lLz0L" id="20Ay2VewAod" role="1lHHLF">
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps
deleted file mode 100644
index ad26f3a5..00000000
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/actions.mps
+++ /dev/null
@@ -1,1056 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:04847532-40d8-4c13-804f-12fbbdc25fa9(jetbrains.mps.lang.typesystem2.actions)">
-  <persistence version="9" />
-  <languages>
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="3" />
-    <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-  </languages>
-  <imports>
-    <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.typesystem2.structure)" />
-    <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="ykok" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.constraints(MPS.Core/)" />
-    <import index="35tq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.scope(MPS.Core/)" />
-    <import index="inbo" ref="r:22db907b-8239-4180-8797-e91cea0b9573(jetbrains.mps.smodel.search)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="hy7p" ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.typesystem2.util)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.template)" />
-    <import index="vxmb" ref="r:3345f3eb-f61a-42bd-88eb-d9032a80e9a6(jetbrains.mps.lang.typesystem2.editor)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-  </imports>
-  <registry>
-    <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts">
-      <concept id="1161622665029" name="jetbrains.mps.lang.sharedConcepts.structure.ConceptFunctionParameter_model" flags="nn" index="1Q6Npb" />
-    </language>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
-        <child id="1068498886297" name="rValue" index="37vLTx" />
-        <child id="1068498886295" name="lValue" index="37vLTJ" />
-      </concept>
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <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="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
-        <child id="1137022507850" name="body" index="2VODD2" />
-      </concept>
-      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
-        <property id="1070475926801" name="value" index="Xl_RC" />
-      </concept>
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </concept>
-      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
-        <child id="1070534934091" name="type" index="10QFUM" />
-        <child id="1070534934092" name="expression" index="10QFUP" />
-      </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>
-      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </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="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </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="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
-        <child id="1081516765348" name="expression" index="3fr31v" />
-      </concept>
-      <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="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
-      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
-        <property id="6329021646629104958" name="text" index="3SKdUp" />
-      </concept>
-      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
-        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
-      </concept>
-    </language>
-    <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
-      <concept id="1196433923911" name="jetbrains.mps.lang.actions.structure.SideTransform_SimpleString" flags="nn" index="2h1dTh">
-        <property id="1196433942569" name="text" index="2h1i$Z" />
-      </concept>
-      <concept id="1177323996388" name="jetbrains.mps.lang.actions.structure.AddMenuPart" flags="ng" index="tYCnQ" />
-      <concept id="1177327570013" name="jetbrains.mps.lang.actions.structure.QueryFunction_Substitute_Handler" flags="in" index="ucgPf" />
-      <concept id="1177327666243" name="jetbrains.mps.lang.actions.structure.SimpleItemSubstitutePart" flags="ng" index="ucClh">
-        <child id="1177327709106" name="handler" index="ucMEw" />
-        <child id="1177336013307" name="matchingText" index="uGu3D" />
-      </concept>
-      <concept id="1177333529597" name="jetbrains.mps.lang.actions.structure.ConceptPart" flags="ng" index="uyZFJ">
-        <reference id="1177333551023" name="concept" index="uz4UX" />
-        <child id="1177333559040" name="part" index="uz6Si" />
-      </concept>
-      <concept id="1177335944525" name="jetbrains.mps.lang.actions.structure.QueryFunction_SubstituteString" flags="in" index="uGdhv" />
-      <concept id="1177337641126" name="jetbrains.mps.lang.actions.structure.ParameterizedSubstituteMenuPart" flags="ng" index="uMFAO">
-        <child id="1177337679534" name="type" index="uMOYW" />
-        <child id="1177338017561" name="query" index="uO7ob" />
-        <child id="1177339176647" name="matchingText" index="uSyvl" />
-        <child id="1177339421668" name="handler" index="uTubQ" />
-      </concept>
-      <concept id="1177337833147" name="jetbrains.mps.lang.actions.structure.ConceptFunctionParameter_parameterObject" flags="nn" index="uNquD" />
-      <concept id="1177337890340" name="jetbrains.mps.lang.actions.structure.QueryFunction_ParameterizedSubstitute_Query" flags="in" index="uNCsQ" />
-      <concept id="1177339114370" name="jetbrains.mps.lang.actions.structure.QueryFunction_ParameterizedSubstitute_String" flags="in" index="uSjag" />
-      <concept id="1177339225103" name="jetbrains.mps.lang.actions.structure.QueryFunction_ParameterizedSubstitute_Handler" flags="in" index="uSIkt" />
-      <concept id="562388756457602485" name="jetbrains.mps.lang.actions.structure.MigrateManuallyAnnotation" flags="ng" index="xAzKH">
-        <reference id="562388756457602486" name="migrateTo" index="xAzKI" />
-      </concept>
-      <concept id="562388756457499018" name="jetbrains.mps.lang.actions.structure.MigratedToAnnotation" flags="ng" index="xBawi">
-        <reference id="562388756457499129" name="migratedTo" index="xBaxx" />
-      </concept>
-      <concept id="1177402519659" name="jetbrains.mps.lang.actions.structure.WrapperSubstituteMenuPart" flags="ng" index="yEb5T">
-        <reference id="1177402731616" name="wrappedConcept" index="yEYPM" />
-        <child id="1177402719158" name="wrapperBlock" index="yEVE$" />
-      </concept>
-      <concept id="1177402571666" name="jetbrains.mps.lang.actions.structure.QueryFunction_SubstituteWrapper" flags="in" index="yEnE0" />
-      <concept id="1177402641904" name="jetbrains.mps.lang.actions.structure.ConceptFunctionParameter_nodeToWrap" flags="nn" index="yECNy" />
-      <concept id="1177409831820" name="jetbrains.mps.lang.actions.structure.RemovePart" flags="ng" index="z64au">
-        <reference id="1177409838946" name="conceptToRemove" index="z65TK" />
-      </concept>
-      <concept id="1177497140107" name="jetbrains.mps.lang.actions.structure.ConceptFunctionParameter_sourceNode" flags="nn" index="Cj7Ep" />
-      <concept id="1177498013932" name="jetbrains.mps.lang.actions.structure.SimpleSideTransformMenuPart" flags="ng" index="Cmt7Y">
-        <child id="1177498166690" name="matchingText" index="Cn2iK" />
-        <child id="1177498182537" name="descriptionText" index="Cn6ar" />
-        <child id="1177498207384" name="handler" index="Cncma" />
-      </concept>
-      <concept id="1177498227294" name="jetbrains.mps.lang.actions.structure.QueryFunction_SideTransform_Handler" flags="in" index="Cnhdc" />
-      <concept id="767145758118872833" name="jetbrains.mps.lang.actions.structure.NF_LinkList_AddNewChildOperation" flags="nn" index="2DeJg1" />
-      <concept id="767145758118872830" name="jetbrains.mps.lang.actions.structure.NF_Link_SetNewChildOperation" flags="nn" index="2DeJnY" />
-      <concept id="1180134965967" name="jetbrains.mps.lang.actions.structure.ConceptSubstitutePart" flags="ng" index="35xCft">
-        <reference id="1180135092669" name="concept" index="35y72J" />
-      </concept>
-      <concept id="5480835971642155304" name="jetbrains.mps.lang.actions.structure.NF_Model_CreateNewNodeOperation" flags="nn" index="15TzpJ" />
-      <concept id="1158700664498" name="jetbrains.mps.lang.actions.structure.NodeFactories" flags="ng" index="37WguZ">
-        <child id="1158700779049" name="nodeFactory" index="37WGs$" />
-      </concept>
-      <concept id="1158700725281" name="jetbrains.mps.lang.actions.structure.NodeFactory" flags="ig" index="37WvkG">
-        <reference id="1158700943156" name="applicableConcept" index="37XkoT" />
-        <child id="1158701448518" name="setupFunction" index="37ZfLb" />
-      </concept>
-      <concept id="1158701162220" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction" flags="in" index="37Y9Zx" />
-      <concept id="1154465102724" name="jetbrains.mps.lang.actions.structure.NodeSubstitutePreconditionFunction" flags="in" index="3buRE8" />
-      <concept id="1154465273778" name="jetbrains.mps.lang.actions.structure.ConceptFunctionParameter_parentNode" flags="nn" index="3bvxqY" />
-      <concept id="1154622616118" name="jetbrains.mps.lang.actions.structure.SideTransformHintSubstitutePreconditionFunction" flags="in" index="3kRJcU" />
-      <concept id="1214830969967" name="jetbrains.mps.lang.actions.structure.ConceptFunctionParameter_wrapped" flags="nn" index="3p$olP" />
-      <concept id="5584396657084912703" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction_NewNode" flags="nn" index="1r4Lsj" />
-      <concept id="1112056943463" name="jetbrains.mps.lang.actions.structure.NodeSubstituteActions" flags="ng" index="3FK_9_" />
-      <concept id="1112058030570" name="jetbrains.mps.lang.actions.structure.NodeSubstituteActionsBuilder" flags="ig" index="3FOIzC">
-        <reference id="1112058088712" name="applicableConcept" index="3FOWKa" />
-        <child id="1177324142645" name="part" index="tZc4B" />
-        <child id="1154465386371" name="precondition" index="3bvWUf" />
-      </concept>
-      <concept id="1138079221458" name="jetbrains.mps.lang.actions.structure.SideTransformHintSubstituteActionsBuilder" flags="ig" index="3UNGvq">
-        <property id="1140829165817" name="transformTag" index="2uHTBK" />
-        <reference id="1138079221462" name="applicableConcept" index="3UNGvu" />
-        <child id="1177442283389" name="part" index="_1QTJ" />
-        <child id="1154622757656" name="precondition" index="3kShCk" />
-      </concept>
-      <concept id="1138079416598" name="jetbrains.mps.lang.actions.structure.SideTransformHintSubstituteActions" flags="ng" index="3UOs0u" />
-    </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" />
-      </concept>
-      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
-        <child id="1144104376918" name="parameter" index="1xVPHs" />
-      </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="5253134957341697434" name="jetbrains.mps.lang.smodel.structure.LinkNameRefExpression" flags="nn" index="prKvN">
-        <reference id="5253134957341833005" name="conceptDeclaration" index="prhl4" />
-        <reference id="5253134957341833006" name="linkDeclaration" index="prhl7" />
-      </concept>
-      <concept id="1143235216708" name="jetbrains.mps.lang.smodel.structure.Model_CreateNewNodeOperation" flags="nn" index="I8ghe">
-        <reference id="1143235391024" name="concept" index="I8UWU" />
-      </concept>
-      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
-      <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
-        <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
-      </concept>
-      <concept id="1154546920561" name="jetbrains.mps.lang.smodel.structure.OperationParm_ConceptList" flags="ng" index="3gmYPX">
-        <child id="1154546920563" name="concept" index="3gmYPZ" />
-      </concept>
-      <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
-        <reference id="1154546997487" name="concept" index="3gnhBz" />
-      </concept>
-      <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" />
-      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
-        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
-      </concept>
-      <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
-        <child id="1180636770616" name="createdType" index="3zrR0E" />
-      </concept>
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
-        <reference id="1138405853777" name="concept" index="ehGHo" />
-      </concept>
-      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
-        <reference id="1138056395725" name="property" index="3TsBF5" />
-      </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="1172424058054" name="jetbrains.mps.lang.smodel.structure.ConceptRefExpression" flags="nn" index="3TUQnm">
-        <reference id="1172424100906" name="conceptDeclaration" index="3TV0OU" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="linkRole" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
-    </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
-        <child id="1151689745422" name="elementType" index="A3Ik2" />
-      </concept>
-      <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
-    </language>
-  </registry>
-  <node concept="3FK_9_" id="2E5lcNmZaq$">
-    <property role="TrG5h" value="Expression_subst_LogicExpressionWrapper" />
-    <node concept="1X3_iC" id="4hPXq9Jmew5" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1112056943463/1112058057696" />
-      <node concept="3FOIzC" id="2E5lcNmZayb" role="8Wnug">
-        <ref role="3FOWKa" to="tpee:fz3vP1J" resolve="Expression" />
-        <node concept="tYCnQ" id="2E5lcNmZdbU" role="tZc4B">
-          <ref role="uz4UX" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
-          <node concept="uMFAO" id="7ksQUDZs6LK" role="uz6Si">
-            <node concept="3Tqbb2" id="7ksQUDZsaPa" role="uMOYW" />
-            <node concept="uSIkt" id="7ksQUDZs6LO" role="uTubQ">
-              <node concept="3clFbS" id="7ksQUDZs6LQ" role="2VODD2">
-                <node concept="3cpWs8" id="7ksQUDZr_QJ" role="3cqZAp">
-                  <node concept="3cpWsn" id="7ksQUDZr_QK" role="3cpWs9">
-                    <property role="TrG5h" value="lew" />
-                    <node concept="3Tqbb2" id="7ksQUDZr_QI" role="1tU5fm">
-                      <ref role="ehGHo" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
-                    </node>
-                    <node concept="2OqwBi" id="7ksQUDZr_QL" role="33vP2m">
-                      <node concept="1Q6Npb" id="7ksQUDZr_QM" role="2Oq$k0" />
-                      <node concept="15TzpJ" id="7ksQUDZswYj" role="2OqNvi">
-                        <ref role="I8UWU" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="7ksQUDZscxd" role="3cqZAp">
-                  <node concept="3cpWsn" id="7ksQUDZscxe" role="3cpWs9">
-                    <property role="TrG5h" value="lvr" />
-                    <node concept="3Tqbb2" id="7ksQUDZscxc" role="1tU5fm">
-                      <ref role="ehGHo" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
-                    </node>
-                    <node concept="2OqwBi" id="7ksQUDZscxf" role="33vP2m">
-                      <node concept="1Q6Npb" id="7ksQUDZscxg" role="2Oq$k0" />
-                      <node concept="15TzpJ" id="7ksQUDZscxh" role="2OqNvi">
-                        <ref role="I8UWU" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="7ksQUDZr_Da" role="3cqZAp">
-                  <node concept="2OqwBi" id="7ksQUDZrAez" role="3clFbG">
-                    <node concept="2OqwBi" id="7ksQUDZr_Vy" role="2Oq$k0">
-                      <node concept="37vLTw" id="7ksQUDZr_QO" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7ksQUDZr_QK" resolve="lew" />
-                      </node>
-                      <node concept="3TrEf2" id="7ksQUDZrA3Y" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:6p0DfM0pQge" resolve="content" />
-                      </node>
-                    </node>
-                    <node concept="2oxUTD" id="7ksQUDZrAs8" role="2OqNvi">
-                      <node concept="37vLTw" id="7ksQUDZscxi" role="2oxUTC">
-                        <ref role="3cqZAo" node="7ksQUDZscxe" resolve="lvr" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="7ksQUDZscFs" role="3cqZAp">
-                  <node concept="2OqwBi" id="7ksQUDZsdar" role="3clFbG">
-                    <node concept="2OqwBi" id="7ksQUDZscJl" role="2Oq$k0">
-                      <node concept="37vLTw" id="7ksQUDZscFq" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7ksQUDZscxe" resolve="lvr" />
-                      </node>
-                      <node concept="3TrEf2" id="7ksQUDZscVI" role="2OqNvi">
-                        <ref role="3Tt5mk" to="5j4j:7E86$tK_PaH" resolve="declaration" />
-                      </node>
-                    </node>
-                    <node concept="2oxUTD" id="7ksQUDZsds9" role="2OqNvi">
-                      <node concept="uNquD" id="7ksQUDZsdun" role="2oxUTC" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="7ksQUDZrAzK" role="3cqZAp">
-                  <node concept="37vLTw" id="7ksQUDZrAzI" role="3clFbG">
-                    <ref role="3cqZAo" node="7ksQUDZr_QK" resolve="lew" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="uNCsQ" id="7ksQUDZs6LS" role="uO7ob">
-              <node concept="3clFbS" id="7ksQUDZs6LU" role="2VODD2">
-                <node concept="3SKdUt" id="7ksQUDZszzQ" role="3cqZAp">
-                  <node concept="3SKdUq" id="7ksQUDZszDg" role="3SKWNk">
-                    <property role="3SKdUp" value="see ChildSubstituteActionsHelper" />
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="7ksQUDZstKV" role="3cqZAp">
-                  <node concept="3cpWsn" id="7ksQUDZstKW" role="3cpWs9">
-                    <property role="TrG5h" value="srd" />
-                    <node concept="3uibUv" id="7ksQUDZstKS" role="1tU5fm">
-                      <ref role="3uigEE" to="ykok:~ReferenceDescriptor" resolve="ReferenceDescriptor" />
-                    </node>
-                    <node concept="2YIFZM" id="7ksQUDZstKX" role="33vP2m">
-                      <ref role="37wK5l" to="ykok:~ModelConstraints.getSmartReferenceDescriptor(org.jetbrains.mps.openapi.model.SNode,java.lang.String,int,org.jetbrains.mps.openapi.model.SNode):jetbrains.mps.smodel.constraints.ReferenceDescriptor" resolve="getSmartReferenceDescriptor" />
-                      <ref role="1Pybhc" to="ykok:~ModelConstraints" resolve="ModelConstraints" />
-                      <node concept="3bvxqY" id="7ksQUDZstKY" role="37wK5m" />
-                      <node concept="prKvN" id="7ksQUDZstKZ" role="37wK5m">
-                        <ref role="prhl4" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
-                        <ref role="prhl7" to="5j4j:7E86$tK_PaH" resolve="declaration" />
-                      </node>
-                      <node concept="3cmrfG" id="7ksQUDZstL0" role="37wK5m">
-                        <property role="3cmrfH" value="-1" />
-                      </node>
-                      <node concept="3TUQnm" id="7ksQUDZstL1" role="37wK5m">
-                        <ref role="3TV0OU" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="7ksQUDZs9GV" role="3cqZAp">
-                  <node concept="10QFUN" id="7ksQUDZsbed" role="3clFbG">
-                    <node concept="A3Dl8" id="7ksQUDZsbne" role="10QFUM">
-                      <node concept="3Tqbb2" id="7ksQUDZsbuk" role="A3Ik2" />
-                    </node>
-                    <node concept="2OqwBi" id="7ksQUDZsbei" role="10QFUP">
-                      <node concept="2OqwBi" id="7ksQUDZsE0W" role="2Oq$k0">
-                        <node concept="37vLTw" id="7ksQUDZsE0X" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7ksQUDZstKW" resolve="srd" />
-                        </node>
-                        <node concept="liA8E" id="7ksQUDZsE0Y" role="2OqNvi">
-                          <ref role="37wK5l" to="ykok:~ReferenceDescriptor.getScope():jetbrains.mps.scope.Scope" resolve="getScope" />
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="7ksQUDZsbek" role="2OqNvi">
-                        <ref role="37wK5l" to="35tq:~Scope.getAvailableElements(java.lang.String):java.lang.Iterable" resolve="getAvailableElements" />
-                        <node concept="Xl_RD" id="7ksQUDZsbel" role="37wK5m">
-                          <property role="Xl_RC" value="" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="xBawi" id="4hPXq9Jmew4" role="lGtFl">
-              <ref role="xBaxx" to="vxmb:4hPXq9Jmeul" />
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9Jmeuk" role="lGtFl">
-          <ref role="xBaxx" to="vxmb:4hPXq9JmenD" resolve="Expression_Contribution" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3UOs0u" id="2E5lcNn1a8i">
-    <property role="TrG5h" value="Head_replace" />
-    <property role="3GE5qa" value="rule.component" />
-    <node concept="1X3_iC" id="4hPXq9Jmehz" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1138079416598/1138079416599" />
-      <node concept="3UNGvq" id="2E5lcNn1af0" role="8Wnug">
-        <property role="2uHTBK" value="ext_1_RTransform" />
-        <ref role="3UNGvu" to="wq2x:6p0DfM0a3gA" resolve="Head" />
-        <node concept="3kRJcU" id="2E5lcNn1aAJ" role="3kShCk">
-          <node concept="3clFbS" id="2E5lcNn1aAK" role="2VODD2">
-            <node concept="3clFbF" id="2E5lcNn1aNs" role="3cqZAp">
-              <node concept="2OqwBi" id="2E5lcNn1aVX" role="3clFbG">
-                <node concept="Cj7Ep" id="2E5lcNn1aNr" role="2Oq$k0" />
-                <node concept="3TrcHB" id="2E5lcNn1bgY" role="2OqNvi">
-                  <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="tYCnQ" id="2E5lcNn1buB" role="_1QTJ">
-          <ref role="uz4UX" to="wq2x:6p0DfM0a3gA" resolve="Head" />
-          <node concept="Cmt7Y" id="2E5lcNn1bHF" role="uz6Si">
-            <node concept="Cnhdc" id="2E5lcNn1bHG" role="Cncma">
-              <node concept="3clFbS" id="2E5lcNn1bHH" role="2VODD2">
-                <node concept="3clFbF" id="2E5lcNn1bRc" role="3cqZAp">
-                  <node concept="37vLTI" id="2E5lcNn1cut" role="3clFbG">
-                    <node concept="3clFbT" id="2E5lcNn1cxI" role="37vLTx">
-                      <property role="3clFbU" value="false" />
-                    </node>
-                    <node concept="2OqwBi" id="2E5lcNn1bUT" role="37vLTJ">
-                      <node concept="Cj7Ep" id="2E5lcNn1bRb" role="2Oq$k0" />
-                      <node concept="3TrcHB" id="2E5lcNn1c5z" role="2OqNvi">
-                        <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="2E5lcNn1cQO" role="3cqZAp">
-                  <node concept="Cj7Ep" id="2E5lcNn1cQM" role="3clFbG" />
-                </node>
-              </node>
-            </node>
-            <node concept="2h1dTh" id="2E5lcNn1bNd" role="Cn2iK">
-              <property role="2h1i$Z" value="and discard" />
-            </node>
-            <node concept="xBawi" id="4hPXq9Jmehy" role="lGtFl">
-              <ref role="xBaxx" to="vxmb:4hPXq9Jmehb" />
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9Jmeh2" role="lGtFl">
-          <ref role="xBaxx" to="vxmb:4hPXq9Jmeh3" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="37WguZ" id="2E5lcNn1UqB">
-    <property role="3GE5qa" value="rule.component" />
-    <property role="TrG5h" value="Head_createNew" />
-    <node concept="37WvkG" id="2E5lcNn1UqC" role="37WGs$">
-      <ref role="37XkoT" to="wq2x:6p0DfM0a3gA" resolve="Head" />
-      <node concept="37Y9Zx" id="2E5lcNn1Uu1" role="37ZfLb">
-        <node concept="3clFbS" id="2E5lcNn1Uu2" role="2VODD2">
-          <node concept="3clFbF" id="2E5lcNn1U$0" role="3cqZAp">
-            <node concept="37vLTI" id="2E5lcNn1Zvn" role="3clFbG">
-              <node concept="3clFbT" id="2E5lcNn1ZDh" role="37vLTx">
-                <property role="3clFbU" value="true" />
-              </node>
-              <node concept="2OqwBi" id="2E5lcNn1UAr" role="37vLTJ">
-                <node concept="1r4Lsj" id="2E5lcNn1UzZ" role="2Oq$k0" />
-                <node concept="3TrcHB" id="2E5lcNn1Z5M" role="2OqNvi">
-                  <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3FK_9_" id="1PFbZN6vSAM">
-    <property role="3GE5qa" value="constraint" />
-    <property role="TrG5h" value="ExpressionConstraint_subst_Expression" />
-    <node concept="1X3_iC" id="4hPXq9JmenC" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1112056943463/1112058057696" />
-      <node concept="3FOIzC" id="1PFbZN6vSAN" role="8Wnug">
-        <ref role="3FOWKa" to="wq2x:4EfgX2EvF4i" resolve="ExpressionConstraint" />
-        <node concept="z64au" id="7ksQUDZtc7u" role="tZc4B">
-          <ref role="z65TK" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
-          <node concept="xAzKH" id="4hPXq9JmemI" role="lGtFl">
-            <ref role="xAzKI" to="vxmb:4hPXq9Jmema" />
-          </node>
-        </node>
-        <node concept="tYCnQ" id="1PFbZN6vSB$" role="tZc4B">
-          <ref role="uz4UX" to="wq2x:4EfgX2EvF4i" resolve="ExpressionConstraint" />
-          <node concept="yEb5T" id="1PFbZN6vSBA" role="uz6Si">
-            <ref role="yEYPM" to="tpee:fz3vP1J" resolve="Expression" />
-            <node concept="yEnE0" id="1PFbZN6vSBB" role="yEVE$">
-              <node concept="3clFbS" id="1PFbZN6vSBC" role="2VODD2">
-                <node concept="3cpWs8" id="1PFbZN6vSRM" role="3cqZAp">
-                  <node concept="3cpWsn" id="1PFbZN6vSRN" role="3cpWs9">
-                    <property role="TrG5h" value="ec" />
-                    <node concept="3Tqbb2" id="1PFbZN6vSRK" role="1tU5fm">
-                      <ref role="ehGHo" to="wq2x:4EfgX2EvF4i" resolve="ExpressionConstraint" />
-                    </node>
-                    <node concept="2ShNRf" id="1PFbZN6vSRO" role="33vP2m">
-                      <node concept="3zrR0B" id="1PFbZN6vSRP" role="2ShVmc">
-                        <node concept="3Tqbb2" id="1PFbZN6vSRQ" role="3zrR0E">
-                          <ref role="ehGHo" to="wq2x:4EfgX2EvF4i" resolve="ExpressionConstraint" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="1PFbZN6vSDL" role="3cqZAp">
-                  <node concept="2OqwBi" id="1PFbZN6vTzc" role="3clFbG">
-                    <node concept="2OqwBi" id="1PFbZN6vT0I" role="2Oq$k0">
-                      <node concept="37vLTw" id="1PFbZN6vSRR" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1PFbZN6vSRN" resolve="ec" />
-                      </node>
-                      <node concept="3TrEf2" id="1PFbZN6vTgn" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:4EfgX2EvGcc" resolve="expression" />
-                      </node>
-                    </node>
-                    <node concept="2oxUTD" id="1PFbZN6vTER" role="2OqNvi">
-                      <node concept="yECNy" id="1PFbZN6vTHv" role="2oxUTC" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="1PFbZN6vTLr" role="3cqZAp">
-                  <node concept="37vLTw" id="1PFbZN6vTLp" role="3clFbG">
-                    <ref role="3cqZAo" node="1PFbZN6vSRN" resolve="ec" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="xBawi" id="4hPXq9JmenB" role="lGtFl">
-              <ref role="xBaxx" to="vxmb:4hPXq9JmemJ" />
-            </node>
-          </node>
-        </node>
-        <node concept="3buRE8" id="2N2MQGCLtzb" role="3bvWUf">
-          <node concept="3clFbS" id="2N2MQGCLtzc" role="2VODD2">
-            <node concept="3clFbF" id="2N2MQGCLtCb" role="3cqZAp">
-              <node concept="3fqX7Q" id="2N2MQGCLtC9" role="3clFbG">
-                <node concept="3p$olP" id="2N2MQGCLtEY" role="3fr31v" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9Jmem9" role="lGtFl">
-          <ref role="xBaxx" to="vxmb:4hPXq9Jmema" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3UOs0u" id="5zfvpQ72pHF">
-    <property role="3GE5qa" value="constraint.variable" />
-    <property role="TrG5h" value="LogicVariableDeclaration_specify_dataType" />
-    <node concept="1X3_iC" id="4hPXq9JmejB" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1138079416598/1138079416599" />
-      <node concept="3UNGvq" id="5zfvpQ72pHG" role="8Wnug">
-        <ref role="3UNGvu" to="wq2x:2E5lcNn8iYG" resolve="LogicVariableDeclarationStatement" />
-        <node concept="3kRJcU" id="5zfvpQ72pHL" role="3kShCk">
-          <node concept="3clFbS" id="5zfvpQ72pHM" role="2VODD2">
-            <node concept="3clFbF" id="5zfvpQ72pMH" role="3cqZAp">
-              <node concept="2OqwBi" id="5zfvpQ72qDc" role="3clFbG">
-                <node concept="2OqwBi" id="5zfvpQ72pSr" role="2Oq$k0">
-                  <node concept="Cj7Ep" id="5zfvpQ72pMG" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="5zfvpQ72qlf" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
-                  </node>
-                </node>
-                <node concept="3w_OXm" id="5zfvpQ72r1c" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="tYCnQ" id="5zfvpQ72rag" role="_1QTJ">
-          <ref role="uz4UX" to="tpee:fzcpWvK" resolve="LocalVariableDeclarationStatement" />
-          <node concept="Cmt7Y" id="5zfvpQ72rnv" role="uz6Si">
-            <node concept="Cnhdc" id="5zfvpQ72rnw" role="Cncma">
-              <node concept="3clFbS" id="5zfvpQ72rnx" role="2VODD2">
-                <node concept="3clFbF" id="5zfvpQ72row" role="3cqZAp">
-                  <node concept="2OqwBi" id="5zfvpQ72s31" role="3clFbG">
-                    <node concept="2OqwBi" id="5zfvpQ72rs0" role="2Oq$k0">
-                      <node concept="Cj7Ep" id="5zfvpQ72rov" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="5zfvpQ72rOy" role="2OqNvi">
-                        <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
-                      </node>
-                    </node>
-                    <node concept="2DeJnY" id="5zfvpQ72smI" role="2OqNvi" />
-                  </node>
-                </node>
-                <node concept="3clFbF" id="5zfvpQ72srj" role="3cqZAp">
-                  <node concept="Cj7Ep" id="5zfvpQ72srh" role="3clFbG" />
-                </node>
-              </node>
-            </node>
-            <node concept="2h1dTh" id="5zfvpQ72roa" role="Cn2iK">
-              <property role="2h1i$Z" value="&lt;" />
-            </node>
-            <node concept="xBawi" id="4hPXq9JmejA" role="lGtFl">
-              <ref role="xBaxx" to="vxmb:4hPXq9Jmeje" />
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9Jmej3" role="lGtFl">
-          <ref role="xBaxx" to="vxmb:4hPXq9Jmej4" />
-        </node>
-      </node>
-    </node>
-    <node concept="1X3_iC" id="4hPXq9Jmel1" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1138079416598/1138079416599" />
-      <node concept="3UNGvq" id="1iWwVK2CC2i" role="8Wnug">
-        <ref role="3UNGvu" to="wq2x:PB1R3Y7Ed7" resolve="RulePartParameterDeclaration" />
-        <node concept="3kRJcU" id="1iWwVK2CC31" role="3kShCk">
-          <node concept="3clFbS" id="1iWwVK2CC32" role="2VODD2">
-            <node concept="3clFbF" id="1iWwVK2CCab" role="3cqZAp">
-              <node concept="2OqwBi" id="1iWwVK2CD25" role="3clFbG">
-                <node concept="2OqwBi" id="1iWwVK2CCpo" role="2Oq$k0">
-                  <node concept="Cj7Ep" id="1iWwVK2CCaa" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="1iWwVK2CCIJ" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
-                  </node>
-                </node>
-                <node concept="3w_OXm" id="1iWwVK2CDuY" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="tYCnQ" id="1iWwVK2CDHD" role="_1QTJ">
-          <ref role="uz4UX" to="wq2x:PB1R3Y7Ed7" resolve="RulePartParameterDeclaration" />
-          <node concept="Cmt7Y" id="1iWwVK2CE3T" role="uz6Si">
-            <node concept="Cnhdc" id="1iWwVK2CE3U" role="Cncma">
-              <node concept="3clFbS" id="1iWwVK2CE3V" role="2VODD2">
-                <node concept="3clFbF" id="1iWwVK2CE9A" role="3cqZAp">
-                  <node concept="2OqwBi" id="1iWwVK2CEQy" role="3clFbG">
-                    <node concept="2OqwBi" id="1iWwVK2CEhH" role="2Oq$k0">
-                      <node concept="Cj7Ep" id="1iWwVK2CE9_" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="1iWwVK2CEzg" role="2OqNvi">
-                        <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
-                      </node>
-                    </node>
-                    <node concept="2DeJnY" id="1iWwVK2CFfE" role="2OqNvi" />
-                  </node>
-                </node>
-                <node concept="3clFbF" id="1iWwVK2CFrt" role="3cqZAp">
-                  <node concept="Cj7Ep" id="1iWwVK2CFrr" role="3clFbG" />
-                </node>
-              </node>
-            </node>
-            <node concept="2h1dTh" id="1iWwVK2CE7g" role="Cn2iK">
-              <property role="2h1i$Z" value="&lt;" />
-            </node>
-            <node concept="xBawi" id="4hPXq9Jmel0" role="lGtFl">
-              <ref role="xBaxx" to="vxmb:4hPXq9JmekD" />
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9Jmeku" role="lGtFl">
-          <ref role="xBaxx" to="vxmb:4hPXq9Jmekv" />
-        </node>
-      </node>
-    </node>
-    <node concept="1X3_iC" id="4hPXq9Jmekk" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1138079416598/1138079416599" />
-      <node concept="3UNGvq" id="1iWwVK2CFXE" role="8Wnug">
-        <ref role="3UNGvu" to="wq2x:7IysFe_ZPXH" resolve="TypeInitializerLogicalDeclaration" />
-        <node concept="3kRJcU" id="1iWwVK2CFZn" role="3kShCk">
-          <node concept="3clFbS" id="1iWwVK2CFZo" role="2VODD2">
-            <node concept="3clFbF" id="1iWwVK2CGkH" role="3cqZAp">
-              <node concept="2OqwBi" id="1iWwVK2CHJW" role="3clFbG">
-                <node concept="2OqwBi" id="1iWwVK2CGFF" role="2Oq$k0">
-                  <node concept="Cj7Ep" id="1iWwVK2CGkG" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="1iWwVK2CH12" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
-                  </node>
-                </node>
-                <node concept="3w_OXm" id="1iWwVK2CIcS" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="tYCnQ" id="1iWwVK2CIo8" role="_1QTJ">
-          <ref role="uz4UX" to="wq2x:7IysFe_ZPXH" resolve="TypeInitializerLogicalDeclaration" />
-          <node concept="Cmt7Y" id="1iWwVK2CIIo" role="uz6Si">
-            <node concept="Cnhdc" id="1iWwVK2CIIp" role="Cncma">
-              <node concept="3clFbS" id="1iWwVK2CIIq" role="2VODD2">
-                <node concept="3clFbF" id="1iWwVK2CILO" role="3cqZAp">
-                  <node concept="2OqwBi" id="1iWwVK2CJpw" role="3clFbG">
-                    <node concept="2OqwBi" id="1iWwVK2CIVC" role="2Oq$k0">
-                      <node concept="Cj7Ep" id="1iWwVK2CILN" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="1iWwVK2CJ6e" role="2OqNvi">
-                        <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
-                      </node>
-                    </node>
-                    <node concept="2DeJnY" id="1iWwVK2CJMC" role="2OqNvi" />
-                  </node>
-                </node>
-                <node concept="3clFbF" id="1iWwVK2CJYr" role="3cqZAp">
-                  <node concept="Cj7Ep" id="1iWwVK2CJYp" role="3clFbG" />
-                </node>
-              </node>
-            </node>
-            <node concept="2h1dTh" id="1iWwVK2CILJ" role="Cn2iK">
-              <property role="2h1i$Z" value="&lt;" />
-            </node>
-            <node concept="xBawi" id="4hPXq9Jmekj" role="lGtFl">
-              <ref role="xBaxx" to="vxmb:4hPXq9JmejW" />
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9JmejL" role="lGtFl">
-          <ref role="xBaxx" to="vxmb:4hPXq9JmejM" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3FK_9_" id="1hX44vMLjek">
-    <property role="3GE5qa" value="type.code" />
-    <property role="TrG5h" value="TypeNode_Expression" />
-    <node concept="1X3_iC" id="4hPXq9JmerO" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1112056943463/1112058057696" />
-      <node concept="3FOIzC" id="1hX44vMLjel" role="8Wnug">
-        <ref role="3FOWKa" to="tpee:fz3vP1J" resolve="Expression" />
-        <node concept="3buRE8" id="1hX44vMLjem" role="3bvWUf">
-          <node concept="3clFbS" id="1hX44vMLjen" role="2VODD2">
-            <node concept="3clFbF" id="1hX44vMLjlw" role="3cqZAp">
-              <node concept="2OqwBi" id="1hX44vMLkds" role="3clFbG">
-                <node concept="2OqwBi" id="1hX44vMLjzf" role="2Oq$k0">
-                  <node concept="3bvxqY" id="1hX44vMLjlv" role="2Oq$k0" />
-                  <node concept="2Xjw5R" id="1hX44vMLjNy" role="2OqNvi">
-                    <node concept="3gmYPX" id="7IysFeA8rA$" role="1xVPHs">
-                      <node concept="3gn64h" id="7IysFeA8rNw" role="3gmYPZ">
-                        <ref role="3gnhBz" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-                      </node>
-                      <node concept="3gn64h" id="7IysFeA8s9N" role="3gmYPZ">
-                        <ref role="3gnhBz" to="wq2x:7IysFeA0yb0" resolve="TypeDeclarationParameter" />
-                      </node>
-                    </node>
-                    <node concept="1xIGOp" id="7IysFeA8tDh" role="1xVPHs" />
-                  </node>
-                </node>
-                <node concept="1mIQ4w" id="7IysFeA8ueU" role="2OqNvi">
-                  <node concept="chp4Y" id="7IysFeA8urF" role="cj9EA">
-                    <ref role="cht4Q" to="wq2x:7IysFeA0yb0" resolve="TypeDeclarationParameter" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="tYCnQ" id="1hX44vMLmzJ" role="tZc4B">
-          <ref role="uz4UX" to="wq2x:1hX44vMEjQr" resolve="TypeNodeExpression" />
-          <node concept="ucClh" id="1hX44vMLmWI" role="uz6Si">
-            <node concept="ucgPf" id="1hX44vMLmWJ" role="ucMEw">
-              <node concept="3clFbS" id="1hX44vMLmWK" role="2VODD2">
-                <node concept="3cpWs8" id="1hX44vMLpir" role="3cqZAp">
-                  <node concept="3cpWsn" id="1hX44vMLpis" role="3cpWs9">
-                    <property role="TrG5h" value="node" />
-                    <node concept="3Tqbb2" id="1hX44vMLpiq" role="1tU5fm">
-                      <ref role="ehGHo" to="wq2x:1hX44vMEjQr" resolve="TypeNodeExpression" />
-                    </node>
-                    <node concept="2ShNRf" id="1hX44vMLpit" role="33vP2m">
-                      <node concept="3zrR0B" id="1hX44vMLpiu" role="2ShVmc">
-                        <node concept="3Tqbb2" id="1hX44vMLpiv" role="3zrR0E">
-                          <ref role="ehGHo" to="wq2x:1hX44vMEjQr" resolve="TypeNodeExpression" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="1hX44vMLpro" role="3cqZAp">
-                  <node concept="2OqwBi" id="1hX44vMLq6I" role="3clFbG">
-                    <node concept="2OqwBi" id="1hX44vMLp$k" role="2Oq$k0">
-                      <node concept="37vLTw" id="1hX44vMLprm" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1hX44vMLpis" resolve="node" />
-                      </node>
-                      <node concept="3TrEf2" id="1hX44vMLpLg" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:1hX44vMIQ6F" resolve="declaration" />
-                      </node>
-                    </node>
-                    <node concept="2oxUTD" id="1hX44vMLqx4" role="2OqNvi">
-                      <node concept="2OqwBi" id="1hX44vMLqSx" role="2oxUTC">
-                        <node concept="3bvxqY" id="1hX44vMLqBE" role="2Oq$k0" />
-                        <node concept="2Xjw5R" id="1hX44vMLr88" role="2OqNvi">
-                          <node concept="1xMEDy" id="1hX44vMLr8a" role="1xVPHs">
-                            <node concept="chp4Y" id="1hX44vMLreW" role="ri$Ld">
-                              <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="1hX44vMLoW5" role="3cqZAp">
-                  <node concept="37vLTw" id="1hX44vMLpiw" role="3clFbG">
-                    <ref role="3cqZAo" node="1hX44vMLpis" resolve="node" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="uGdhv" id="1hX44vMLnk5" role="uGu3D">
-              <node concept="3clFbS" id="1hX44vMLnk7" role="2VODD2">
-                <node concept="3clFbF" id="1hX44vMLnwy" role="3cqZAp">
-                  <node concept="2OqwBi" id="1hX44vMLo9l" role="3clFbG">
-                    <node concept="35c_gC" id="1hX44vMLnwx" role="2Oq$k0">
-                      <ref role="35c_gD" to="wq2x:1hX44vMEjQr" resolve="TypeNodeExpression" />
-                    </node>
-                    <node concept="3n3YKJ" id="1hX44vMLoMA" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="xBawi" id="4hPXq9JmerN" role="lGtFl">
-              <ref role="xBaxx" to="vxmb:4hPXq9Jmeqx" />
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9JmepR" role="lGtFl">
-          <ref role="xBaxx" to="vxmb:4hPXq9JmepS" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3FK_9_" id="7IysFeA99pw">
-    <property role="3GE5qa" value="type.code" />
-    <property role="TrG5h" value="TypeLogical_Expression" />
-    <node concept="1X3_iC" id="4hPXq9Jmesy" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1112056943463/1112058057696" />
-      <node concept="3FOIzC" id="7IysFeA99px" role="8Wnug">
-        <ref role="3FOWKa" to="tpee:fz3vP1J" resolve="Expression" />
-        <node concept="3buRE8" id="7IysFeA99pz" role="3bvWUf">
-          <node concept="3clFbS" id="7IysFeA99p$" role="2VODD2">
-            <node concept="3clFbF" id="7IysFeA99wH" role="3cqZAp">
-              <node concept="2OqwBi" id="7IysFeA9aJk" role="3clFbG">
-                <node concept="2OqwBi" id="7IysFeA99Is" role="2Oq$k0">
-                  <node concept="3bvxqY" id="7IysFeA99wG" role="2Oq$k0" />
-                  <node concept="2Xjw5R" id="7IysFeA99YJ" role="2OqNvi">
-                    <node concept="1xMEDy" id="7IysFeA99YL" role="1xVPHs">
-                      <node concept="chp4Y" id="7IysFeA9_6e" role="ri$Ld">
-                        <ref role="cht4Q" to="wq2x:7IysFe_ZPX_" resolve="TypeInitializer" />
-                      </node>
-                    </node>
-                    <node concept="1xIGOp" id="7IysFeA9atN" role="1xVPHs" />
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="7IysFeA9bdv" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="35xCft" id="7IysFeA9bnG" role="tZc4B">
-          <ref role="35y72J" to="wq2x:7IysFeA99oR" resolve="TypeLogicalExpression" />
-          <node concept="xBawi" id="4hPXq9Jmesx" role="lGtFl">
-            <ref role="xBaxx" to="vxmb:4hPXq9Jmesw" />
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9JmerS" role="lGtFl">
-          <ref role="xBaxx" to="vxmb:4hPXq9JmerT" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3FK_9_" id="3TnYLtqg$O4">
-    <property role="3GE5qa" value="type.code" />
-    <property role="TrG5h" value="ContextParameter_Expression" />
-    <node concept="1X3_iC" id="4hPXq9JmeAt" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1112056943463/1112058057696" />
-      <node concept="3FOIzC" id="3TnYLtqg$O5" role="8Wnug">
-        <ref role="3FOWKa" to="tpee:fz3vP1J" resolve="Expression" />
-        <node concept="3buRE8" id="3TnYLtqg$O7" role="3bvWUf">
-          <node concept="3clFbS" id="3TnYLtqg$O8" role="2VODD2">
-            <node concept="3clFbF" id="3TnYLtqg$Vh" role="3cqZAp">
-              <node concept="2OqwBi" id="3TnYLtqg_WB" role="3clFbG">
-                <node concept="2OqwBi" id="3TnYLtqg_90" role="2Oq$k0">
-                  <node concept="3bvxqY" id="3TnYLtqg$Vg" role="2Oq$k0" />
-                  <node concept="2Xjw5R" id="3TnYLtqg_pj" role="2OqNvi">
-                    <node concept="1xMEDy" id="3TnYLtqg_pl" role="1xVPHs">
-                      <node concept="chp4Y" id="3TnYLtqg_yl" role="ri$Ld">
-                        <ref role="cht4Q" to="wq2x:1pPth$m5B4X" resolve="TypeTable" />
-                      </node>
-                    </node>
-                    <node concept="1xIGOp" id="3TnYLtqg_G$" role="1xVPHs" />
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="3TnYLtqgAlJ" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="tYCnQ" id="3TnYLtqgAvD" role="tZc4B">
-          <ref role="uz4UX" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
-          <node concept="uMFAO" id="3TnYLtqgAvL" role="uz6Si">
-            <node concept="3Tqbb2" id="3TnYLtqgACF" role="uMOYW">
-              <ref role="ehGHo" to="wq2x:3TnYLtqfhzx" resolve="ContextParameterDeclaration" />
-            </node>
-            <node concept="uNCsQ" id="3TnYLtqgAvN" role="uO7ob">
-              <node concept="3clFbS" id="3TnYLtqgAvO" role="2VODD2">
-                <node concept="3clFbF" id="3TnYLtqgAU7" role="3cqZAp">
-                  <node concept="2OqwBi" id="3TnYLtqgAU8" role="3clFbG">
-                    <node concept="2OqwBi" id="3TnYLtqgAU9" role="2Oq$k0">
-                      <node concept="3bvxqY" id="3TnYLtqgAUa" role="2Oq$k0" />
-                      <node concept="2Xjw5R" id="3TnYLtqgAUb" role="2OqNvi">
-                        <node concept="1xMEDy" id="3TnYLtqgAUc" role="1xVPHs">
-                          <node concept="chp4Y" id="3TnYLtqgAUd" role="ri$Ld">
-                            <ref role="cht4Q" to="wq2x:1pPth$m5B4X" resolve="TypeTable" />
-                          </node>
-                        </node>
-                        <node concept="1xIGOp" id="3TnYLtqgAUe" role="1xVPHs" />
-                      </node>
-                    </node>
-                    <node concept="3Tsc0h" id="3TnYLtqgB_l" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:3TnYLtqfp9N" resolve="parameter" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="uSIkt" id="3TnYLtqgAvP" role="uTubQ">
-              <node concept="3clFbS" id="3TnYLtqgAvQ" role="2VODD2">
-                <node concept="3cpWs8" id="3TnYLtqgFLh" role="3cqZAp">
-                  <node concept="3cpWsn" id="3TnYLtqgFLi" role="3cpWs9">
-                    <property role="TrG5h" value="cpr" />
-                    <node concept="3Tqbb2" id="3TnYLtqgFLg" role="1tU5fm">
-                      <ref role="ehGHo" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
-                    </node>
-                    <node concept="2ShNRf" id="3TnYLtqgFLj" role="33vP2m">
-                      <node concept="3zrR0B" id="3TnYLtqgFLk" role="2ShVmc">
-                        <node concept="3Tqbb2" id="3TnYLtqgFLl" role="3zrR0E">
-                          <ref role="ehGHo" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="3TnYLtqgFiH" role="3cqZAp">
-                  <node concept="37vLTI" id="3TnYLtqgI_O" role="3clFbG">
-                    <node concept="uNquD" id="3TnYLtqgIKG" role="37vLTx" />
-                    <node concept="2OqwBi" id="3TnYLtqgG3e" role="37vLTJ">
-                      <node concept="37vLTw" id="3TnYLtqgFLm" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3TnYLtqgFLi" resolve="cpr" />
-                      </node>
-                      <node concept="3TrEf2" id="3TnYLtqgGo2" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:3TnYLtqfh$T" resolve="parameter" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="3TnYLtqgJ1X" role="3cqZAp">
-                  <node concept="37vLTw" id="3TnYLtqgJ1V" role="3clFbG">
-                    <ref role="3cqZAo" node="3TnYLtqgFLi" resolve="cpr" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="uSjag" id="3TnYLtqgEdP" role="uSyvl">
-              <node concept="3clFbS" id="3TnYLtqgEdQ" role="2VODD2">
-                <node concept="3clFbF" id="3TnYLtqgExq" role="3cqZAp">
-                  <node concept="2OqwBi" id="3TnYLtqgEOa" role="3clFbG">
-                    <node concept="uNquD" id="3TnYLtqgExp" role="2Oq$k0" />
-                    <node concept="3TrcHB" id="3TnYLtqgF7M" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="xBawi" id="4hPXq9JmeAs" role="lGtFl">
-              <ref role="xBaxx" to="vxmb:4hPXq9Jme$A" />
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9JmezY" role="lGtFl">
-          <ref role="xBaxx" to="vxmb:4hPXq9JmezZ" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3UOs0u" id="1L74NXFO1Dj">
-    <property role="3GE5qa" value="type.term" />
-    <property role="TrG5h" value="TypeTerm_addOverride" />
-    <node concept="1X3_iC" id="4hPXq9JmelJ" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1138079416598/1138079416599" />
-      <node concept="3UNGvq" id="1L74NXFO1Dk" role="8Wnug">
-        <property role="2uHTBK" value="ext_1_RTransform" />
-        <ref role="3UNGvu" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
-        <node concept="3kRJcU" id="1L74NXFO1Dl" role="3kShCk">
-          <node concept="3clFbS" id="1L74NXFO1Dm" role="2VODD2">
-            <node concept="3clFbF" id="1L74NXFO1Kv" role="3cqZAp">
-              <node concept="2OqwBi" id="1L74NXFO3X1" role="3clFbG">
-                <node concept="2OqwBi" id="1L74NXFO20k" role="2Oq$k0">
-                  <node concept="Cj7Ep" id="1L74NXFO1Ku" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="1L74NXFO2nJ" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
-                  </node>
-                </node>
-                <node concept="1v1jN8" id="1L74NXFO6fV" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="tYCnQ" id="1L74NXFOc9r" role="_1QTJ">
-          <ref role="uz4UX" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
-          <node concept="Cmt7Y" id="1L74NXFOctf" role="uz6Si">
-            <node concept="Cnhdc" id="1L74NXFOcth" role="Cncma">
-              <node concept="3clFbS" id="1L74NXFOctj" role="2VODD2">
-                <node concept="3clFbF" id="1L74NXFOcwR" role="3cqZAp">
-                  <node concept="2OqwBi" id="1L74NXFOews" role="3clFbG">
-                    <node concept="2OqwBi" id="1L74NXFOcFq" role="2Oq$k0">
-                      <node concept="Cj7Ep" id="1L74NXFOcwQ" role="2Oq$k0" />
-                      <node concept="3Tsc0h" id="1L74NXFOcYY" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:1L74NXFNj2L" resolve="override" />
-                      </node>
-                    </node>
-                    <node concept="2DeJg1" id="1L74NXFOgPd" role="2OqNvi" />
-                  </node>
-                </node>
-                <node concept="3clFbF" id="1L74NXFOh1C" role="3cqZAp">
-                  <node concept="Cj7Ep" id="1L74NXFOh1A" role="3clFbG" />
-                </node>
-              </node>
-            </node>
-            <node concept="2h1dTh" id="1L74NXFOcwD" role="Cn2iK">
-              <property role="2h1i$Z" value="[" />
-            </node>
-            <node concept="2h1dTh" id="1L74NXFOcwL" role="Cn6ar">
-              <property role="2h1i$Z" value="specify overrides" />
-            </node>
-            <node concept="xBawi" id="4hPXq9JmelI" role="lGtFl">
-              <ref role="xBaxx" to="vxmb:4hPXq9Jmeli" />
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9Jmel7" role="lGtFl">
-          <ref role="xBaxx" to="vxmb:4hPXq9Jmel8" />
-        </node>
-      </node>
-    </node>
-  </node>
-</model>
-
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
index 7e6a70cf..cff884a3 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
@@ -528,7 +528,7 @@
               </node>
               <node concept="hTh3S" id="2KSgAgV9UDR" role="1xVPHs">
                 <node concept="3gn64h" id="2KSgAgV9UDS" role="hTh3Z">
-                  <ref role="3gnhBz" to="5j4j:7E86$tKsl45" resolve="LogicalClause" />
+                  <ref role="3gnhBz" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
                 </node>
               </node>
             </node>
@@ -1557,31 +1557,6 @@
       <node concept="3clFbS" id="5UYwY$H7MGd" role="2VODD2" />
     </node>
   </node>
-  <node concept="13h7C7" id="2V8TwD0$YJV">
-    <property role="3GE5qa" value="type.code" />
-    <ref role="13h7C2" to="wq2x:2V8TwD0$Yds" resolve="RecoveryBlock" />
-    <node concept="13hLZK" id="2V8TwD0$YJW" role="13h7CW">
-      <node concept="3clFbS" id="2V8TwD0$YJX" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="2V8TwD0$YK6" 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="2V8TwD0$YK7" role="1B3o_S" />
-      <node concept="2AHcQZ" id="2V8TwD0$YKa" role="2AJF6D">
-        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
-      </node>
-      <node concept="3clFbS" id="2V8TwD0$YKd" role="3clF47">
-        <node concept="3clFbF" id="2V8TwD0$YKx" role="3cqZAp">
-          <node concept="2c44tf" id="2V8TwD0$YKv" role="3clFbG">
-            <node concept="3Tqbb2" id="2V8TwD0$YKY" role="2c44tc" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="2V8TwD0$YKe" role="3clF45" />
-    </node>
-  </node>
   <node concept="13h7C7" id="4MEOIDFxxVo">
     <property role="3GE5qa" value="type.term" />
     <ref role="13h7C2" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
@@ -1726,32 +1701,5 @@
       <node concept="3clFbS" id="4MEOIDG83WY" role="2VODD2" />
     </node>
   </node>
-  <node concept="13h7C7" id="1L74NXEmFeh">
-    <property role="3GE5qa" value="constraint.typespecific" />
-    <ref role="13h7C2" to="wq2x:7eGEHDlgPU1" resolve="NewTypeConstraint" />
-    <node concept="13hLZK" id="1L74NXEmFei" role="13h7CW">
-      <node concept="3clFbS" id="1L74NXEmFej" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="1L74NXEmFes" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="getTypeDeclaration" />
-      <ref role="13i0hy" node="1L74NXEmFa8" resolve="getTypeDeclaration" />
-      <node concept="3Tm1VV" id="1L74NXEmFet" role="1B3o_S" />
-      <node concept="3clFbS" id="1L74NXEmFew" role="3clF47">
-        <node concept="3clFbF" id="1L74NXEmFeR" role="3cqZAp">
-          <node concept="2OqwBi" id="1L74NXEmFnN" role="3clFbG">
-            <node concept="13iPFW" id="1L74NXEmFeQ" role="2Oq$k0" />
-            <node concept="3TrEf2" id="1L74NXEmFFe" role="2OqNvi">
-              <ref role="3Tt5mk" to="wq2x:YGS68N6UU4" resolve="typeDeclaration" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="1L74NXEmFex" role="3clF45">
-        <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-      </node>
-    </node>
-  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
index 7dbfd49f..272b9691 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
@@ -20,7 +20,6 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.typesystem2.behavior)" implicit="true" />
-    <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts">
@@ -94,9 +93,6 @@
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -112,8 +108,6 @@
       </concept>
     </language>
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints">
-      <concept id="1202989531578" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAChild" flags="in" index="nKS2y" />
-      <concept id="1202989658459" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_parentNode" flags="nn" index="nLn13" />
       <concept id="8966504967485224688" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_contextNode" flags="nn" index="2rP1CM" />
       <concept id="1147467115080" name="jetbrains.mps.lang.constraints.structure.NodePropertyConstraint" flags="ng" index="EnEH3">
         <reference id="1147467295099" name="applicableProperty" index="EomxK" />
@@ -132,24 +126,12 @@
         <child id="1213098023997" name="property" index="1MhHOB" />
         <child id="1213100494875" name="referent" index="1Mr941" />
         <child id="1213101058038" name="defaultScope" index="1MtirG" />
-        <child id="1213106463729" name="canBeChild" index="1MLUbF" />
       </concept>
       <concept id="1148687176410" name="jetbrains.mps.lang.constraints.structure.NodeReferentConstraint" flags="ng" index="1N5Pfh">
         <reference id="1148687202698" name="applicableLink" index="1N5Vy1" />
         <child id="1148687345559" name="searchScopeFactory" index="1N6uqs" />
       </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="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
-      <concept id="1176543928247" name="jetbrains.mps.lang.typesystem.structure.IsSubtypeExpression" flags="nn" index="3JuTUA">
-        <child id="1176543945045" name="subtypeExpression" index="3JuY14" />
-        <child id="1176543950311" name="supertypeExpression" index="3JuZjQ" />
-      </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" />
@@ -658,76 +640,6 @@
       </node>
     </node>
   </node>
-  <node concept="1M2fIO" id="7IysFeA4rFo">
-    <property role="3GE5qa" value="constraint.typespecific" />
-    <ref role="1M2myG" to="wq2x:7IysFeA4qCy" resolve="NewTypeParameterBinding" />
-    <node concept="1N5Pfh" id="7IysFeA4rFr" role="1Mr941">
-      <ref role="1N5Vy1" to="wq2x:7IysFeA4qCz" resolve="parameter" />
-      <node concept="13QW63" id="7IysFeA4rFw" role="1N6uqs">
-        <node concept="3clFbS" id="7IysFeA4rFz" role="2VODD2">
-          <node concept="3clFbF" id="7IysFeA4rIv" role="3cqZAp">
-            <node concept="2ShNRf" id="7IysFeA4rIt" role="3clFbG">
-              <node concept="YeOm9" id="7IysFeA4rWK" role="2ShVmc">
-                <node concept="1Y3b0j" id="7IysFeA4rWN" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
-                  <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                  <node concept="3Tm1VV" id="7IysFeA4rWO" role="1B3o_S" />
-                  <node concept="3clFb_" id="7IysFeA4rX3" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="getName" />
-                    <node concept="17QB3L" id="7IysFeA4rX4" role="3clF45" />
-                    <node concept="3Tm1VV" id="7IysFeA4rX5" role="1B3o_S" />
-                    <node concept="37vLTG" id="7IysFeA4rX7" role="3clF46">
-                      <property role="TrG5h" value="child" />
-                      <node concept="3Tqbb2" id="7IysFeA4rX8" role="1tU5fm" />
-                    </node>
-                    <node concept="3clFbS" id="7IysFeA4rX9" role="3clF47">
-                      <node concept="3clFbF" id="7IysFeA4uMo" role="3cqZAp">
-                        <node concept="2OqwBi" id="7IysFeA4vGE" role="3clFbG">
-                          <node concept="1PxgMI" id="7IysFeA4vx9" role="2Oq$k0">
-                            <property role="1BlNFB" value="true" />
-                            <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                            <node concept="37vLTw" id="7IysFeA4uMn" role="1m5AlR">
-                              <ref role="3cqZAo" node="7IysFeA4rX7" resolve="child" />
-                            </node>
-                          </node>
-                          <node concept="3TrcHB" id="7IysFeA4vMI" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="7IysFeA4u4c" role="37wK5m">
-                    <node concept="2OqwBi" id="7IysFeA4tnU" role="2Oq$k0">
-                      <node concept="2OqwBi" id="7IysFeA4soG" role="2Oq$k0">
-                        <node concept="2rP1CM" id="7IysFeA4s8I" role="2Oq$k0" />
-                        <node concept="2Xjw5R" id="7IysFeA4sDF" role="2OqNvi">
-                          <node concept="1xMEDy" id="7IysFeA4sDH" role="1xVPHs">
-                            <node concept="chp4Y" id="7IysFeA4sNf" role="ri$Ld">
-                              <ref role="cht4Q" to="wq2x:7eGEHDlgPU1" resolve="NewTypeConstraint" />
-                            </node>
-                          </node>
-                          <node concept="1xIGOp" id="7IysFeA4t7s" role="1xVPHs" />
-                        </node>
-                      </node>
-                      <node concept="3TrEf2" id="7IysFeA4tDw" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:YGS68N6UU4" resolve="typeDeclaration" />
-                      </node>
-                    </node>
-                    <node concept="3Tsc0h" id="7IysFeA4uze" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:7IysFeA0yca" resolve="parameter" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="1M2fIO" id="3TnYLtqfhA9">
     <property role="3GE5qa" value="type.code.with" />
     <ref role="1M2myG" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
@@ -977,107 +889,6 @@
       </node>
     </node>
   </node>
-  <node concept="1M2fIO" id="2V8TwD0E9XC">
-    <property role="3GE5qa" value="type.term" />
-    <ref role="1M2myG" to="wq2x:2V8TwD0E9Wq" resolve="TypeFeatureExpression" />
-    <node concept="1N5Pfh" id="2V8TwD0E9XD" role="1Mr941">
-      <ref role="1N5Vy1" to="wq2x:2V8TwD0E9Wr" resolve="feature" />
-      <node concept="13QW63" id="2V8TwD0E9XF" role="1N6uqs">
-        <node concept="3clFbS" id="2V8TwD0E9XG" role="2VODD2">
-          <node concept="3clFbF" id="2V8TwD0Ect5" role="3cqZAp">
-            <node concept="2ShNRf" id="2V8TwD0Ect1" role="3clFbG">
-              <node concept="YeOm9" id="2V8TwD0EcJW" role="2ShVmc">
-                <node concept="1Y3b0j" id="2V8TwD0EcJZ" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
-                  <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                  <node concept="2OqwBi" id="4MEOIDFR9my" role="37wK5m">
-                    <node concept="2OqwBi" id="2V8TwD0EcWX" role="2Oq$k0">
-                      <node concept="2OqwBi" id="2V8TwD0EcWY" role="2Oq$k0">
-                        <node concept="2OqwBi" id="2V8TwD0EcWZ" role="2Oq$k0">
-                          <node concept="2rP1CM" id="2V8TwD0EcX0" role="2Oq$k0" />
-                          <node concept="2Xjw5R" id="2V8TwD0EcX1" role="2OqNvi">
-                            <node concept="1xMEDy" id="2V8TwD0EcX2" role="1xVPHs">
-                              <node concept="chp4Y" id="2V8TwD0EcX3" role="ri$Ld">
-                                <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3TrEf2" id="4MEOIDFR86r" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
-                        </node>
-                      </node>
-                      <node concept="3TrEf2" id="4MEOIDFR8Uw" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
-                      </node>
-                    </node>
-                    <node concept="3Tsc0h" id="4MEOIDFR9Mh" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:1pPth$m5oa9" resolve="feature" />
-                    </node>
-                  </node>
-                  <node concept="3Tm1VV" id="2V8TwD0EcK0" role="1B3o_S" />
-                  <node concept="3clFb_" id="2V8TwD0EcKf" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="getName" />
-                    <node concept="17QB3L" id="2V8TwD0EcKg" role="3clF45" />
-                    <node concept="3Tm1VV" id="2V8TwD0EcKh" role="1B3o_S" />
-                    <node concept="37vLTG" id="2V8TwD0EcKj" role="3clF46">
-                      <property role="TrG5h" value="child" />
-                      <node concept="3Tqbb2" id="2V8TwD0EcKk" role="1tU5fm" />
-                    </node>
-                    <node concept="3clFbS" id="2V8TwD0EcKl" role="3clF47">
-                      <node concept="3clFbF" id="2V8TwD0EdeI" role="3cqZAp">
-                        <node concept="2OqwBi" id="2V8TwD0EdIJ" role="3clFbG">
-                          <node concept="1PxgMI" id="2V8TwD0Edzp" role="2Oq$k0">
-                            <property role="1BlNFB" value="true" />
-                            <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                            <node concept="37vLTw" id="2V8TwD0EdeH" role="1m5AlR">
-                              <ref role="3cqZAo" node="2V8TwD0EcKj" resolve="child" />
-                            </node>
-                          </node>
-                          <node concept="3TrcHB" id="2V8TwD0EdQJ" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="1M2fIO" id="4cKdPpqF4Rp">
-    <property role="3GE5qa" value="type.term" />
-    <ref role="1M2myG" to="wq2x:2V8TwD148$8" resolve="RecoverOperation" />
-    <node concept="nKS2y" id="4cKdPpqF4Yz" role="1MLUbF">
-      <node concept="3clFbS" id="4cKdPpqF4Y$" role="2VODD2">
-        <node concept="3clFbF" id="4cKdPpqF8Vb" role="3cqZAp">
-          <node concept="3JuTUA" id="4cKdPpqF8V5" role="3clFbG">
-            <node concept="2c44tf" id="4cKdPpqF9sh" role="3JuZjQ">
-              <node concept="3uibUv" id="4cKdPpqF9QL" role="2c44tc">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="4cKdPpqF98e" role="3JuY14">
-              <node concept="1PxgMI" id="4cKdPpqF98f" role="2Oq$k0">
-                <property role="1BlNFB" value="true" />
-                <ref role="1m5ApE" to="tpee:hqOqwz4" resolve="DotExpression" />
-                <node concept="nLn13" id="4cKdPpqF98g" role="1m5AlR" />
-              </node>
-              <node concept="2qgKlT" id="4cKdPpqF98h" role="2OqNvi">
-                <ref role="37wK5l" to="tpek:7GulAc9z0dN" resolve="getOperandType" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="1M2fIO" id="2vGNdoJFT55">
     <property role="3GE5qa" value="constraint.template" />
     <ref role="1M2myG" to="wq2x:6p0DfM0asBO" resolve="ConstraintDeclaration" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index 8959ef04..f66161cf 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -17,7 +17,6 @@
     <import index="ykok" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.constraints(MPS.Core/)" />
     <import index="35tq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.scope(MPS.Core/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-    <import index="tpch" ref="r:00000000-0000-4000-0000-011c8959028d(jetbrains.mps.lang.structure.editor)" implicit="true" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" implicit="true" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
     <import index="wr1s" ref="r:0f9ddbb6-f761-4bd7-8dde-1e5300bd28c2(jetbrains.mps.lang.project.editor)" implicit="true" />
@@ -44,6 +43,9 @@
         <child id="928328222691832421" name="separatorTextQuery" index="2gpyvW" />
         <child id="1233141163694" name="separatorStyle" index="sWeuL" />
       </concept>
+      <concept id="1196434649611" name="jetbrains.mps.lang.editor.structure.SubstituteMenu_SimpleString" flags="ng" index="2h3Zct">
+        <property id="1196434851095" name="text" index="2h4Kg1" />
+      </concept>
       <concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
       <concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
       <concept id="3459162043708467089" name="jetbrains.mps.lang.editor.structure.CellActionMap_CanExecuteFunction" flags="in" index="jK8Ss" />
@@ -77,7 +79,6 @@
       <concept id="562388756457499018" name="jetbrains.mps.lang.editor.structure.MigratedToAnnotation" flags="ng" index="xBawi">
         <reference id="562388756457499129" name="migratedTo" index="xBaxx" />
       </concept>
-      <concept id="562388756460228274" name="jetbrains.mps.lang.editor.structure.MigrateManuallyAnnotation" flags="ng" index="xG$WE" />
       <concept id="562388756446465666" name="jetbrains.mps.lang.editor.structure.MigratedSideTransformMenuAttribute" flags="ng" index="yp4Wq">
         <property id="562388756446465811" name="transformTag" index="yp4Ub" />
       </concept>
@@ -156,6 +157,9 @@
       <concept id="8998492695583125082" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_MatchingText" flags="ng" index="16NfWO">
         <child id="8998492695583129244" name="query" index="16NeZM" />
       </concept>
+      <concept id="8998492695583129971" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_DescriptionText" flags="ng" index="16NL0t">
+        <child id="8998492695583129972" name="query" index="16NL0q" />
+      </concept>
       <concept id="1154465273778" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_SubstituteMenu_ParentNode" flags="nn" index="3bvxqY" />
       <concept id="1838685759388685703" name="jetbrains.mps.lang.editor.structure.TransformationFeature_DescriptionText" flags="ng" index="3cqGtN">
         <child id="1838685759388685704" name="query" index="3cqGtW" />
@@ -164,6 +168,7 @@
       <concept id="2896773699153795590" name="jetbrains.mps.lang.editor.structure.TransformationLocation_SideTransform" flags="ng" index="3cWJ9i">
         <child id="3473224453637651919" name="placeInCell" index="CtIbM" />
       </concept>
+      <concept id="7342352913006985500" name="jetbrains.mps.lang.editor.structure.TransformationLocation_Completion" flags="ng" index="3eGOoe" />
       <concept id="7342352913006985483" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Action" flags="ng" index="3eGOop">
         <child id="8612453216082699922" name="substituteHandler" index="3aKz83" />
       </concept>
@@ -258,7 +263,10 @@
       <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
-      <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
+      <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
+        <property id="16410578721444372" name="customizeEmptyCell" index="2ru_X1" />
+        <child id="16410578721629643" name="emptyCellModel" index="2ruayu" />
+      </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
       <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
@@ -601,7 +609,7 @@
         <ref role="1k5W1q" to="tpen:hshUnm6" resolve="StaticMethod" />
       </node>
       <node concept="3F1sOY" id="5NuEpF1ikEB" role="3EZMnx">
-        <property role="1$x2rV" value="with no input" />
+        <property role="1$x2rV" value="standalone" />
         <ref role="1NtTu8" to="wq2x:6wQEDbCCPyR" resolve="input" />
       </node>
       <node concept="3EZMnI" id="12yN8DyAo8k" role="3EZMnx">
@@ -716,38 +724,145 @@
               <property role="VOm3f" value="false" />
             </node>
             <node concept="l2Vlx" id="6ntBQ9KBkgC" role="2iSdaV" />
-            <node concept="3F1sOY" id="4laj_h9Ob6i" role="3EZMnx">
-              <property role="1$x2rV" value="applicable always" />
-              <ref role="1NtTu8" to="wq2x:3KXGt7WSNcl" resolve="condition" />
+            <node concept="3EZMnI" id="4nIWweBXSPg" role="3EZMnx">
+              <node concept="VPM3Z" id="4nIWweBXSPi" role="3F10Kt">
+                <property role="VOm3f" value="false" />
+              </node>
               <node concept="ljvvj" id="4laj_h9Oyj_" role="3F10Kt">
                 <property role="VOm3f" value="true" />
+                <node concept="3nzxsE" id="4nIWweBWLDt" role="3n$kyP">
+                  <node concept="3clFbS" id="4nIWweBWLDu" role="2VODD2">
+                    <node concept="3clFbF" id="4nIWweBWLR1" role="3cqZAp">
+                      <node concept="2OqwBi" id="4nIWweBWNq_" role="3clFbG">
+                        <node concept="2OqwBi" id="4nIWweBWM7S" role="2Oq$k0">
+                          <node concept="pncrf" id="4nIWweBWLR0" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="4nIWweBWMNt" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:5MHpiylGjt8" resolve="iterateParameterBlock" />
+                          </node>
+                        </node>
+                        <node concept="3x8VRR" id="4nIWweBWO9k" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="l2Vlx" id="4nIWweBXSPl" role="2iSdaV" />
+              <node concept="3F1sOY" id="4laj_h9Ob6i" role="3EZMnx">
+                <property role="1$x2rV" value="apply always" />
+                <ref role="1NtTu8" to="wq2x:3KXGt7WSNcl" resolve="condition" />
+              </node>
+              <node concept="3F0ifn" id="4nIWweBXTUV" role="3EZMnx">
+                <property role="3F0ifm" value="," />
+                <ref role="1k5W1q" to="tpen:hFDgi_W" resolve="Semicolon" />
               </node>
             </node>
-            <node concept="3F1sOY" id="5MHpiylGwfp" role="3EZMnx">
-              <property role="1$x2rV" value="apply once" />
-              <ref role="1NtTu8" to="wq2x:5MHpiylGjt8" resolve="iterateParameterBlock" />
+            <node concept="3EZMnI" id="4nIWweBXUjQ" role="3EZMnx">
+              <node concept="l2Vlx" id="4nIWweBXUjR" role="2iSdaV" />
+              <node concept="3F1sOY" id="5MHpiylGwfp" role="3EZMnx">
+                <property role="1$x2rV" value="only once" />
+                <ref role="1NtTu8" to="wq2x:5MHpiylGjt8" resolve="iterateParameterBlock" />
+              </node>
+              <node concept="3F0ifn" id="4nIWweBXVWb" role="3EZMnx">
+                <property role="3F0ifm" value="," />
+                <ref role="1k5W1q" to="tpen:hFDgi_W" resolve="Semicolon" />
+              </node>
+              <node concept="VPM3Z" id="4nIWweBXU_J" role="3F10Kt">
+                <property role="VOm3f" value="false" />
+              </node>
               <node concept="ljvvj" id="5MHpiylIEQI" role="3F10Kt">
                 <property role="VOm3f" value="true" />
+                <node concept="3nzxsE" id="4nIWweBXl7C" role="3n$kyP">
+                  <node concept="3clFbS" id="4nIWweBXl7D" role="2VODD2">
+                    <node concept="3clFbF" id="4nIWweBXleR" role="3cqZAp">
+                      <node concept="2OqwBi" id="4nIWweBXmLP" role="3clFbG">
+                        <node concept="2OqwBi" id="4nIWweBXlvI" role="2Oq$k0">
+                          <node concept="pncrf" id="4nIWweBXleQ" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="4nIWweBXmbH" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:1ffsG7bh6Cz" resolve="requiredNodeBlock" />
+                          </node>
+                        </node>
+                        <node concept="3x8VRR" id="4nIWweBXnsG" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
-            <node concept="3F1sOY" id="tIwzd1EXki" role="3EZMnx">
-              <property role="1$x2rV" value="no required nodes" />
-              <ref role="1NtTu8" to="wq2x:1ffsG7bh6Cz" resolve="requiredNodeBlock" />
+            <node concept="3EZMnI" id="4nIWweBXWkJ" role="3EZMnx">
+              <node concept="VPM3Z" id="4nIWweBXWAy" role="3F10Kt">
+                <property role="VOm3f" value="false" />
+              </node>
               <node concept="ljvvj" id="tIwzd1EXkv" role="3F10Kt">
                 <property role="VOm3f" value="true" />
+                <node concept="3nzxsE" id="4nIWweBYdno" role="3n$kyP">
+                  <node concept="3clFbS" id="4nIWweBYdnp" role="2VODD2">
+                    <node concept="3clFbF" id="4nIWweBYduB" role="3cqZAp">
+                      <node concept="2OqwBi" id="4nIWweBYeSa" role="3clFbG">
+                        <node concept="2OqwBi" id="4nIWweBYdJu" role="2Oq$k0">
+                          <node concept="pncrf" id="4nIWweBYduA" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="4nIWweC1qNp" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" resolve="letBlock" />
+                          </node>
+                        </node>
+                        <node concept="3x8VRR" id="4nIWweBYfjD" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="l2Vlx" id="4nIWweBXWkK" role="2iSdaV" />
+              <node concept="3F1sOY" id="tIwzd1EXki" role="3EZMnx">
+                <property role="1$x2rV" value="no additional templates" />
+                <ref role="1NtTu8" to="wq2x:1ffsG7bh6Cz" resolve="requiredNodeBlock" />
+              </node>
+              <node concept="3F0ifn" id="4nIWweBXWAH" role="3EZMnx">
+                <property role="3F0ifm" value="," />
+                <ref role="1k5W1q" to="tpen:hFDgi_W" resolve="Semicolon" />
               </node>
             </node>
-            <node concept="3F1sOY" id="5Ii$nZP0k3L" role="3EZMnx">
-              <ref role="1NtTu8" to="wq2x:6wQEDbCLoaZ" resolve="includeClause" />
-              <node concept="ljvvj" id="5Ii$nZP0k4q" role="3F10Kt">
-                <property role="VOm3f" value="true" />
+            <node concept="3EZMnI" id="4nIWweBZDRW" role="3EZMnx">
+              <node concept="l2Vlx" id="4nIWweBZDRX" role="2iSdaV" />
+              <node concept="3F1sOY" id="1zN1RIkQKV0" role="3EZMnx">
+                <property role="1$x2rV" value="no values" />
+                <ref role="1NtTu8" to="wq2x:6wQEDbCHGnY" resolve="letBlock" />
+              </node>
+              <node concept="VPM3Z" id="4nIWweBZEcc" role="3F10Kt">
+                <property role="VOm3f" value="false" />
               </node>
-            </node>
-            <node concept="3F1sOY" id="1zN1RIkQKV0" role="3EZMnx">
-              <property role="1$x2rV" value="with no bindings" />
-              <ref role="1NtTu8" to="wq2x:6wQEDbCHGnY" resolve="letBlock" />
               <node concept="ljvvj" id="1zN1RIkQKV1" role="3F10Kt">
                 <property role="VOm3f" value="true" />
+                <node concept="3nzxsE" id="4nIWweC157m" role="3n$kyP">
+                  <node concept="3clFbS" id="4nIWweC157n" role="2VODD2">
+                    <node concept="3clFbF" id="4nIWweC15e_" role="3cqZAp">
+                      <node concept="2OqwBi" id="4nIWweC16C8" role="3clFbG">
+                        <node concept="2OqwBi" id="4nIWweC15vs" role="2Oq$k0">
+                          <node concept="pncrf" id="4nIWweC15e$" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="4nIWweC1668" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:6wQEDbCLoaZ" resolve="includeClause" />
+                          </node>
+                        </node>
+                        <node concept="3x8VRR" id="4nIWweC17ad" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3F0ifn" id="4nIWweBZZ21" role="3EZMnx">
+                <property role="3F0ifm" value="," />
+                <ref role="1k5W1q" to="tpen:hFDgi_W" resolve="Semicolon" />
+              </node>
+            </node>
+            <node concept="3EZMnI" id="4nIWweBYd5u" role="3EZMnx">
+              <node concept="l2Vlx" id="4nIWweBYd5v" role="2iSdaV" />
+              <node concept="3F1sOY" id="5Ii$nZP0k3L" role="3EZMnx">
+                <property role="1$x2rV" value="no fragments" />
+                <ref role="1NtTu8" to="wq2x:6wQEDbCLoaZ" resolve="includeClause" />
+              </node>
+              <node concept="VPM3Z" id="4nIWweBYdne" role="3F10Kt">
+                <property role="VOm3f" value="false" />
+              </node>
+              <node concept="ljvvj" id="5Ii$nZP0k4q" role="3F10Kt">
+                <property role="VOm3f" value="true" />
               </node>
             </node>
           </node>
@@ -761,80 +876,8 @@
             <property role="VOm3f" value="true" />
           </node>
         </node>
-        <node concept="3EZMnI" id="6p0DfM0cD7x" role="3EZMnx">
-          <node concept="VPM3Z" id="6p0DfM0cD7z" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-          <node concept="3F2HdR" id="6p0DfM0cDlu" role="3EZMnx">
-            <property role="2czwfO" value=" " />
-            <ref role="1NtTu8" to="wq2x:1ffsG7bCfL5" resolve="head" />
-            <node concept="l2Vlx" id="6p0DfM0cDlw" role="2czzBx" />
-            <node concept="tppnM" id="6p0DfM0cDtL" role="sWeuL">
-              <node concept="ljvvj" id="6p0DfM0cDwl" role="3F10Kt">
-                <property role="VOm3f" value="true" />
-              </node>
-            </node>
-            <node concept="lj46D" id="4laj_h9P6VX" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="ljvvj" id="6p0DfM0cHqp" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="3F0ifn" id="6p0DfM0dQCN" role="2czzBI">
-              <property role="3F0ifm" value="no head" />
-              <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
-              <node concept="Vb9p2" id="4laj_h9HAqe" role="3F10Kt">
-                <property role="Vbekb" value="BOLD" />
-              </node>
-            </node>
-          </node>
-          <node concept="3F2HdR" id="6p0DfM0cFgR" role="3EZMnx">
-            <property role="2czwfO" value=" " />
-            <ref role="1NtTu8" to="wq2x:1ffsG7bFM2v" resolve="guard" />
-            <node concept="l2Vlx" id="6p0DfM0cFgS" role="2czzBx" />
-            <node concept="tppnM" id="6p0DfM0cFgT" role="sWeuL">
-              <node concept="ljvvj" id="6p0DfM0cFgU" role="3F10Kt">
-                <property role="VOm3f" value="true" />
-              </node>
-            </node>
-            <node concept="lj46D" id="4laj_h9P70e" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="ljvvj" id="6p0DfM0cJvt" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="3F0ifn" id="6p0DfM0cOkh" role="2czzBI">
-              <property role="3F0ifm" value="unconditionally" />
-              <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
-              <node concept="Vb9p2" id="4laj_h9HAEL" role="3F10Kt">
-                <property role="Vbekb" value="BOLD" />
-              </node>
-            </node>
-          </node>
-          <node concept="3F2HdR" id="6p0DfM0cJyJ" role="3EZMnx">
-            <property role="2czwfO" value=" " />
-            <ref role="1NtTu8" to="wq2x:1ffsG7bIxDv" resolve="body" />
-            <node concept="l2Vlx" id="6p0DfM0cJyK" role="2czzBx" />
-            <node concept="tppnM" id="6p0DfM0cJyL" role="sWeuL">
-              <node concept="ljvvj" id="6p0DfM0cJyM" role="3F10Kt">
-                <property role="VOm3f" value="true" />
-              </node>
-            </node>
-            <node concept="lj46D" id="4laj_h9P73D" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="ljvvj" id="6p0DfM0cJyN" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="3F0ifn" id="6p0DfM0e2e1" role="2czzBI">
-              <property role="3F0ifm" value="no body" />
-              <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
-              <node concept="Vb9p2" id="4laj_h9HAWS" role="3F10Kt">
-                <property role="Vbekb" value="BOLD" />
-              </node>
-            </node>
-          </node>
-          <node concept="l2Vlx" id="6p0DfM0cD7A" role="2iSdaV" />
+        <node concept="PMmxH" id="4nIWweBWodT" role="3EZMnx">
+          <ref role="PMmxG" node="4nIWweBWmzT" resolve="AbstractRule_contents" />
         </node>
         <node concept="3F0ifn" id="7yvZ58ORv4v" role="AHCbl">
           <property role="3F0ifm" value="..." />
@@ -848,59 +891,65 @@
     <property role="3GE5qa" value="rule.component" />
     <ref role="1XX52x" to="wq2x:6p0DfM0a3TO" resolve="Body" />
     <node concept="3EZMnI" id="6p0DfM0cTe0" role="2wV5jI">
-      <node concept="3EZMnI" id="75vUFrSLnH1" role="3EZMnx">
-        <node concept="ljvvj" id="1iWwVK2D3UX" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="VPM3Z" id="75vUFrSLnH2" role="3F10Kt">
+      <node concept="3EZMnI" id="4nIWweBIFec" role="3EZMnx">
+        <node concept="VPM3Z" id="4nIWweBIFed" role="3F10Kt">
           <property role="VOm3f" value="false" />
         </node>
-        <node concept="3F0ifn" id="75vUFrSLnH3" role="3EZMnx">
-          <property role="3F0ifm" value="&lt;%" />
-          <ref role="1k5W1q" node="7LZcKzBE07j" resolve="EmitConstraint" />
-        </node>
-        <node concept="3F2HdR" id="75vUFrSLnH4" role="3EZMnx">
-          <property role="2czwfO" value="," />
-          <ref role="1NtTu8" to="wq2x:PB1R3Y7EcX" resolve="parameter" />
-          <node concept="l2Vlx" id="75vUFrSLnH5" role="2czzBx" />
-          <node concept="3F0ifn" id="75vUFrSLnH6" role="2czzBI">
-            <property role="ilYzB" value="&lt;no logical&gt;" />
-          </node>
-        </node>
-        <node concept="3F0ifn" id="75vUFrSLnH9" role="3EZMnx">
-          <property role="3F0ifm" value="%&gt;" />
-          <ref role="1k5W1q" node="7LZcKzBE07j" resolve="EmitConstraint" />
-        </node>
-        <node concept="l2Vlx" id="75vUFrSLnHa" role="2iSdaV" />
-      </node>
-      <node concept="1QoScp" id="2_NfR5wjBnC" role="3EZMnx">
-        <property role="1QpmdY" value="true" />
-        <node concept="pkWqt" id="2_NfR5wjBnF" role="3e4ffs">
-          <node concept="3clFbS" id="2_NfR5wjBnH" role="2VODD2">
-            <node concept="3clFbF" id="2_NfR5wjBv2" role="3cqZAp">
-              <node concept="3clFbC" id="2_NfR5wjC5c" role="3clFbG">
-                <node concept="3cmrfG" id="2_NfR5wjC7t" role="3uHU7w">
-                  <property role="3cmrfH" value="0" />
-                </node>
-                <node concept="2OqwBi" id="2_NfR5wjBy5" role="3uHU7B">
-                  <node concept="pncrf" id="2_NfR5wjBv1" role="2Oq$k0" />
-                  <node concept="2bSWHS" id="2_NfR5wjBGv" role="2OqNvi" />
+        <node concept="pVoyu" id="4nIWweBVVL3" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+          <node concept="3nzxsE" id="4nIWweBVVL4" role="3n$kyP">
+            <node concept="3clFbS" id="4nIWweBVVL5" role="2VODD2">
+              <node concept="3clFbF" id="4nIWweBVVL6" role="3cqZAp">
+                <node concept="2OqwBi" id="4nIWweBVVL7" role="3clFbG">
+                  <node concept="2OqwBi" id="4nIWweBVVL8" role="2Oq$k0">
+                    <node concept="pncrf" id="4nIWweBVVL9" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="4nIWweBVWej" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:PB1R3Y7EcX" resolve="parameter" />
+                    </node>
+                  </node>
+                  <node concept="3GX2aA" id="4nIWweBVVLb" role="2OqNvi" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3F0ifn" id="2_NfR5wjCdH" role="1QoVPY">
-          <property role="3F0ifm" value="alt produce" />
-          <ref role="1k5W1q" to="tpch:24YP6ZDyde4" resolve="Keyword" />
+        <node concept="lj46D" id="4nIWweBVVLc" role="3F10Kt">
+          <property role="VOm3f" value="true" />
         </node>
-        <node concept="3F0ifn" id="6p0DfM0cTeX" role="1QoS34">
-          <property role="3F0ifm" value="produce" />
+        <node concept="3F0ifn" id="4nIWweBIFef" role="3EZMnx">
+          <property role="3F0ifm" value="using" />
           <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
+          <node concept="pkWqt" id="4nIWweBIFeg" role="pqm2j">
+            <node concept="3clFbS" id="4nIWweBIFeh" role="2VODD2">
+              <node concept="3clFbF" id="4nIWweBIFei" role="3cqZAp">
+                <node concept="2OqwBi" id="4nIWweBIFej" role="3clFbG">
+                  <node concept="2OqwBi" id="4nIWweBIFek" role="2Oq$k0">
+                    <node concept="pncrf" id="4nIWweBIFel" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="4nIWweBIFem" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:PB1R3Y7EcX" resolve="parameter" />
+                    </node>
+                  </node>
+                  <node concept="3GX2aA" id="4nIWweBIFen" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
         </node>
+        <node concept="3F2HdR" id="4nIWweBIFeo" role="3EZMnx">
+          <property role="2czwfO" value="," />
+          <ref role="1NtTu8" to="wq2x:PB1R3Y7EcX" resolve="parameter" />
+          <node concept="l2Vlx" id="4nIWweBIFep" role="2czzBx" />
+          <node concept="3F0ifn" id="4nIWweBIFeq" role="2czzBI">
+            <property role="ilYzB" value="using no variables" />
+          </node>
+        </node>
+        <node concept="l2Vlx" id="4nIWweBIFer" role="2iSdaV" />
       </node>
       <node concept="PMmxH" id="3g$8GQC8l_I" role="3EZMnx">
         <ref role="PMmxG" node="3g$8GQC8l_C" resolve="RuleComponentCode" />
+        <node concept="lj46D" id="4nIWweBIFZn" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
       </node>
       <node concept="l2Vlx" id="6p0DfM0cTe3" role="2iSdaV" />
     </node>
@@ -909,71 +958,25 @@
     <property role="3GE5qa" value="rule.component" />
     <ref role="1XX52x" to="wq2x:6p0DfM0a3gA" resolve="Head" />
     <node concept="3EZMnI" id="6p0DfM0cXIK" role="2wV5jI">
-      <node concept="3EZMnI" id="PB1R3Y7Kyb" role="3EZMnx">
-        <node concept="VPM3Z" id="PB1R3Y7Kyd" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="ljvvj" id="1iWwVK2D3Ld" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="3F0ifn" id="PB1R3Y7KCo" role="3EZMnx">
-          <property role="3F0ifm" value="&lt;%" />
-          <ref role="1k5W1q" node="7LZcKzBE07j" resolve="EmitConstraint" />
-        </node>
-        <node concept="3F2HdR" id="PB1R3Y7KCA" role="3EZMnx">
-          <property role="2czwfO" value="," />
-          <ref role="1NtTu8" to="wq2x:PB1R3Y7EcX" resolve="parameter" />
-          <node concept="l2Vlx" id="PB1R3Y7KCC" role="2czzBx" />
-          <node concept="3F0ifn" id="PB1R3Y8Bfi" role="2czzBI">
-            <property role="ilYzB" value="&lt;no logical&gt;" />
-          </node>
-        </node>
-        <node concept="3F0ifn" id="PB1R3Y7KCu" role="3EZMnx">
-          <property role="3F0ifm" value="%&gt;" />
-          <ref role="1k5W1q" node="7LZcKzBE07j" resolve="EmitConstraint" />
-        </node>
-        <node concept="l2Vlx" id="PB1R3Y7Kyg" role="2iSdaV" />
-      </node>
       <node concept="3EZMnI" id="2E5lcNn0INE" role="3EZMnx">
         <node concept="VPM3Z" id="2E5lcNn0ING" role="3F10Kt">
           <property role="VOm3f" value="false" />
         </node>
+        <node concept="pVoyu" id="4nIWweBHMBe" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
         <node concept="3F0ifn" id="2E5lcNn0J1l" role="3EZMnx">
-          <property role="3F0ifm" value="match" />
+          <property role="3F0ifm" value="keep" />
           <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
-          <node concept="1X3_iC" id="4hPXq9Jmfbz" role="lGtFl">
-            <property role="3V$3am" value="styleItem" />
-            <property role="3V$3ak" value="18bc6592-03a6-4e29-a83a-7ff23bde13ba/1219418625346/1219418656006" />
-            <node concept="2V7CMv" id="2E5lcNn1d$W" role="8Wnug">
-              <property role="2V7CMs" value="ext_1_RTransform" />
-              <node concept="xBawi" id="4hPXq9Jmfby" role="lGtFl">
-                <ref role="xBaxx" node="4hPXq9JmegX" resolve="Head_replace" />
-              </node>
-            </node>
-          </node>
           <node concept="A1WHu" id="4hPXq9Jmfbx" role="3vIgyS">
-            <ref role="A1WHt" node="4hPXq9JmegX" resolve="Head_replace" />
+            <ref role="A1WHt" node="4hPXq9JmegX" resolve="Head_keep_discard" />
           </node>
-        </node>
-        <node concept="l2Vlx" id="2E5lcNn0INJ" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="2E5lcNn0JfO" role="3EZMnx">
-        <node concept="VPM3Z" id="2E5lcNn0JfQ" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="2E5lcNn0Jtz" role="3EZMnx">
-          <property role="3F0ifm" value="and discard" />
-          <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
-          <ref role="1ERwB7" node="2E5lcNn0$dr" resolve="Head_keep" />
-        </node>
-        <node concept="l2Vlx" id="2E5lcNn0JfT" role="2iSdaV" />
-        <node concept="pkWqt" id="2E5lcNn1IvJ" role="pqm2j">
-          <node concept="3clFbS" id="2E5lcNn1IvK" role="2VODD2">
-            <node concept="3clFbF" id="2E5lcNn1IXp" role="3cqZAp">
-              <node concept="3fqX7Q" id="2E5lcNn1J_F" role="3clFbG">
-                <node concept="2OqwBi" id="2E5lcNn1J_G" role="3fr31v">
-                  <node concept="pncrf" id="2E5lcNn1J_H" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="2E5lcNn1J_I" role="2OqNvi">
+          <node concept="pkWqt" id="4nIWweBHrrS" role="pqm2j">
+            <node concept="3clFbS" id="4nIWweBHrrT" role="2VODD2">
+              <node concept="3clFbF" id="4nIWweBHrz6" role="3cqZAp">
+                <node concept="2OqwBi" id="4nIWweBHrKP" role="3clFbG">
+                  <node concept="pncrf" id="4nIWweBHrz5" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="4nIWweBHscp" role="2OqNvi">
                     <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
                   </node>
                 </node>
@@ -981,10 +984,92 @@
             </node>
           </node>
         </node>
+        <node concept="3F0ifn" id="4nIWweBHsBc" role="3EZMnx">
+          <property role="3F0ifm" value="discard" />
+          <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
+          <node concept="pkWqt" id="4nIWweBHsKD" role="pqm2j">
+            <node concept="3clFbS" id="4nIWweBHsKE" role="2VODD2">
+              <node concept="3clFbF" id="4nIWweBHsRS" role="3cqZAp">
+                <node concept="3fqX7Q" id="4nIWweBHsRQ" role="3clFbG">
+                  <node concept="2OqwBi" id="4nIWweBHt5P" role="3fr31v">
+                    <node concept="pncrf" id="4nIWweBHsS0" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="4nIWweBHtv1" role="2OqNvi">
+                      <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="A1WHu" id="4nIWweBHtK6" role="3vIgyS">
+            <ref role="A1WHt" node="4hPXq9JmegX" resolve="Head_keep_discard" />
+          </node>
+        </node>
+        <node concept="l2Vlx" id="2E5lcNn0INJ" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="PB1R3Y7Kyb" role="3EZMnx">
+        <node concept="VPM3Z" id="PB1R3Y7Kyd" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="pVoyu" id="4nIWweBUJA2" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+          <node concept="3nzxsE" id="4nIWweBUJLd" role="3n$kyP">
+            <node concept="3clFbS" id="4nIWweBUJLe" role="2VODD2">
+              <node concept="3clFbF" id="4nIWweBUJSs" role="3cqZAp">
+                <node concept="2OqwBi" id="4nIWweBUMzs" role="3clFbG">
+                  <node concept="2OqwBi" id="4nIWweBUK6b" role="2Oq$k0">
+                    <node concept="pncrf" id="4nIWweBUJSr" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="4nIWweBUKsu" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:PB1R3Y7EcX" resolve="parameter" />
+                    </node>
+                  </node>
+                  <node concept="3GX2aA" id="4nIWweBUPV_" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="lj46D" id="4nIWweBUQJJ" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="3F0ifn" id="PB1R3Y7KCo" role="3EZMnx">
+          <property role="3F0ifm" value="using" />
+          <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
+          <node concept="pkWqt" id="4nIWweBH2_Z" role="pqm2j">
+            <node concept="3clFbS" id="4nIWweBH2A0" role="2VODD2">
+              <node concept="3clFbF" id="4nIWweBH2Hd" role="3cqZAp">
+                <node concept="2OqwBi" id="4nIWweBH5Da" role="3clFbG">
+                  <node concept="2OqwBi" id="4nIWweBH36G" role="2Oq$k0">
+                    <node concept="pncrf" id="4nIWweBH2Hc" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="4nIWweBH3yc" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:PB1R3Y7EcX" resolve="parameter" />
+                    </node>
+                  </node>
+                  <node concept="3GX2aA" id="4nIWweBH7sk" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3F2HdR" id="PB1R3Y7KCA" role="3EZMnx">
+          <property role="2czwfO" value="," />
+          <ref role="1NtTu8" to="wq2x:PB1R3Y7EcX" resolve="parameter" />
+          <node concept="l2Vlx" id="PB1R3Y7KCC" role="2czzBx" />
+          <node concept="3F0ifn" id="PB1R3Y8Bfi" role="2czzBI">
+            <property role="ilYzB" value="using no variables" />
+          </node>
+        </node>
+        <node concept="l2Vlx" id="PB1R3Y7Kyg" role="2iSdaV" />
       </node>
       <node concept="l2Vlx" id="6p0DfM0cXIN" role="2iSdaV" />
       <node concept="PMmxH" id="3g$8GQC8lMp" role="3EZMnx">
         <ref role="PMmxG" node="3g$8GQC8l_C" resolve="RuleComponentCode" />
+        <node concept="pVoyu" id="4nIWweBUe6S" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="lj46D" id="4nIWweBHMMU" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
       </node>
       <node concept="1Bt7hp" id="6ntBQ9KE8a9" role="3F10Kt">
         <property role="VOm3f" value="true" />
@@ -1030,6 +1115,12 @@
           <property role="VOm3f" value="false" />
         </node>
       </node>
+      <node concept="3F0ifn" id="4nIWweBYd23" role="3EZMnx">
+        <property role="3F0ifm" value="" />
+        <node concept="ljvvj" id="4nIWweBYd41" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
       <node concept="3F2HdR" id="6p0DfM0dsEy" role="3EZMnx">
         <property role="2czwfO" value=" " />
         <ref role="1NtTu8" to="wq2x:6p0DfM0bRQj" resolve="rule" />
@@ -1053,12 +1144,11 @@
     <property role="3GE5qa" value="rule.component" />
     <ref role="1XX52x" to="wq2x:6p0DfM0a3Qe" resolve="Guard" />
     <node concept="3EZMnI" id="6p0DfM0dH8B" role="2wV5jI">
-      <node concept="3F0ifn" id="6p0DfM0dHcW" role="3EZMnx">
-        <property role="3F0ifm" value="with guard" />
-        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
-      </node>
       <node concept="PMmxH" id="3g$8GQC8lAb" role="3EZMnx">
         <ref role="PMmxG" node="3g$8GQC8l_C" resolve="RuleComponentCode" />
+        <node concept="lj46D" id="4nIWweBIE_f" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
       </node>
       <node concept="l2Vlx" id="6p0DfM0dH8E" role="2iSdaV" />
     </node>
@@ -1449,55 +1539,6 @@
       <node concept="l2Vlx" id="2E5lcNn029r" role="2iSdaV" />
     </node>
   </node>
-  <node concept="1h_SRR" id="2E5lcNn0$dr">
-    <property role="3GE5qa" value="rule.component" />
-    <property role="TrG5h" value="Head_keep" />
-    <ref role="1h_SK9" to="wq2x:6p0DfM0a3gA" resolve="Head" />
-    <node concept="1hA7zw" id="2E5lcNn0$f8" role="1h_SK8">
-      <property role="1hAc7j" value="delete_action_id" />
-      <node concept="1hAIg9" id="2E5lcNn0$f9" role="1hA7z_">
-        <node concept="3clFbS" id="2E5lcNn0$fa" role="2VODD2">
-          <node concept="3clFbF" id="2E5lcNn0$QX" role="3cqZAp">
-            <node concept="37vLTI" id="2E5lcNn0_EV" role="3clFbG">
-              <node concept="3clFbT" id="2E5lcNn0_OH" role="37vLTx">
-                <property role="3clFbU" value="true" />
-              </node>
-              <node concept="2OqwBi" id="2E5lcNn0$Sr" role="37vLTJ">
-                <node concept="0IXxy" id="2E5lcNn0$QW" role="2Oq$k0" />
-                <node concept="3TrcHB" id="2E5lcNn0_e5" role="2OqNvi">
-                  <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="24kQdi" id="2E5lcNn5kyh">
-    <property role="3GE5qa" value="constraint.variable" />
-    <ref role="1XX52x" to="wq2x:2E5lcNn5kn6" resolve="ParameterDeclarationStatement" />
-    <node concept="3EZMnI" id="2E5lcNn5kz9" role="2wV5jI">
-      <ref role="1k5W1q" node="7ksQUDZpyGq" resolve="Constraint" />
-      <node concept="3F0ifn" id="7ksQUDZwl6Z" role="3EZMnx">
-        <property role="3F0ifm" value="‹‹" />
-      </node>
-      <node concept="PMmxH" id="5zfvpQ72iUq" role="3EZMnx">
-        <ref role="PMmxG" node="5zfvpQ72h2k" resolve="LogicVariableDeclarationStatement_type" />
-      </node>
-      <node concept="3F2HdR" id="2E5lcNn5kR1" role="3EZMnx">
-        <property role="2czwfO" value="," />
-        <ref role="1NtTu8" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
-        <node concept="l2Vlx" id="2E5lcNn5kR3" role="2czzBx" />
-        <node concept="tppnM" id="2E5lcNn5V3B" role="sWeuL">
-          <node concept="11L4FC" id="2E5lcNn5V5l" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-      </node>
-      <node concept="l2Vlx" id="2E5lcNn5kzc" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="2E5lcNn5Urm">
     <property role="3GE5qa" value="constraint.variable" />
     <ref role="1XX52x" to="wq2x:2E5lcNn5Ub2" resolve="LocalDeclarationStatement" />
@@ -1542,7 +1583,7 @@
         </node>
         <node concept="l2Vlx" id="6ntBQ9KCpY7" role="2iSdaV" />
         <node concept="3F0ifn" id="4laj_h9P4C8" role="3EZMnx">
-          <property role="3F0ifm" value="applicable if" />
+          <property role="3F0ifm" value="apply if" />
           <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
         </node>
       </node>
@@ -1624,7 +1665,7 @@
     <ref role="1XX52x" to="wq2x:5NuEpF1if3e" resolve="RuleInputSpecification" />
     <node concept="3EZMnI" id="5NuEpF1iiVw" role="2wV5jI">
       <node concept="3F0ifn" id="5NuEpF1ijhd" role="3EZMnx">
-        <property role="3F0ifm" value="for" />
+        <property role="3F0ifm" value="for each" />
         <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
       </node>
       <node concept="1iCGBv" id="5NuEpF1ijhe" role="3EZMnx">
@@ -1712,14 +1753,14 @@
     <ref role="1XX52x" to="wq2x:1zN1RIkQtcr" resolve="BoundParameterBlock" />
     <node concept="3EZMnI" id="1zN1RIkQuBi" role="2wV5jI">
       <node concept="3F0ifn" id="1zN1RIkQuBj" role="3EZMnx">
-        <property role="3F0ifm" value="with" />
+        <property role="3F0ifm" value="let" />
         <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
       </node>
       <node concept="3F1sOY" id="1zN1RIkQuBk" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:5MHpiylFI5Z" resolve="parameter" />
       </node>
       <node concept="3F0ifn" id="1zN1RIkQuBl" role="3EZMnx">
-        <property role="3F0ifm" value="bound to" />
+        <property role="3F0ifm" value="=" />
         <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
       </node>
       <node concept="3F0ifn" id="1zN1RIkQuBm" role="3EZMnx">
@@ -1744,7 +1785,7 @@
     <ref role="1XX52x" to="wq2x:tIwzd1EOs6" resolve="RequiredNodeBlock" />
     <node concept="3EZMnI" id="tIwzd1EVN3" role="2wV5jI">
       <node concept="3F0ifn" id="tIwzd1EVN6" role="3EZMnx">
-        <property role="3F0ifm" value="require templates for" />
+        <property role="3F0ifm" value="also process templates for" />
         <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
       </node>
       <node concept="3F0ifn" id="tIwzd1EVN7" role="3EZMnx">
@@ -2522,63 +2563,6 @@
         <property role="VOm3f" value="true" />
       </node>
       <node concept="l2Vlx" id="3g$8GQC8l_G" role="2iSdaV" />
-      <node concept="3EZMnI" id="20Ay2Vehrx_" role="3EZMnx">
-        <node concept="VPM3Z" id="20Ay2VehrxB" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="l2Vlx" id="20Ay2VehrxE" role="2iSdaV" />
-        <node concept="3F0ifn" id="20Ay2VehrzY" role="3EZMnx">
-          <property role="3F0ifm" value="&gt;&gt;" />
-          <ref role="1k5W1q" to="tpco:3VARyd8XcQs" resolve="Comment" />
-          <node concept="VPM3Z" id="20Ay2VehGIk" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-          <node concept="VPxyj" id="20Ay2VehGK6" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-        </node>
-        <node concept="3EZMnI" id="20Ay2VehGEg" role="3EZMnx">
-          <node concept="3F0ifn" id="20Ay2VejM3i" role="3EZMnx">
-            <property role="3F0ifm" value="{" />
-            <ref role="1k5W1q" to="tpen:hFD5onb" resolve="LeftBrace" />
-          </node>
-          <node concept="VPM3Z" id="20Ay2VehGEi" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-          <node concept="1Bsynf" id="20Ay2VehGGl" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="l2Vlx" id="20Ay2VehGEl" role="2iSdaV" />
-          <node concept="3F1sOY" id="3g$8GQC8l_H" role="3EZMnx">
-            <ref role="1NtTu8" to="wq2x:6p0DfM0a5m9" resolve="code" />
-            <node concept="lj46D" id="20Ay2Veko8P" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="pVoyu" id="20Ay2VekoaB" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-          </node>
-          <node concept="3F0ifn" id="20Ay2VejM3u" role="3EZMnx">
-            <property role="3F0ifm" value="}" />
-            <ref role="1k5W1q" to="tpen:hFD5_7H" resolve="RightBrace" />
-          </node>
-        </node>
-        <node concept="pkWqt" id="20Ay2VekXwd" role="pqm2j">
-          <node concept="3clFbS" id="20Ay2VekXwe" role="2VODD2">
-            <node concept="3clFbF" id="20Ay2VekXBs" role="3cqZAp">
-              <node concept="2OqwBi" id="20Ay2VekYCd" role="3clFbG">
-                <node concept="2OqwBi" id="20Ay2VekXOp" role="2Oq$k0">
-                  <node concept="pncrf" id="20Ay2VekXBr" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="20Ay2VekY89" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:6p0DfM0a5m9" resolve="code" />
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="20Ay2VekZnK" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="3F1sOY" id="20Ay2VegChs" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:20Ay2VegCfd" resolve="logic" />
       </node>
@@ -2853,24 +2837,6 @@
           <property role="VOm3f" value="true" />
         </node>
       </node>
-      <node concept="3F1sOY" id="1pPth$m609u" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:1pPth$m5BbA" resolve="term" />
-        <node concept="lj46D" id="7IysFe_ZQiv" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="pVoyu" id="7IysFe_ZQfK" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F1sOY" id="2V8TwD0$Z9e" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:2V8TwD0$Z8f" resolve="recovery" />
-        <node concept="lj46D" id="2V8TwD0$Z9F" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="pVoyu" id="2V8TwD0$Z9G" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
       <node concept="l2Vlx" id="1pPth$m609c" role="2iSdaV" />
     </node>
   </node>
@@ -3075,80 +3041,8 @@
             <property role="VOm3f" value="true" />
           </node>
         </node>
-        <node concept="3EZMnI" id="6wQEDbCHtc$" role="3EZMnx">
-          <node concept="VPM3Z" id="6wQEDbCHtc_" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-          <node concept="3F2HdR" id="6wQEDbCHtcA" role="3EZMnx">
-            <property role="2czwfO" value=" " />
-            <ref role="1NtTu8" to="wq2x:1ffsG7bCfL5" resolve="head" />
-            <node concept="l2Vlx" id="6wQEDbCHtcB" role="2czzBx" />
-            <node concept="tppnM" id="6wQEDbCHtcC" role="sWeuL">
-              <node concept="ljvvj" id="6wQEDbCHtcD" role="3F10Kt">
-                <property role="VOm3f" value="true" />
-              </node>
-            </node>
-            <node concept="lj46D" id="6wQEDbCHtcE" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="ljvvj" id="6wQEDbCHtcF" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="3F0ifn" id="6wQEDbCHtcG" role="2czzBI">
-              <property role="3F0ifm" value="no head" />
-              <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
-              <node concept="Vb9p2" id="6wQEDbCHtcH" role="3F10Kt">
-                <property role="Vbekb" value="BOLD" />
-              </node>
-            </node>
-          </node>
-          <node concept="3F2HdR" id="6wQEDbCHtcI" role="3EZMnx">
-            <property role="2czwfO" value=" " />
-            <ref role="1NtTu8" to="wq2x:1ffsG7bFM2v" resolve="guard" />
-            <node concept="l2Vlx" id="6wQEDbCHtcJ" role="2czzBx" />
-            <node concept="tppnM" id="6wQEDbCHtcK" role="sWeuL">
-              <node concept="ljvvj" id="6wQEDbCHtcL" role="3F10Kt">
-                <property role="VOm3f" value="true" />
-              </node>
-            </node>
-            <node concept="lj46D" id="6wQEDbCHtcM" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="ljvvj" id="6wQEDbCHtcN" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="3F0ifn" id="6wQEDbCHtcO" role="2czzBI">
-              <property role="3F0ifm" value="unconditionally" />
-              <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
-              <node concept="Vb9p2" id="6wQEDbCHtcP" role="3F10Kt">
-                <property role="Vbekb" value="BOLD" />
-              </node>
-            </node>
-          </node>
-          <node concept="3F2HdR" id="6wQEDbCHtcQ" role="3EZMnx">
-            <property role="2czwfO" value=" " />
-            <ref role="1NtTu8" to="wq2x:1ffsG7bIxDv" resolve="body" />
-            <node concept="l2Vlx" id="6wQEDbCHtcR" role="2czzBx" />
-            <node concept="tppnM" id="6wQEDbCHtcS" role="sWeuL">
-              <node concept="ljvvj" id="6wQEDbCHtcT" role="3F10Kt">
-                <property role="VOm3f" value="true" />
-              </node>
-            </node>
-            <node concept="lj46D" id="6wQEDbCHtcU" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="ljvvj" id="6wQEDbCHtcV" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="3F0ifn" id="6wQEDbCHtcW" role="2czzBI">
-              <property role="3F0ifm" value="no body" />
-              <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
-              <node concept="Vb9p2" id="6wQEDbCHtcX" role="3F10Kt">
-                <property role="Vbekb" value="BOLD" />
-              </node>
-            </node>
-          </node>
-          <node concept="l2Vlx" id="6wQEDbCHtcY" role="2iSdaV" />
+        <node concept="PMmxH" id="4nIWweBWowO" role="3EZMnx">
+          <ref role="PMmxG" node="4nIWweBWmzT" resolve="AbstractRule_contents" />
         </node>
         <node concept="3F0ifn" id="6wQEDbCHtcZ" role="AHCbl">
           <property role="3F0ifm" value="..." />
@@ -3163,7 +3057,7 @@
     <ref role="1XX52x" to="wq2x:6wQEDbCL4Fi" resolve="IncludeFragmentClause" />
     <node concept="3EZMnI" id="6wQEDbCL4Fz" role="2wV5jI">
       <node concept="3F0ifn" id="6wQEDbCL4G3" role="3EZMnx">
-        <property role="3F0ifm" value="include" />
+        <property role="3F0ifm" value="include fragment" />
         <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
       </node>
       <node concept="1iCGBv" id="6wQEDbCL4FI" role="3EZMnx">
@@ -3182,67 +3076,20 @@
     <property role="3GE5qa" value="constraint.variable" />
     <ref role="1XX52x" to="wq2x:PB1R3Y7Ed7" resolve="RulePartParameterDeclaration" />
     <node concept="3EZMnI" id="PB1R3Y7JcH" role="2wV5jI">
-      <node concept="1HlG4h" id="1iWwVK2Cn3h" role="3EZMnx">
-        <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
-        <node concept="1HfYo3" id="1iWwVK2Cn3i" role="1HlULh">
-          <node concept="3TQlhw" id="1iWwVK2Cn3j" role="1Hhtcw">
-            <node concept="3clFbS" id="1iWwVK2Cn3k" role="2VODD2">
-              <node concept="3clFbF" id="1iWwVK2Cn3l" role="3cqZAp">
-                <node concept="2OqwBi" id="1iWwVK2Cn3m" role="3clFbG">
-                  <node concept="35c_gC" id="1iWwVK2Cn3n" role="2Oq$k0">
-                    <ref role="35c_gD" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
-                  </node>
-                  <node concept="3n3YKJ" id="1iWwVK2Cn3o" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="Vb9p2" id="1iWwVK2Cn3p" role="3F10Kt">
-          <property role="Vbekb" value="BOLD" />
-        </node>
-      </node>
       <node concept="3EZMnI" id="1iWwVK2CnQR" role="3EZMnx">
         <node concept="VPM3Z" id="1iWwVK2CnQS" role="3F10Kt">
           <property role="VOm3f" value="false" />
         </node>
-        <node concept="3F0ifn" id="1iWwVK2CnQT" role="3EZMnx">
-          <property role="3F0ifm" value="&lt;" />
-          <ref role="1k5W1q" to="tpen:75A9veqzBn9" resolve="LeftAngleBracket" />
-          <node concept="11L4FC" id="1iWwVK2CnQU" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
         <node concept="3F1sOY" id="1iWwVK2CnQV" role="3EZMnx">
+          <property role="1$x2rV" value="term" />
+          <property role="2ru_X1" value="true" />
           <ref role="1NtTu8" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
-        </node>
-        <node concept="3F0ifn" id="1iWwVK2CnQW" role="3EZMnx">
-          <property role="3F0ifm" value="&gt;" />
-          <ref role="1k5W1q" to="tpen:75A9veqzBna" resolve="RightAngleBracket" />
-          <node concept="11LMrY" id="1iWwVK2CnQX" role="3F10Kt">
-            <property role="VOm3f" value="false" />
+          <node concept="3F0ifn" id="4nIWweBGFL1" role="2ruayu">
+            <property role="3F0ifm" value="term" />
+            <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
           </node>
         </node>
         <node concept="l2Vlx" id="1iWwVK2CnQY" role="2iSdaV" />
-        <node concept="pkWqt" id="1iWwVK2CnQZ" role="pqm2j">
-          <node concept="3clFbS" id="1iWwVK2CnR0" role="2VODD2">
-            <node concept="3clFbF" id="1iWwVK2CnR1" role="3cqZAp">
-              <node concept="2OqwBi" id="1iWwVK2CnR2" role="3clFbG">
-                <node concept="2OqwBi" id="1iWwVK2CnR3" role="2Oq$k0">
-                  <node concept="pncrf" id="1iWwVK2CnR4" role="2Oq$k0" />
-                  <node concept="Bykcj" id="1iWwVK2CnR5" role="2OqNvi">
-                    <node concept="1aIX9F" id="1iWwVK2CnR6" role="1xVPHs">
-                      <node concept="26LbJo" id="1iWwVK2CnR7" role="1aIX9E">
-                        <ref role="26LbJp" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3GX2aA" id="1iWwVK2CnR8" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
       </node>
       <node concept="3F2HdR" id="PB1R3Y8j_E" role="3EZMnx">
         <property role="2czwfO" value="," />
@@ -3741,50 +3588,6 @@
       <node concept="l2Vlx" id="7IysFeA1vus" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="7IysFeA4qCC">
-    <property role="3GE5qa" value="constraint.typespecific" />
-    <ref role="1XX52x" to="wq2x:7IysFeA4qCy" resolve="NewTypeParameterBinding" />
-    <node concept="3EZMnI" id="7IysFeA4qCE" role="2wV5jI">
-      <node concept="3EZMnI" id="7LZcKzBBWPY" role="3EZMnx">
-        <node concept="VPM3Z" id="7LZcKzBBWQ0" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3vyZuw" id="7LZcKzBBWQl" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="1Bsynf" id="7LZcKzBBWQm" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="1Bt7hp" id="7LZcKzBBWQn" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="l2Vlx" id="7LZcKzBBWQ3" role="2iSdaV" />
-        <node concept="1iCGBv" id="7IysFeA4qCL" role="3EZMnx">
-          <ref role="1NtTu8" to="wq2x:7IysFeA4qCz" resolve="parameter" />
-          <node concept="1sVBvm" id="7IysFeA4qCN" role="1sWHZn">
-            <node concept="3F0A7n" id="7IysFeA4qCU" role="2wV5jI">
-              <property role="1Intyy" value="true" />
-              <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-              <ref role="1k5W1q" to="tpen:hshQ_OE" resolve="Field" />
-            </node>
-          </node>
-        </node>
-        <node concept="3F0ifn" id="7IysFeA4qDm" role="3EZMnx">
-          <property role="3F0ifm" value="=" />
-          <node concept="11L4FC" id="7IysFeA4qFh" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="11LMrY" id="7IysFeA4qGY" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="3F1sOY" id="7IysFeA4qDy" role="3EZMnx">
-          <ref role="1NtTu8" to="wq2x:7IysFeA4qC_" resolve="value" />
-        </node>
-      </node>
-      <node concept="l2Vlx" id="7IysFeA4qCH" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="7IysFeA5Lea">
     <property role="3GE5qa" value="type.code" />
     <ref role="1XX52x" to="wq2x:7IysFeA5Lco" resolve="InitBlock" />
@@ -4306,36 +4109,20 @@
     </node>
   </node>
   <node concept="3ICXOK" id="4hPXq9JmegX">
-    <property role="TrG5h" value="Head_replace" />
+    <property role="TrG5h" value="Head_keep_discard" />
     <ref role="aqKnT" to="wq2x:6p0DfM0a3gA" resolve="Head" />
     <node concept="yp4Wq" id="4hPXq9JmegY" role="lGtFl">
       <property role="yp4Ub" value="ext_1_RTransform" />
     </node>
     <node concept="1Qtc8_" id="4hPXq9Jmeh1" role="IW6Ez">
-      <node concept="3cWJ9i" id="4hPXq9JmegZ" role="1Qtc8$">
-        <node concept="CtIbL" id="4hPXq9Jmeh0" role="CtIbM">
-          <property role="CtIbK" value="RIGHT" />
-        </node>
-      </node>
-      <node concept="aenpk" id="4hPXq9Jmeh3" role="1Qtc8A">
-        <node concept="27VH4U" id="4hPXq9Jmeh4" role="aenpu">
-          <node concept="3clFbS" id="4hPXq9Jmeh5" role="2VODD2">
-            <node concept="3clFbF" id="4hPXq9Jmeh6" role="3cqZAp">
-              <node concept="2OqwBi" id="4hPXq9Jmeh7" role="3clFbG">
-                <node concept="7Obwk" id="4hPXq9Jmeha" role="2Oq$k0" />
-                <node concept="3TrcHB" id="4hPXq9Jmeh9" role="2OqNvi">
-                  <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
+      <node concept="3eGOoe" id="4nIWweBH09y" role="1Qtc8$" />
+      <node concept="aenpk" id="4nIWweBLxJX" role="1Qtc8A">
         <node concept="IWgqT" id="4hPXq9Jmehb" role="aenpr">
           <node concept="1hCUdq" id="4hPXq9Jmehc" role="1hCUd6">
             <node concept="3clFbS" id="4hPXq9Jmehd" role="2VODD2">
               <node concept="3clFbF" id="4hPXq9Jmehe" role="3cqZAp">
                 <node concept="Xl_RD" id="4hPXq9Jmehf" role="3clFbG">
-                  <property role="Xl_RC" value="and discard" />
+                  <property role="Xl_RC" value="discard" />
                 </node>
               </node>
             </node>
@@ -4372,6 +4159,76 @@
             </node>
           </node>
         </node>
+        <node concept="27VH4U" id="4nIWweBLxVd" role="aenpu">
+          <node concept="3clFbS" id="4nIWweBLxVe" role="2VODD2">
+            <node concept="3clFbF" id="4nIWweBLy2r" role="3cqZAp">
+              <node concept="2OqwBi" id="4nIWweBLyFn" role="3clFbG">
+                <node concept="7Obwk" id="4nIWweBLyFo" role="2Oq$k0" />
+                <node concept="3TrcHB" id="4nIWweBLyFp" role="2OqNvi">
+                  <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="aenpk" id="4hPXq9Jmeh3" role="1Qtc8A">
+        <node concept="27VH4U" id="4hPXq9Jmeh4" role="aenpu">
+          <node concept="3clFbS" id="4hPXq9Jmeh5" role="2VODD2">
+            <node concept="3clFbF" id="4hPXq9Jmeh6" role="3cqZAp">
+              <node concept="3fqX7Q" id="4nIWweBL$pI" role="3clFbG">
+                <node concept="2OqwBi" id="4nIWweBL$pK" role="3fr31v">
+                  <node concept="7Obwk" id="4nIWweBL$pL" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="4nIWweBL$pM" role="2OqNvi">
+                    <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="IWgqT" id="4nIWweBH1ca" role="aenpr">
+          <node concept="1hCUdq" id="4nIWweBH1cc" role="1hCUd6">
+            <node concept="3clFbS" id="4nIWweBH1ce" role="2VODD2">
+              <node concept="3clFbF" id="4nIWweBH1v7" role="3cqZAp">
+                <node concept="Xl_RD" id="4nIWweBH1v6" role="3clFbG">
+                  <property role="Xl_RC" value="keep" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="IWg2L" id="4nIWweBH1cg" role="IWgqQ">
+            <node concept="3clFbS" id="4nIWweBH1ci" role="2VODD2">
+              <node concept="3clFbF" id="4nIWweBH1SF" role="3cqZAp">
+                <node concept="37vLTI" id="4nIWweBH1SG" role="3clFbG">
+                  <node concept="3clFbT" id="4nIWweBH1Zl" role="37vLTx">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                  <node concept="2OqwBi" id="4nIWweBH1SI" role="37vLTJ">
+                    <node concept="7Obwk" id="4nIWweBH1SJ" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="4nIWweBH1SK" role="2OqNvi">
+                      <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="4nIWweBH1SL" role="3cqZAp">
+                <node concept="2OqwBi" id="4nIWweBH1SM" role="3clFbG">
+                  <node concept="7Obwk" id="4nIWweBH1SN" role="2Oq$k0" />
+                  <node concept="1OKiuA" id="4nIWweBH1SO" role="2OqNvi">
+                    <node concept="1Q80Hx" id="4nIWweBH1SP" role="lBI5i" />
+                    <node concept="2B6iha" id="4nIWweBH1SQ" role="lGT1i">
+                      <property role="1lyBwo" value="mostRelevant" />
+                    </node>
+                    <node concept="3cmrfG" id="4nIWweBH1SR" role="3dN3m$">
+                      <property role="3cmrfH" value="-1" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
   </node>
@@ -5489,75 +5346,12 @@
   <node concept="3p36aQ" id="4hPXq9JmeBj">
     <ref role="aqKnT" to="wq2x:2E5lcNn5Ub2" resolve="LocalDeclarationStatement" />
   </node>
-  <node concept="3p36aQ" id="4hPXq9JmeBk">
-    <ref role="aqKnT" to="wq2x:2E5lcNn5kn6" resolve="ParameterDeclarationStatement" />
-  </node>
   <node concept="3p36aQ" id="4hPXq9JmeBl">
     <ref role="aqKnT" to="wq2x:1hX44vMEjQr" resolve="TypeNodeExpression" />
   </node>
   <node concept="3p36aQ" id="4hPXq9JmeBm">
     <ref role="aqKnT" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
   </node>
-  <node concept="24kQdi" id="2V8TwD0$Ydv">
-    <property role="3GE5qa" value="type.code" />
-    <ref role="1XX52x" to="wq2x:2V8TwD0$Yds" resolve="RecoveryBlock" />
-    <node concept="3EZMnI" id="2V8TwD0$Ydx" role="2wV5jI">
-      <node concept="3F0ifn" id="2V8TwD0$YdC" role="3EZMnx">
-        <property role="3F0ifm" value="recovery" />
-        <node concept="pVoyu" id="2V8TwD0$YdM" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="2V8TwD0$YdI" role="3EZMnx">
-        <property role="3F0ifm" value="{" />
-        <ref role="1k5W1q" to="tpen:hFD5onb" resolve="LeftBrace" />
-      </node>
-      <node concept="PMmxH" id="2V8TwD0$Z76" role="3EZMnx">
-        <ref role="PMmxG" node="1hX44vMKXy$" resolve="CodeBlockComponent" />
-        <node concept="pVoyu" id="2V8TwD0$Z81" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="ljvvj" id="2V8TwD0$Z82" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="lj46D" id="2V8TwD0$Z83" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="2V8TwD0$YdT" role="3EZMnx">
-        <property role="3F0ifm" value="}" />
-        <ref role="1k5W1q" to="tpen:hFD5_7H" resolve="RightBrace" />
-      </node>
-      <node concept="l2Vlx" id="2V8TwD0$Yd$" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="2V8TwD0E9WS">
-    <property role="3GE5qa" value="type.term" />
-    <ref role="1XX52x" to="wq2x:2V8TwD0E9Wq" resolve="TypeFeatureExpression" />
-    <node concept="3EZMnI" id="2V8TwD0E9WU" role="2wV5jI">
-      <node concept="1iCGBv" id="2V8TwD0E9X1" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:2V8TwD0E9Wr" resolve="feature" />
-        <ref role="1k5W1q" node="1iWwVK2_Eea" resolve="TypeFeature" />
-        <node concept="1sVBvm" id="2V8TwD0E9X3" role="1sWHZn">
-          <node concept="3F0A7n" id="2V8TwD0E9Xa" role="2wV5jI">
-            <property role="1Intyy" value="true" />
-            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-          </node>
-        </node>
-      </node>
-      <node concept="l2Vlx" id="2V8TwD0E9WX" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="4cKdPpqE390">
-    <property role="3GE5qa" value="type.term" />
-    <ref role="1XX52x" to="wq2x:2V8TwD148$8" resolve="RecoverOperation" />
-    <node concept="3EZMnI" id="4cKdPpqE392" role="2wV5jI">
-      <node concept="PMmxH" id="4cKdPpqF4Pi" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      </node>
-      <node concept="l2Vlx" id="4cKdPpqE395" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="7rf49Ngk1D_">
     <property role="3GE5qa" value="constraint" />
     <ref role="1XX52x" to="wq2x:7rf49Ngk1cK" resolve="NotConstraint" />
@@ -5683,60 +5477,6 @@
     <property role="3GE5qa" value="type.term" />
     <ref role="aqKnT" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
   </node>
-  <node concept="24kQdi" id="6p0DfM0g5pD">
-    <property role="3GE5qa" value="constraint.typespecific" />
-    <ref role="1XX52x" to="wq2x:7eGEHDlgPU1" resolve="NewTypeConstraint" />
-    <node concept="3EZMnI" id="6p0DfM0g5sd" role="2wV5jI">
-      <node concept="3F1sOY" id="6p0DfM0geOX" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:6p0DfM0gdsG" resolve="typeVar" />
-      </node>
-      <node concept="3F0ifn" id="6p0DfM0geHd" role="3EZMnx">
-        <property role="3F0ifm" value="&lt;-" />
-        <ref role="1k5W1q" to="tpen:hF$iUjy" resolve="Operator" />
-      </node>
-      <node concept="3F0ifn" id="6p0DfM0g5uQ" role="3EZMnx">
-        <property role="3F0ifm" value="new" />
-        <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
-      </node>
-      <node concept="1iCGBv" id="YGS68N6UWi" role="3EZMnx">
-        <property role="1$x2rV" value="&lt;no type declaration&gt;" />
-        <ref role="1NtTu8" to="wq2x:YGS68N6UU4" resolve="typeDeclaration" />
-        <node concept="1X3_iC" id="4hPXq9JmfbL" role="lGtFl">
-          <property role="3V$3am" value="styleItem" />
-          <property role="3V$3ak" value="18bc6592-03a6-4e29-a83a-7ff23bde13ba/1219418625346/1219418656006" />
-          <node concept="2V7CMv" id="7IysFeA3Ois" role="8Wnug">
-            <property role="2V7CMs" value="ext_1_RTransform" />
-            <node concept="xG$WE" id="4hPXq9JmfbK" role="lGtFl" />
-          </node>
-        </node>
-        <node concept="1sVBvm" id="YGS68N6UWk" role="1sWHZn">
-          <node concept="3F0A7n" id="YGS68N73HK" role="2wV5jI">
-            <property role="1Intyy" value="true" />
-            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-            <ref role="1k5W1q" node="7km57Pk7sC0" resolve="TypeTerm" />
-          </node>
-        </node>
-      </node>
-      <node concept="3F0ifn" id="18kNIl0iqmD" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
-      </node>
-      <node concept="3F2HdR" id="7IysFeA3P8t" role="3EZMnx">
-        <property role="2czwfO" value="," />
-        <property role="Q2I2d" value="punctuation" />
-        <ref role="1NtTu8" to="wq2x:6p0DfM0gSN1" resolve="argument" />
-        <node concept="l2Vlx" id="7IysFeA3P8v" role="2czzBx" />
-        <node concept="3F0ifn" id="7IysFeA3PjZ" role="2czzBI">
-          <property role="3F0ifm" value="" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="18kNIl0iqN7" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
-      </node>
-      <node concept="l2Vlx" id="6p0DfM0g5sg" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="20Ay2VefOqG">
     <property role="3GE5qa" value="rule.clause" />
     <ref role="1XX52x" to="wq2x:20Ay2VefOqC" resolve="LogicalClauseList" />
@@ -5753,6 +5493,10 @@
         <node concept="lj46D" id="20Ay2VefOun" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
+        <node concept="3F0ifn" id="4nIWweBNHhV" role="2czzBI">
+          <property role="3F0ifm" value="" />
+          <property role="ilYzB" value="&lt;no clauses&gt;" />
+        </node>
       </node>
       <node concept="l2Vlx" id="20Ay2VefOqL" role="2iSdaV" />
     </node>
@@ -5790,8 +5534,11 @@
     <ref role="1XX52x" to="wq2x:20Ay2Vei7FH" resolve="TemplateLogicalClause" />
     <node concept="3EZMnI" id="20Ay2Vei7Gd" role="2wV5jI">
       <node concept="3F0ifn" id="20Ay2Vei7Gk" role="3EZMnx">
-        <property role="3F0ifm" value="%&gt;" />
+        <property role="3F0ifm" value="%%" />
         <ref role="1k5W1q" node="7LZcKzBE07j" resolve="EmitConstraint" />
+        <node concept="ljvvj" id="4nIWweBP0sl" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
       </node>
       <node concept="3EZMnI" id="20Ay2VeizvC" role="3EZMnx">
         <node concept="VPM3Z" id="20Ay2VeizvE" role="3F10Kt">
@@ -5812,45 +5559,15 @@
         </node>
       </node>
       <node concept="3F0ifn" id="20Ay2Vei7Gq" role="3EZMnx">
-        <property role="3F0ifm" value="&lt;%" />
+        <property role="3F0ifm" value="%%" />
         <ref role="1k5W1q" node="7LZcKzBE07j" resolve="EmitConstraint" />
+        <node concept="pVoyu" id="4nIWweBP0u2" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
       </node>
       <node concept="l2Vlx" id="20Ay2Vei7Gg" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="20Ay2VepLqr">
-    <property role="3GE5qa" value="rule.clause" />
-    <ref role="1XX52x" to="wq2x:20Ay2VepLqo" resolve="CodeLogicalClause" />
-    <node concept="3EZMnI" id="20Ay2Veroeu" role="2wV5jI">
-      <node concept="3EZMnI" id="20Ay2Vet$TR" role="3EZMnx">
-        <node concept="VPM3Z" id="20Ay2Vet$TT" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="l2Vlx" id="20Ay2Vet$TW" role="2iSdaV" />
-        <node concept="3F0ifn" id="20Ay2VeroeM" role="3EZMnx">
-          <property role="3F0ifm" value="&gt;&gt;&gt;" />
-        </node>
-      </node>
-      <node concept="3EZMnI" id="20Ay2VepLqt" role="3EZMnx">
-        <node concept="3F0ifn" id="20Ay2Veq75a" role="3EZMnx" />
-        <node concept="3F1sOY" id="20Ay2VepLqA" role="3EZMnx">
-          <ref role="1NtTu8" to="wq2x:20Ay2VepLqp" resolve="code" />
-          <node concept="lj46D" id="20Ay2VepLqB" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="3F0ifn" id="20Ay2Veq75w" role="3EZMnx" />
-        <node concept="l2Vlx" id="20Ay2VepLqw" role="2iSdaV" />
-        <node concept="1Bsynf" id="20Ay2VerVep" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="3vyZuw" id="20Ay2VepLss" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="l2Vlx" id="20Ay2Vet$V9" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="PKFIW" id="1CcQBrPqjQg">
     <property role="3GE5qa" value="type.feature" />
     <property role="TrG5h" value="TypeFeature_final_name" />
@@ -5994,5 +5711,290 @@
       <node concept="l2Vlx" id="1CcQBrQdzy2" role="2iSdaV" />
     </node>
   </node>
+  <node concept="3p36aQ" id="4nIWweBNZTp">
+    <property role="3GE5qa" value="rule.clause" />
+    <ref role="aqKnT" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
+    <node concept="3N5dw7" id="4nIWweBNZTx" role="3ft7WO">
+      <node concept="3N5aqt" id="4nIWweBNZTy" role="3Na0zg">
+        <node concept="3clFbS" id="4nIWweBNZTz" role="2VODD2">
+          <node concept="3cpWs8" id="4nIWweBO68o" role="3cqZAp">
+            <node concept="3cpWsn" id="4nIWweBO68p" role="3cpWs9">
+              <property role="TrG5h" value="clc" />
+              <node concept="3Tqbb2" id="4nIWweBO68m" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
+              </node>
+              <node concept="2ShNRf" id="4nIWweBO68q" role="33vP2m">
+                <node concept="3zrR0B" id="4nIWweBO68r" role="2ShVmc">
+                  <node concept="3Tqbb2" id="4nIWweBO68s" role="3zrR0E">
+                    <ref role="ehGHo" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="4nIWweBO5FV" role="3cqZAp">
+            <node concept="37vLTI" id="4nIWweBO74r" role="3clFbG">
+              <node concept="3N4pyC" id="4nIWweBO7dV" role="37vLTx" />
+              <node concept="2OqwBi" id="4nIWweBO6oc" role="37vLTJ">
+                <node concept="37vLTw" id="4nIWweBO68t" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4nIWweBO68p" resolve="clc" />
+                </node>
+                <node concept="3TrEf2" id="4nIWweBO6$V" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:20Ay2VefOBA" resolve="constraint" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="4nIWweBO7t$" role="3cqZAp">
+            <node concept="37vLTw" id="4nIWweBO7ty" role="3clFbG">
+              <ref role="3cqZAo" node="4nIWweBO68p" resolve="clc" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2kknPJ" id="4nIWweBNZXq" role="2klrvf">
+        <ref role="2ZyFGn" to="wq2x:6p0DfM0ajMA" resolve="AbstractConstraint" />
+      </node>
+    </node>
+  </node>
+  <node concept="3p36aQ" id="4nIWweBOqNz">
+    <property role="3GE5qa" value="rule.clause" />
+    <ref role="aqKnT" to="wq2x:20Ay2Vei7FH" resolve="TemplateLogicalClause" />
+    <node concept="3eGOop" id="4nIWweBOr4C" role="3ft7WO">
+      <node concept="ucgPf" id="4nIWweBOr4D" role="3aKz83">
+        <node concept="3clFbS" id="4nIWweBOr4E" role="2VODD2">
+          <node concept="3cpWs8" id="4nIWweBPhUX" role="3cqZAp">
+            <node concept="3cpWsn" id="4nIWweBPhUY" role="3cpWs9">
+              <property role="TrG5h" value="tlc" />
+              <node concept="3Tqbb2" id="4nIWweBPhUV" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:20Ay2Vei7FH" resolve="TemplateLogicalClause" />
+              </node>
+              <node concept="2ShNRf" id="4nIWweBPhUZ" role="33vP2m">
+                <node concept="3zrR0B" id="4nIWweBPhV0" role="2ShVmc">
+                  <node concept="3Tqbb2" id="4nIWweBPhV1" role="3zrR0E">
+                    <ref role="ehGHo" to="wq2x:20Ay2Vei7FH" resolve="TemplateLogicalClause" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="4nIWweBOrYW" role="3cqZAp">
+            <node concept="2OqwBi" id="4nIWweBPiW9" role="3clFbG">
+              <node concept="2OqwBi" id="4nIWweBPiiH" role="2Oq$k0">
+                <node concept="37vLTw" id="4nIWweBPhV2" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4nIWweBPhUY" resolve="tlc" />
+                </node>
+                <node concept="3TrEf2" id="4nIWweBPivv" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:20Ay2Vei7FI" resolve="code" />
+                </node>
+              </node>
+              <node concept="2DeJnY" id="4nIWweBPjCl" role="2OqNvi" />
+            </node>
+          </node>
+          <node concept="3clFbF" id="4nIWweBPjWy" role="3cqZAp">
+            <node concept="37vLTw" id="4nIWweBPjWw" role="3clFbG">
+              <ref role="3cqZAo" node="4nIWweBPhUY" resolve="tlc" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="16NL0t" id="4nIWweBP0mv" role="upBLP">
+        <node concept="2h3Zct" id="4nIWweBP0q$" role="16NL0q">
+          <property role="2h4Kg1" value="template clause" />
+        </node>
+      </node>
+      <node concept="16NfWO" id="4nIWweBOII2" role="upBLP">
+        <node concept="2h3Zct" id="4nIWweBOIU9" role="16NeZM">
+          <property role="2h4Kg1" value="%%" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="PKFIW" id="4nIWweBWmzT">
+    <property role="3GE5qa" value="rule" />
+    <property role="TrG5h" value="AbstractRule_contents" />
+    <ref role="1XX52x" to="wq2x:4EfgX2ET3GH" resolve="AbstractRule" />
+    <node concept="3EZMnI" id="4nIWweBWnbh" role="2wV5jI">
+      <node concept="3F0ifn" id="4nIWweBWnbi" role="3EZMnx">
+        <property role="3F0ifm" value="match:" />
+        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
+        <node concept="ljvvj" id="4nIWweBWnbj" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pkWqt" id="4nIWweBWnbk" role="pqm2j">
+          <node concept="3clFbS" id="4nIWweBWnbl" role="2VODD2">
+            <node concept="3clFbF" id="4nIWweBWnbm" role="3cqZAp">
+              <node concept="2OqwBi" id="4nIWweBWnbn" role="3clFbG">
+                <node concept="2OqwBi" id="4nIWweBWnbo" role="2Oq$k0">
+                  <node concept="pncrf" id="4nIWweBWnbp" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="4nIWweBWnbq" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:1ffsG7bCfL5" resolve="head" />
+                  </node>
+                </node>
+                <node concept="3GX2aA" id="4nIWweBWnbr" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3F2HdR" id="4nIWweBWnbs" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:1ffsG7bCfL5" resolve="head" />
+        <node concept="l2Vlx" id="4nIWweBWnbt" role="2czzBx" />
+        <node concept="lj46D" id="4nIWweBWnbu" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+          <node concept="3nzxsE" id="4nIWweBWnbv" role="3n$kyP">
+            <node concept="3clFbS" id="4nIWweBWnbw" role="2VODD2">
+              <node concept="3clFbF" id="4nIWweBWnbx" role="3cqZAp">
+                <node concept="2OqwBi" id="4nIWweBWnby" role="3clFbG">
+                  <node concept="2OqwBi" id="4nIWweBWnbz" role="2Oq$k0">
+                    <node concept="pncrf" id="4nIWweBWnb$" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="4nIWweBWnb_" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:1ffsG7bCfL5" resolve="head" />
+                    </node>
+                  </node>
+                  <node concept="3GX2aA" id="4nIWweBWnbA" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="ljvvj" id="4nIWweBWnbB" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="3F0ifn" id="4nIWweBWnbC" role="2czzBI">
+          <property role="3F0ifm" value="auto" />
+          <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
+          <node concept="Vb9p2" id="4nIWweBWnbD" role="3F10Kt">
+            <property role="Vbekb" value="BOLD" />
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="4nIWweBWnbE" role="3EZMnx">
+        <property role="3F0ifm" value="with guard:" />
+        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
+        <node concept="ljvvj" id="4nIWweBWnbF" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pkWqt" id="4nIWweBWnbG" role="pqm2j">
+          <node concept="3clFbS" id="4nIWweBWnbH" role="2VODD2">
+            <node concept="3clFbF" id="4nIWweBWnbI" role="3cqZAp">
+              <node concept="2OqwBi" id="4nIWweBWnbJ" role="3clFbG">
+                <node concept="2OqwBi" id="4nIWweBWnbK" role="2Oq$k0">
+                  <node concept="pncrf" id="4nIWweBWnbL" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="4nIWweBWnbM" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:1ffsG7bFM2v" resolve="guard" />
+                  </node>
+                </node>
+                <node concept="3GX2aA" id="4nIWweBWnbN" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="VPM3Z" id="4nIWweBWnbO" role="3F10Kt">
+        <property role="VOm3f" value="false" />
+      </node>
+      <node concept="3F2HdR" id="4nIWweBWnbP" role="3EZMnx">
+        <property role="2czwfO" value=" " />
+        <ref role="1NtTu8" to="wq2x:1ffsG7bFM2v" resolve="guard" />
+        <node concept="l2Vlx" id="4nIWweBWnbQ" role="2czzBx" />
+        <node concept="tppnM" id="4nIWweBWnbR" role="sWeuL">
+          <node concept="ljvvj" id="4nIWweBWnbS" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="lj46D" id="4nIWweBWnbT" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+          <node concept="3nzxsE" id="4nIWweBWnbU" role="3n$kyP">
+            <node concept="3clFbS" id="4nIWweBWnbV" role="2VODD2">
+              <node concept="3clFbF" id="4nIWweBWnbW" role="3cqZAp">
+                <node concept="2OqwBi" id="4nIWweBWnbX" role="3clFbG">
+                  <node concept="2OqwBi" id="4nIWweBWnbY" role="2Oq$k0">
+                    <node concept="pncrf" id="4nIWweBWnbZ" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="4nIWweBWnc0" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:1ffsG7bFM2v" resolve="guard" />
+                    </node>
+                  </node>
+                  <node concept="3GX2aA" id="4nIWweBWnc1" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="ljvvj" id="4nIWweBWnc2" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="3F0ifn" id="4nIWweBWnc3" role="2czzBI">
+          <property role="3F0ifm" value="unconditionally" />
+          <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
+          <node concept="Vb9p2" id="4nIWweBWnc4" role="3F10Kt">
+            <property role="Vbekb" value="BOLD" />
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="4nIWweBWnc5" role="3EZMnx">
+        <property role="3F0ifm" value="produce:" />
+        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
+        <node concept="ljvvj" id="4nIWweBWnc6" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pkWqt" id="4nIWweBWnc7" role="pqm2j">
+          <node concept="3clFbS" id="4nIWweBWnc8" role="2VODD2">
+            <node concept="3clFbF" id="4nIWweBWnc9" role="3cqZAp">
+              <node concept="2OqwBi" id="4nIWweBWnca" role="3clFbG">
+                <node concept="2OqwBi" id="4nIWweBWncb" role="2Oq$k0">
+                  <node concept="pncrf" id="4nIWweBWncc" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="4nIWweBWncd" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:1ffsG7bIxDv" resolve="body" />
+                  </node>
+                </node>
+                <node concept="3GX2aA" id="4nIWweBWnce" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3F2HdR" id="4nIWweBWncf" role="3EZMnx">
+        <property role="2czwfO" value="alternatively" />
+        <ref role="1NtTu8" to="wq2x:1ffsG7bIxDv" resolve="body" />
+        <node concept="l2Vlx" id="4nIWweBWncg" role="2czzBx" />
+        <node concept="tppnM" id="4nIWweBWnch" role="sWeuL">
+          <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
+          <node concept="ljvvj" id="4nIWweBWnci" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="lj46D" id="4nIWweBWncj" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+          <node concept="3nzxsE" id="4nIWweBWnck" role="3n$kyP">
+            <node concept="3clFbS" id="4nIWweBWncl" role="2VODD2">
+              <node concept="3clFbF" id="4nIWweBWncm" role="3cqZAp">
+                <node concept="2OqwBi" id="4nIWweBWncn" role="3clFbG">
+                  <node concept="2OqwBi" id="4nIWweBWnco" role="2Oq$k0">
+                    <node concept="pncrf" id="4nIWweBWncp" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="4nIWweBWncq" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:1ffsG7bIxDv" resolve="body" />
+                    </node>
+                  </node>
+                  <node concept="3GX2aA" id="4nIWweBWncr" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="ljvvj" id="4nIWweBWncs" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="3F0ifn" id="4nIWweBWnct" role="2czzBI">
+          <property role="3F0ifm" value="produce nothing" />
+          <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
+          <node concept="Vb9p2" id="4nIWweBWncu" role="3F10Kt">
+            <property role="Vbekb" value="BOLD" />
+          </node>
+        </node>
+      </node>
+      <node concept="l2Vlx" id="4nIWweBWncv" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
index 96d84ca4..1ffac6ca 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
@@ -17,7 +17,6 @@
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.typesystem2.structure)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="hy7p" ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.typesystem2.util)" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -25,10 +24,6 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
-      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
-      <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" />
@@ -62,19 +57,10 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
-        <child id="1081516765348" name="expression" index="3fr31v" />
-      </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </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="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
         <property id="6329021646629104958" name="text" index="3SKdUp" />
       </concept>
@@ -83,12 +69,6 @@
       </concept>
       <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">
-        <child id="1199569906740" name="parameter" index="1bW2Oz" />
-        <child id="1199569916463" name="body" index="1bW5cS" />
-      </concept>
-    </language>
     <language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions">
       <concept id="1192794744107" name="jetbrains.mps.lang.intentions.structure.IntentionDeclaration" flags="ig" index="2S6QgY" />
       <concept id="1192794782375" name="jetbrains.mps.lang.intentions.structure.DescriptionBlock" flags="in" index="2S6ZIM" />
@@ -96,7 +76,6 @@
       <concept id="1192795911897" name="jetbrains.mps.lang.intentions.structure.ExecuteBlock" flags="in" index="2Sbjvc" />
       <concept id="1192796902958" name="jetbrains.mps.lang.intentions.structure.ConceptFunctionParameter_node" flags="nn" index="2Sf5sV" />
       <concept id="2522969319638091381" name="jetbrains.mps.lang.intentions.structure.BaseIntentionDeclaration" flags="ig" index="2ZfUlf">
-        <property id="2522969319638091386" name="isAvailableInChildNodes" index="2ZfUl0" />
         <reference id="2522969319638198290" name="forConcept" index="2ZfgGC" />
         <child id="2522969319638198291" name="executeFunction" index="2ZfgGD" />
         <child id="2522969319638093995" name="isApplicableFunction" index="2ZfVeh" />
@@ -113,19 +92,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="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
-        <child id="1140725362529" name="linkTarget" index="2oxUTC" />
-      </concept>
-      <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC">
-        <reference id="1139880128956" name="concept" index="1A9B2P" />
-      </concept>
-      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
-        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
-      </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="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
@@ -148,17 +114,12 @@
       <concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
         <child id="1140131861877" name="replacementNode" index="1P9ThW" />
       </concept>
-      <concept id="1140133623887" name="jetbrains.mps.lang.smodel.structure.Node_DeleteOperation" flags="nn" index="1PgB_6" />
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <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">
@@ -169,17 +130,6 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </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="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
-    </language>
   </registry>
   <node concept="2S6QgY" id="1CgWc1TyAgc">
     <property role="TrG5h" value="AddComment" />
@@ -350,321 +300,5 @@
       </node>
     </node>
   </node>
-  <node concept="2S6QgY" id="20Ay2VeL1Cn">
-    <property role="TrG5h" value="ReplaceWithConstraintLogicalClause" />
-    <property role="2ZfUl0" value="true" />
-    <ref role="2ZfgGC" to="wq2x:6p0DfM0a3d3" resolve="RuleComponent" />
-    <node concept="2S6ZIM" id="20Ay2VeL1Co" role="2ZfVej">
-      <node concept="3clFbS" id="20Ay2VeL1Cp" role="2VODD2">
-        <node concept="3clFbF" id="20Ay2VeL1L$" role="3cqZAp">
-          <node concept="Xl_RD" id="20Ay2VeL1Lz" role="3clFbG">
-            <property role="Xl_RC" value="Replace With Modern Construct (ConstraintLogicalClause)" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2Sbjvc" id="20Ay2VeL1Cq" role="2ZfgGD">
-      <node concept="3clFbS" id="20Ay2VeL1Cr" role="2VODD2">
-        <node concept="3cpWs8" id="20Ay2VeLfRl" role="3cqZAp">
-          <node concept="3cpWsn" id="20Ay2VeLfRm" role="3cpWs9">
-            <property role="TrG5h" value="cl" />
-            <node concept="3Tqbb2" id="20Ay2VeLfRg" role="1tU5fm">
-              <ref role="ehGHo" to="wq2x:20Ay2VefOqC" resolve="LogicalClauseList" />
-            </node>
-            <node concept="2OqwBi" id="20Ay2VeLfRn" role="33vP2m">
-              <node concept="2OqwBi" id="20Ay2VeLfRo" role="2Oq$k0">
-                <node concept="2Sf5sV" id="20Ay2VeLfRp" role="2Oq$k0" />
-                <node concept="3TrEf2" id="20Ay2VeLfRq" role="2OqNvi">
-                  <ref role="3Tt5mk" to="wq2x:20Ay2VegCfd" resolve="logic" />
-                </node>
-              </node>
-              <node concept="zfrQC" id="20Ay2VeLz22" role="2OqNvi">
-                <ref role="1A9B2P" to="wq2x:20Ay2VefOqC" resolve="LogicalClauseList" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1DcWWT" id="20Ay2VeLkkV" role="3cqZAp">
-          <node concept="3clFbS" id="20Ay2VeLkkY" role="2LFqv$">
-            <node concept="3cpWs8" id="20Ay2VeLMbj" role="3cqZAp">
-              <node concept="3cpWsn" id="20Ay2VeLMbk" role="3cpWs9">
-                <property role="TrG5h" value="clc" />
-                <node concept="3Tqbb2" id="20Ay2VeLMbi" role="1tU5fm">
-                  <ref role="ehGHo" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
-                </node>
-                <node concept="2ShNRf" id="20Ay2VeLMbl" role="33vP2m">
-                  <node concept="3zrR0B" id="20Ay2VeLMbm" role="2ShVmc">
-                    <node concept="3Tqbb2" id="20Ay2VeLMbn" role="3zrR0E">
-                      <ref role="ehGHo" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="20Ay2VeLMCY" role="3cqZAp">
-              <node concept="2OqwBi" id="20Ay2VeLNu6" role="3clFbG">
-                <node concept="2OqwBi" id="20Ay2VeLN6t" role="2Oq$k0">
-                  <node concept="37vLTw" id="20Ay2VeLMYA" role="2Oq$k0">
-                    <ref role="3cqZAo" node="20Ay2VeLMbk" resolve="clc" />
-                  </node>
-                  <node concept="3TrEf2" id="20Ay2VeLNdX" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:20Ay2VefOBA" resolve="constraint" />
-                  </node>
-                </node>
-                <node concept="2oxUTD" id="20Ay2VeLNIW" role="2OqNvi">
-                  <node concept="2OqwBi" id="20Ay2VeLP8P" role="2oxUTC">
-                    <node concept="2OqwBi" id="20Ay2VeLO_e" role="2Oq$k0">
-                      <node concept="1PxgMI" id="20Ay2VeLOj$" role="2Oq$k0">
-                        <ref role="1m5ApE" to="wq2x:6p0DfM0a6KG" resolve="EmitConstraintStatement" />
-                        <node concept="37vLTw" id="20Ay2VeLNLk" role="1m5AlR">
-                          <ref role="3cqZAo" node="20Ay2VeLkkZ" resolve="stmt" />
-                        </node>
-                      </node>
-                      <node concept="3TrEf2" id="20Ay2VeLONk" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:6p0DfM0ajKO" resolve="constraint" />
-                      </node>
-                    </node>
-                    <node concept="3YRAZt" id="20Ay2VeLPsW" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="20Ay2VeLMpx" role="3cqZAp">
-              <node concept="2OqwBi" id="20Ay2VeLMpz" role="3clFbG">
-                <node concept="2OqwBi" id="20Ay2VeLMp$" role="2Oq$k0">
-                  <node concept="37vLTw" id="20Ay2VeLMp_" role="2Oq$k0">
-                    <ref role="3cqZAo" node="20Ay2VeLfRm" resolve="cl" />
-                  </node>
-                  <node concept="3Tsc0h" id="20Ay2VeLMpA" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:20Ay2VefOqD" resolve="clauses" />
-                  </node>
-                </node>
-                <node concept="TSZUe" id="20Ay2VeLMpB" role="2OqNvi">
-                  <node concept="37vLTw" id="20Ay2VeLMpC" role="25WWJ7">
-                    <ref role="3cqZAo" node="20Ay2VeLMbk" resolve="clc" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="20Ay2VeLkkZ" role="1Duv9x">
-            <property role="TrG5h" value="stmt" />
-            <node concept="3Tqbb2" id="20Ay2VeLm0n" role="1tU5fm">
-              <ref role="ehGHo" to="tpee:fzclF8l" resolve="Statement" />
-            </node>
-          </node>
-          <node concept="2OqwBi" id="20Ay2VeLkl4" role="1DdaDG">
-            <node concept="2OqwBi" id="20Ay2VeLkl5" role="2Oq$k0">
-              <node concept="2Sf5sV" id="20Ay2VeLkl6" role="2Oq$k0" />
-              <node concept="3TrEf2" id="20Ay2VeLkl7" role="2OqNvi">
-                <ref role="3Tt5mk" to="wq2x:6p0DfM0a5m9" resolve="code" />
-              </node>
-            </node>
-            <node concept="3Tsc0h" id="20Ay2VeLkl8" role="2OqNvi">
-              <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="20Ay2VeLRoK" role="3cqZAp">
-          <node concept="2OqwBi" id="20Ay2VeLTVj" role="3clFbG">
-            <node concept="2OqwBi" id="20Ay2VeLT65" role="2Oq$k0">
-              <node concept="2Sf5sV" id="20Ay2VeLRoI" role="2Oq$k0" />
-              <node concept="3TrEf2" id="20Ay2VeLTAp" role="2OqNvi">
-                <ref role="3Tt5mk" to="wq2x:6p0DfM0a5m9" resolve="code" />
-              </node>
-            </node>
-            <node concept="1PgB_6" id="20Ay2VeLUv5" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2SaL7w" id="20Ay2VeL4ap" role="2ZfVeh">
-      <node concept="3clFbS" id="20Ay2VeL4aq" role="2VODD2">
-        <node concept="3clFbF" id="20Ay2VeL4hA" role="3cqZAp">
-          <node concept="1Wc70l" id="20Ay2VeLbef" role="3clFbG">
-            <node concept="2OqwBi" id="20Ay2VeLc$w" role="3uHU7B">
-              <node concept="2OqwBi" id="20Ay2VeLbOV" role="2Oq$k0">
-                <node concept="2Sf5sV" id="20Ay2VeLbAO" role="2Oq$k0" />
-                <node concept="3TrEf2" id="20Ay2VeLca$" role="2OqNvi">
-                  <ref role="3Tt5mk" to="wq2x:6p0DfM0a5m9" resolve="code" />
-                </node>
-              </node>
-              <node concept="3x8VRR" id="20Ay2VeLdnR" role="2OqNvi" />
-            </node>
-            <node concept="2OqwBi" id="20Ay2VeL8zb" role="3uHU7w">
-              <node concept="2OqwBi" id="20Ay2VeL55M" role="2Oq$k0">
-                <node concept="2OqwBi" id="20Ay2VeL4uz" role="2Oq$k0">
-                  <node concept="2Sf5sV" id="20Ay2VeL4h_" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="20Ay2VeL4H0" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:6p0DfM0a5m9" resolve="code" />
-                  </node>
-                </node>
-                <node concept="3Tsc0h" id="20Ay2VeL5Kq" role="2OqNvi">
-                  <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                </node>
-              </node>
-              <node concept="2HxqBE" id="20Ay2VeLahb" role="2OqNvi">
-                <node concept="1bVj0M" id="20Ay2VeLahd" role="23t8la">
-                  <node concept="3clFbS" id="20Ay2VeLahe" role="1bW5cS">
-                    <node concept="3clFbF" id="20Ay2VeLa$L" role="3cqZAp">
-                      <node concept="2OqwBi" id="20Ay2VeLaQ8" role="3clFbG">
-                        <node concept="37vLTw" id="20Ay2VeLa$K" role="2Oq$k0">
-                          <ref role="3cqZAo" node="20Ay2VeLahf" resolve="it" />
-                        </node>
-                        <node concept="1mIQ4w" id="20Ay2VeLdK2" role="2OqNvi">
-                          <node concept="chp4Y" id="20Ay2VeLe5e" role="cj9EA">
-                            <ref role="cht4Q" to="wq2x:6p0DfM0a6KG" resolve="EmitConstraintStatement" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="Rh6nW" id="20Ay2VeLahf" role="1bW2Oz">
-                    <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="20Ay2VeLahg" role="1tU5fm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="2S6QgY" id="20Ay2VeLZGB">
-    <property role="TrG5h" value="ReplaceWithTemplateLogicalClause" />
-    <property role="2ZfUl0" value="true" />
-    <ref role="2ZfgGC" to="wq2x:6p0DfM0a3d3" resolve="RuleComponent" />
-    <node concept="2S6ZIM" id="20Ay2VeLZGC" role="2ZfVej">
-      <node concept="3clFbS" id="20Ay2VeLZGD" role="2VODD2">
-        <node concept="3clFbF" id="20Ay2VeLZPE" role="3cqZAp">
-          <node concept="Xl_RD" id="20Ay2VeLZPD" role="3clFbG">
-            <property role="Xl_RC" value="Replace With Modern Construct (TemplateLogicalClause)" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2Sbjvc" id="20Ay2VeLZGE" role="2ZfgGD">
-      <node concept="3clFbS" id="20Ay2VeLZGF" role="2VODD2">
-        <node concept="3cpWs8" id="20Ay2VeMkm1" role="3cqZAp">
-          <node concept="3cpWsn" id="20Ay2VeMkm2" role="3cpWs9">
-            <property role="TrG5h" value="lcl" />
-            <node concept="3Tqbb2" id="20Ay2VeMklY" role="1tU5fm">
-              <ref role="ehGHo" to="wq2x:20Ay2VefOqC" resolve="LogicalClauseList" />
-            </node>
-            <node concept="2OqwBi" id="20Ay2VeMkm3" role="33vP2m">
-              <node concept="2OqwBi" id="20Ay2VeMkm4" role="2Oq$k0">
-                <node concept="2Sf5sV" id="20Ay2VeMkm5" role="2Oq$k0" />
-                <node concept="3TrEf2" id="20Ay2VeMkm6" role="2OqNvi">
-                  <ref role="3Tt5mk" to="wq2x:20Ay2VegCfd" resolve="logic" />
-                </node>
-              </node>
-              <node concept="zfrQC" id="20Ay2VeMkm7" role="2OqNvi">
-                <ref role="1A9B2P" to="wq2x:20Ay2VefOqC" resolve="LogicalClauseList" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="20Ay2VeMpaH" role="3cqZAp">
-          <node concept="3cpWsn" id="20Ay2VeMpaI" role="3cpWs9">
-            <property role="TrG5h" value="tlc" />
-            <node concept="3Tqbb2" id="20Ay2VeMpaB" role="1tU5fm">
-              <ref role="ehGHo" to="wq2x:20Ay2Vei7FH" resolve="TemplateLogicalClause" />
-            </node>
-            <node concept="2OqwBi" id="20Ay2VeMpaJ" role="33vP2m">
-              <node concept="2OqwBi" id="20Ay2VeMpaK" role="2Oq$k0">
-                <node concept="37vLTw" id="20Ay2VeMpaL" role="2Oq$k0">
-                  <ref role="3cqZAo" node="20Ay2VeMkm2" resolve="lcl" />
-                </node>
-                <node concept="3Tsc0h" id="20Ay2VeMpaM" role="2OqNvi">
-                  <ref role="3TtcxE" to="wq2x:20Ay2VefOqD" resolve="clauses" />
-                </node>
-              </node>
-              <node concept="WFELt" id="20Ay2VeMpaN" role="2OqNvi">
-                <ref role="1A0vxQ" to="wq2x:20Ay2Vei7FH" resolve="TemplateLogicalClause" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="20Ay2VeMjdo" role="3cqZAp">
-          <node concept="2OqwBi" id="20Ay2VeMqce" role="3clFbG">
-            <node concept="2OqwBi" id="20Ay2VeMpJS" role="2Oq$k0">
-              <node concept="37vLTw" id="20Ay2VeMpaO" role="2Oq$k0">
-                <ref role="3cqZAo" node="20Ay2VeMpaI" resolve="tlc" />
-              </node>
-              <node concept="3TrEf2" id="20Ay2VeMpRn" role="2OqNvi">
-                <ref role="3Tt5mk" to="wq2x:20Ay2Vei7FI" resolve="code" />
-              </node>
-            </node>
-            <node concept="2oxUTD" id="20Ay2VeMqvv" role="2OqNvi">
-              <node concept="2OqwBi" id="20Ay2VeMraw" role="2oxUTC">
-                <node concept="2OqwBi" id="20Ay2VeMqJL" role="2Oq$k0">
-                  <node concept="2Sf5sV" id="20Ay2VeMqyM" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="20Ay2VeMqRr" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:6p0DfM0a5m9" resolve="code" />
-                  </node>
-                </node>
-                <node concept="3YRAZt" id="20Ay2VeMrL9" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2SaL7w" id="20Ay2VeM2ev" role="2ZfVeh">
-      <node concept="3clFbS" id="20Ay2VeM2ew" role="2VODD2">
-        <node concept="3clFbF" id="20Ay2VeM2lG" role="3cqZAp">
-          <node concept="1Wc70l" id="20Ay2VeM5Ca" role="3clFbG">
-            <node concept="3fqX7Q" id="20Ay2VeMizV" role="3uHU7w">
-              <node concept="2OqwBi" id="20Ay2VeMizX" role="3fr31v">
-                <node concept="2OqwBi" id="20Ay2VeMizY" role="2Oq$k0">
-                  <node concept="2OqwBi" id="20Ay2VeMizZ" role="2Oq$k0">
-                    <node concept="2Sf5sV" id="20Ay2VeMi$0" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="20Ay2VeMi$1" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:6p0DfM0a5m9" resolve="code" />
-                    </node>
-                  </node>
-                  <node concept="3Tsc0h" id="20Ay2VeMi$2" role="2OqNvi">
-                    <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                  </node>
-                </node>
-                <node concept="2HxqBE" id="20Ay2VeMi$3" role="2OqNvi">
-                  <node concept="1bVj0M" id="20Ay2VeMi$4" role="23t8la">
-                    <node concept="3clFbS" id="20Ay2VeMi$5" role="1bW5cS">
-                      <node concept="3clFbF" id="20Ay2VeMi$6" role="3cqZAp">
-                        <node concept="2OqwBi" id="20Ay2VeMi$7" role="3clFbG">
-                          <node concept="37vLTw" id="20Ay2VeMi$8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="20Ay2VeMi$b" resolve="it" />
-                          </node>
-                          <node concept="1mIQ4w" id="20Ay2VeMi$9" role="2OqNvi">
-                            <node concept="chp4Y" id="20Ay2VeMi$a" role="cj9EA">
-                              <ref role="cht4Q" to="wq2x:6p0DfM0a6KG" resolve="EmitConstraintStatement" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="20Ay2VeMi$b" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="20Ay2VeMi$c" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="20Ay2VeM5Ce" role="3uHU7B">
-              <node concept="2OqwBi" id="20Ay2VeM5Cf" role="2Oq$k0">
-                <node concept="2Sf5sV" id="20Ay2VeM5Cg" role="2Oq$k0" />
-                <node concept="3TrEf2" id="20Ay2VeM5Ch" role="2OqNvi">
-                  <ref role="3Tt5mk" to="wq2x:6p0DfM0a5m9" resolve="code" />
-                </node>
-              </node>
-              <node concept="3x8VRR" id="20Ay2VeM5Ci" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index e9c87f65..4d81bd10 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -140,13 +140,6 @@
     <property role="R5$K2" value="false" />
     <property role="EcuMT" value="7368070394766963523" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="6p0DfM0a5m9" role="1TKVEi">
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="code" />
-      <property role="20lbJX" value="0..1" />
-      <property role="IQ2ns" value="7368070394766972297" />
-      <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
-    </node>
     <node concept="PrWs8" id="3PWU9gizUQY" role="PzmwI">
       <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
     </node>
@@ -161,6 +154,7 @@
       <property role="IQ2ns" value="2316688792939037645" />
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="logic" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="20Ay2VefOqC" resolve="LogicalClauseList" />
     </node>
   </node>
@@ -351,23 +345,13 @@
       <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     </node>
   </node>
-  <node concept="1TIwiD" id="2E5lcNn5kn6">
-    <property role="3GE5qa" value="constraint.variable" />
-    <property role="TrG5h" value="ParameterDeclarationStatement" />
-    <property role="34LRSv" value="parameter" />
-    <property role="EcuMT" value="3063948360254047686" />
-    <ref role="1TJDcQ" node="2E5lcNn8iYG" resolve="LogicVariableDeclarationStatement" />
-    <node concept="PrWs8" id="7ksQUDZoqiE" role="PzmwI">
-      <ref role="PrY4T" to="tpck:1_TrU5E6oyb" resolve="IDontSubstituteByDefault" />
-    </node>
-    <node concept="asaX9" id="7km57Pk838H" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="2E5lcNn5Ub2">
     <property role="3GE5qa" value="constraint.variable" />
     <property role="TrG5h" value="LocalDeclarationStatement" />
     <property role="34LRSv" value="local" />
     <property role="EcuMT" value="3063948360254202562" />
     <ref role="1TJDcQ" node="2E5lcNn8iYG" resolve="LogicVariableDeclarationStatement" />
+    <node concept="asaX9" id="4nIWweBB$7z" role="lGtFl" />
   </node>
   <node concept="1TIwiD" id="2E5lcNn8iYG">
     <property role="3GE5qa" value="constraint.variable" />
@@ -567,13 +551,6 @@
       <property role="IQ2ns" value="7509376976633120254" />
       <ref role="20lvS9" node="1zN1RIkQtcr" resolve="BoundParameterBlock" />
     </node>
-    <node concept="1TJgyj" id="1ffsG7bnJXK" role="1TKVEi">
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="applyCondition" />
-      <property role="IQ2ns" value="1427485783565991792" />
-      <ref role="20lvS9" node="4laj_h9P4cy" resolve="Condition" />
-      <node concept="asaX9" id="3KXGt7WSRHz" role="lGtFl" />
-    </node>
     <node concept="1TJgyj" id="1ffsG7bCfL5" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="head" />
@@ -800,22 +777,6 @@
       <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
     </node>
-    <node concept="1TJgyj" id="1pPth$m5BbA" role="1TKVEi">
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="term" />
-      <property role="20lbJX" value="0..1" />
-      <property role="IQ2ns" value="1618328391714763494" />
-      <ref role="20lvS9" node="1pPth$m5o9D" resolve="TypeTermTemplate" />
-      <node concept="asaX9" id="4MEOIDFRaM8" role="lGtFl" />
-    </node>
-    <node concept="1TJgyj" id="2V8TwD0$Z8f" role="1TKVEi">
-      <property role="IQ2ns" value="3371197252794315279" />
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="recovery" />
-      <property role="20lbJX" value="0..1" />
-      <ref role="20lvS9" node="2V8TwD0$Yds" resolve="RecoveryBlock" />
-      <node concept="asaX9" id="euG2bFCwYA" role="lGtFl" />
-    </node>
     <node concept="PrWs8" id="1pPth$m5Bb$" role="PzmwI">
       <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
     </node>
@@ -1026,27 +987,6 @@
       <ref role="PrY4T" to="tpck:1_TrU5E6oyb" resolve="IDontSubstituteByDefault" />
     </node>
   </node>
-  <node concept="1TIwiD" id="7IysFeA4qCy">
-    <property role="EcuMT" value="8908809128803150370" />
-    <property role="3GE5qa" value="constraint.typespecific" />
-    <property role="TrG5h" value="NewTypeParameterBinding" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="7IysFeA4qC_" role="1TKVEi">
-      <property role="IQ2ns" value="8908809128803150373" />
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="value" />
-      <property role="20lbJX" value="1" />
-      <ref role="20lvS9" to="5j4j:7E86$tKskWj" resolve="LogicalValue" />
-    </node>
-    <node concept="1TJgyj" id="7IysFeA4qCz" role="1TKVEi">
-      <property role="IQ2ns" value="8908809128803150371" />
-      <property role="20lmBu" value="reference" />
-      <property role="20lbJX" value="1" />
-      <property role="20kJfa" value="parameter" />
-      <ref role="20lvS9" node="7IysFeA0yb0" resolve="TypeDeclarationParameter" />
-    </node>
-    <node concept="asaX9" id="4MEOIDFsyAO" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="7IysFeA5Lco">
     <property role="EcuMT" value="8908809128803504920" />
     <property role="3GE5qa" value="type.code" />
@@ -1240,38 +1180,6 @@
       <ref role="20lvS9" to="5j4j:5lJXKARS0" resolve="TreeForm" />
     </node>
   </node>
-  <node concept="1TIwiD" id="2V8TwD0$Yds">
-    <property role="EcuMT" value="3371197252794311516" />
-    <property role="3GE5qa" value="type.code" />
-    <property role="TrG5h" value="RecoveryBlock" />
-    <ref role="1TJDcQ" node="1hX44vMFoce" resolve="CodeBlock" />
-    <node concept="asaX9" id="euG2bFCwYC" role="lGtFl" />
-  </node>
-  <node concept="1TIwiD" id="2V8TwD0E9Wq">
-    <property role="EcuMT" value="3371197252795670298" />
-    <property role="3GE5qa" value="type.term" />
-    <property role="TrG5h" value="TypeFeatureExpression" />
-    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
-    <node concept="1TJgyj" id="2V8TwD0E9Wr" role="1TKVEi">
-      <property role="IQ2ns" value="3371197252795670299" />
-      <property role="20lmBu" value="reference" />
-      <property role="20kJfa" value="feature" />
-      <property role="20lbJX" value="1" />
-      <ref role="20lvS9" node="1pPth$m5oa5" resolve="TypeFeature" />
-    </node>
-    <node concept="asaX9" id="euG2bFwcwG" role="lGtFl" />
-  </node>
-  <node concept="1TIwiD" id="2V8TwD148$8">
-    <property role="EcuMT" value="3371197252802480392" />
-    <property role="3GE5qa" value="type.term" />
-    <property role="TrG5h" value="RecoverOperation" />
-    <property role="34LRSv" value="recover" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="PrWs8" id="2V8TwD148BA" role="PzmwI">
-      <ref role="PrY4T" to="tpee:hqOqG0K" resolve="IOperation" />
-    </node>
-    <node concept="asaX9" id="euG2bFw8r2" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="7rf49Ngk1cK">
     <property role="EcuMT" value="8561079682350453552" />
     <property role="3GE5qa" value="constraint" />
@@ -1381,38 +1289,6 @@
       <ref role="PrY4T" to="tpee:SORzhOp6jM" resolve="IVariableReference" />
     </node>
   </node>
-  <node concept="1TIwiD" id="7eGEHDlgPU1">
-    <property role="TrG5h" value="NewTypeConstraint" />
-    <property role="3GE5qa" value="constraint.typespecific" />
-    <property role="34LRSv" value="new type (deprecated)" />
-    <property role="EcuMT" value="8335224865066016385" />
-    <ref role="1TJDcQ" node="18kNIl0mxXI" resolve="PseudoConstraint" />
-    <node concept="1TJgyj" id="YGS68N6UU4" role="1TKVEi">
-      <property role="20lmBu" value="reference" />
-      <property role="20kJfa" value="typeDeclaration" />
-      <property role="20lbJX" value="1" />
-      <property role="IQ2ns" value="1129524318932020868" />
-      <ref role="20lvS9" node="1pPth$m5Bbz" resolve="TypeDeclaration" />
-    </node>
-    <node concept="1TJgyj" id="6p0DfM0gdsG" role="1TKVEi">
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="typeVar" />
-      <property role="20lbJX" value="1" />
-      <property role="IQ2ns" value="7368070394768578348" />
-      <ref role="20lvS9" to="5j4j:7E86$tKsHeX" resolve="AbstractLogicalVariable" />
-    </node>
-    <node concept="1TJgyj" id="6p0DfM0gSN1" role="1TKVEi">
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="argument" />
-      <property role="20lbJX" value="0..n" />
-      <property role="IQ2ns" value="7368070394768755905" />
-      <ref role="20lvS9" node="7IysFeA4qCy" resolve="NewTypeParameterBinding" />
-    </node>
-    <node concept="PrWs8" id="4MEOIDGwNay" role="PzmwI">
-      <ref role="PrY4T" node="1L74NXEmF9t" resolve="TypeInvocation" />
-    </node>
-    <node concept="asaX9" id="4MEOIDFfpT7" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="20Ay2VefOqC">
     <property role="EcuMT" value="2316688792938825384" />
     <property role="3GE5qa" value="rule.clause" />
@@ -1460,19 +1336,6 @@
       <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
     </node>
   </node>
-  <node concept="1TIwiD" id="20Ay2VepLqo">
-    <property role="EcuMT" value="2316688792941434520" />
-    <property role="3GE5qa" value="rule.clause" />
-    <property role="TrG5h" value="CodeLogicalClause" />
-    <ref role="1TJDcQ" node="20Ay2VefOqF" resolve="LogicalClause" />
-    <node concept="1TJgyj" id="20Ay2VepLqp" role="1TKVEi">
-      <property role="IQ2ns" value="2316688792941434521" />
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="code" />
-      <property role="20lbJX" value="1" />
-      <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="1CcQBrQdzwG">
     <property role="EcuMT" value="1877115349178398764" />
     <property role="3GE5qa" value="constraint" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
index ef7bbe1e..62608de4 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
@@ -53,7 +53,6 @@
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -172,7 +171,6 @@
         <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="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
@@ -189,10 +187,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="6039268229364358244" name="jetbrains.mps.lang.smodel.structure.ExactConceptCase" flags="ng" index="1pnPoh">
-        <child id="6039268229364358388" name="body" index="1pnPq1" />
-        <child id="6039268229364358387" name="concept" index="1pnPq6" />
-      </concept>
       <concept id="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" />
@@ -200,11 +194,6 @@
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
-      <concept id="5944356402132808749" name="jetbrains.mps.lang.smodel.structure.ConceptSwitchStatement" flags="nn" index="1_3QMa">
-        <child id="6039268229365417680" name="defaultBlock" index="1prKM_" />
-        <child id="5944356402132808753" name="case" index="1_3QMm" />
-        <child id="5944356402132808752" name="expression" index="1_3QMn" />
-      </concept>
       <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
         <reference id="1219352800908" name="referentNode" index="3B5MYn" />
       </concept>
@@ -1395,160 +1384,6 @@
       <ref role="1YaFvo" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
     </node>
   </node>
-  <node concept="1YbPZF" id="2V8TwD0F1h0">
-    <property role="TrG5h" value="typeof_TypeFeatureExpression" />
-    <property role="3GE5qa" value="type.term" />
-    <node concept="3clFbS" id="2V8TwD0F1h1" role="18ibNy">
-      <node concept="1_3QMa" id="2L20jGt9_kt" role="3cqZAp">
-        <node concept="1pnPoh" id="2L20jGt9_A0" role="1_3QMm">
-          <node concept="3gn64h" id="2L20jGt9_A9" role="1pnPq6">
-            <ref role="3gnhBz" to="wq2x:1pPth$m5oae" resolve="StringTypeFeature" />
-          </node>
-          <node concept="3clFbS" id="2L20jGt9_A4" role="1pnPq1">
-            <node concept="1Z5TYs" id="2V8TwD0F1t5" role="3cqZAp">
-              <node concept="mw_s8" id="2V8TwD0F1tp" role="1ZfhKB">
-                <node concept="2c44tf" id="2V8TwD0F1tl" role="mwGJk">
-                  <node concept="17QB3L" id="2V8TwD0F1tJ" role="2c44tc" />
-                </node>
-              </node>
-              <node concept="mw_s8" id="2V8TwD0F1t8" role="1ZfhK$">
-                <node concept="1Z2H0r" id="2V8TwD0F1j3" role="mwGJk">
-                  <node concept="1YBJjd" id="2V8TwD0F1ms" role="1Z2MuG">
-                    <ref role="1YBMHb" node="2V8TwD0F1h3" resolve="tfe" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="2L20jGt9_M8" role="3cqZAp" />
-          </node>
-        </node>
-        <node concept="1pnPoh" id="2L20jGt9_Ac" role="1_3QMm">
-          <node concept="3gn64h" id="2L20jGt9_Al" role="1pnPq6">
-            <ref role="3gnhBz" to="wq2x:1pPth$m5oaG" resolve="ReferenceTypeFeature" />
-          </node>
-          <node concept="3clFbS" id="2L20jGt9_Ae" role="1pnPq1">
-            <node concept="1Z5TYs" id="2L20jGt9_Mq" role="3cqZAp">
-              <node concept="mw_s8" id="2L20jGt9_Mr" role="1ZfhKB">
-                <node concept="2c44tf" id="2L20jGt9_Ms" role="mwGJk">
-                  <node concept="17QB3L" id="2L20jGt9_R$" role="2c44tc" />
-                </node>
-              </node>
-              <node concept="mw_s8" id="2L20jGt9_Mu" role="1ZfhK$">
-                <node concept="1Z2H0r" id="2L20jGt9_Mv" role="mwGJk">
-                  <node concept="1YBJjd" id="2L20jGt9_Mw" role="1Z2MuG">
-                    <ref role="1YBMHb" node="2V8TwD0F1h3" resolve="tfe" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="2L20jGt9_R8" role="3cqZAp" />
-          </node>
-        </node>
-        <node concept="1pnPoh" id="2L20jGt9_Ao" role="1_3QMm">
-          <node concept="3gn64h" id="2L20jGt9_A$" role="1pnPq6">
-            <ref role="3gnhBz" to="wq2x:1pPth$m5oaL" resolve="ChildTypeFeature" />
-          </node>
-          <node concept="3clFbS" id="2L20jGt9_Aq" role="1pnPq1">
-            <node concept="1Z5TYs" id="2L20jGt9_S2" role="3cqZAp">
-              <node concept="mw_s8" id="2L20jGt9_S3" role="1ZfhKB">
-                <node concept="2c44tf" id="2L20jGt9_S4" role="mwGJk">
-                  <node concept="3uibUv" id="2L20jGt9BM6" role="2c44tc">
-                    <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
-                  </node>
-                </node>
-              </node>
-              <node concept="mw_s8" id="2L20jGt9_S6" role="1ZfhK$">
-                <node concept="1Z2H0r" id="2L20jGt9_S7" role="mwGJk">
-                  <node concept="1YBJjd" id="2L20jGt9_S8" role="1Z2MuG">
-                    <ref role="1YBMHb" node="2V8TwD0F1h3" resolve="tfe" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="2L20jGt9A09" role="3cqZAp" />
-          </node>
-        </node>
-        <node concept="1pnPoh" id="2L20jGt9_AB" role="1_3QMm">
-          <node concept="3gn64h" id="2L20jGt9_AQ" role="1pnPq6">
-            <ref role="3gnhBz" to="wq2x:1pPth$m5oa6" resolve="ListTypeFeature" />
-          </node>
-          <node concept="3clFbS" id="2L20jGt9_AD" role="1pnPq1">
-            <node concept="1Z5TYs" id="2L20jGt9BMQ" role="3cqZAp">
-              <node concept="mw_s8" id="2L20jGt9BMR" role="1ZfhKB">
-                <node concept="2c44tf" id="2L20jGt9BMS" role="mwGJk">
-                  <node concept="3uibUv" id="2L20jGt9BTZ" role="2c44tc">
-                    <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-                  </node>
-                </node>
-              </node>
-              <node concept="mw_s8" id="2L20jGt9BMU" role="1ZfhK$">
-                <node concept="1Z2H0r" id="2L20jGt9BMV" role="mwGJk">
-                  <node concept="1YBJjd" id="2L20jGt9BMW" role="1Z2MuG">
-                    <ref role="1YBMHb" node="2V8TwD0F1h3" resolve="tfe" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="2L20jGt9BTQ" role="3cqZAp" />
-          </node>
-        </node>
-        <node concept="2OqwBi" id="2L20jGt9ChA" role="1_3QMn">
-          <node concept="2OqwBi" id="2L20jGt9_sg" role="2Oq$k0">
-            <node concept="1YBJjd" id="2L20jGt9_kG" role="2Oq$k0">
-              <ref role="1YBMHb" node="2V8TwD0F1h3" resolve="tfe" />
-            </node>
-            <node concept="3TrEf2" id="2L20jGt9_zW" role="2OqNvi">
-              <ref role="3Tt5mk" to="wq2x:2V8TwD0E9Wr" resolve="feature" />
-            </node>
-          </node>
-          <node concept="2yIwOk" id="2L20jGt9CCq" role="2OqNvi" />
-        </node>
-        <node concept="3clFbS" id="2L20jGt9CDC" role="1prKM_">
-          <node concept="2MkqsV" id="2L20jGt9CDE" role="3cqZAp">
-            <node concept="Xl_RD" id="2L20jGt9CDQ" role="2MkJ7o">
-              <property role="Xl_RC" value="unsupported concept" />
-            </node>
-            <node concept="2OqwBi" id="2L20jGt9CMj" role="2OEOjV">
-              <node concept="1YBJjd" id="2L20jGt9CEm" role="2Oq$k0">
-                <ref role="1YBMHb" node="2V8TwD0F1h3" resolve="tfe" />
-              </node>
-              <node concept="3TrEf2" id="2L20jGt9CWY" role="2OqNvi">
-                <ref role="3Tt5mk" to="wq2x:2V8TwD0E9Wr" resolve="feature" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="2V8TwD0F1h3" role="1YuTPh">
-      <property role="TrG5h" value="tfe" />
-      <ref role="1YaFvo" to="wq2x:2V8TwD0E9Wq" resolve="TypeFeatureExpression" />
-    </node>
-  </node>
-  <node concept="1YbPZF" id="4cKdPpqE8LC">
-    <property role="TrG5h" value="typeof_RecoverOperation" />
-    <property role="3GE5qa" value="type.term" />
-    <node concept="3clFbS" id="4cKdPpqE8LD" role="18ibNy">
-      <node concept="1Z5TYs" id="4cKdPpqE8Ui" role="3cqZAp">
-        <node concept="mw_s8" id="4cKdPpqE8UA" role="1ZfhKB">
-          <node concept="2c44tf" id="4cKdPpqE8Uy" role="mwGJk">
-            <node concept="3Tqbb2" id="4cKdPpqE8UW" role="2c44tc" />
-          </node>
-        </node>
-        <node concept="mw_s8" id="4cKdPpqE8Ul" role="1ZfhK$">
-          <node concept="1Z2H0r" id="4cKdPpqE8LM" role="mwGJk">
-            <node concept="1YBJjd" id="4cKdPpqE8Ny" role="1Z2MuG">
-              <ref role="1YBMHb" node="4cKdPpqE8LF" resolve="ro" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="4cKdPpqE8LF" role="1YuTPh">
-      <property role="TrG5h" value="ro" />
-      <ref role="1YaFvo" to="wq2x:2V8TwD148$8" resolve="RecoverOperation" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="4MEOIDFzuUN">
     <property role="TrG5h" value="typeof_TypeTermDeclarationParameterReference" />
     <property role="3GE5qa" value="type.term" />