From f9eb52a60f131ae71e0fc1ef0b080c5c37570da8 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Tue, 26 Jul 2022 13:10:12 +0200
Subject: [PATCH] Introduce checkpoint for typechecking "strut" templates

The templates that typechecking relies upon are generated
into the user model as synthetic constructs. These later
need to be discovered by the generator to establish
correct references.
---
 ...ps.lang.typechecking.generator.genutil.mps |  623 +++++++
 .../generator/template/main@generator.mps     | 1537 ++++++++++++-----
 .../jetbrains.mps.lang.typechecking.mpl       |    4 +-
 ....lang.descriptor.aspects.types@genplan.mps |   23 +
 4 files changed, 1767 insertions(+), 420 deletions(-)
 create mode 100644 coderules/languages/jetbrains.mps.lang.typechecking/generator/template/jetbrains.mps.lang.typechecking.generator.genutil.mps

diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/jetbrains.mps.lang.typechecking.generator.genutil.mps b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/jetbrains.mps.lang.typechecking.generator.genutil.mps
new file mode 100644
index 00000000..3b1b754f
--- /dev/null
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/jetbrains.mps.lang.typechecking.generator.genutil.mps
@@ -0,0 +1,623 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:54f00056-a241-4baf-a6f7-ba1fb6ac89f4(jetbrains.mps.lang.typechecking.generator.genutil)">
+  <persistence version="9" />
+  <languages>
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
+    <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.coderules.structure)" />
+    <import index="zfi7" ref="r:39840d4e-f61c-4452-88c5-75b1eb10e892(jetbrains.mps.lang.typechecking.structure)" />
+    <import index="osbg" ref="r:38071b08-e9ac-4ec1-a326-62b7897beb22(main@generator)" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
+  </imports>
+  <registry>
+    <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="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
+      <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="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <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="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
+      <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="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+    </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="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
+      <concept id="1216860049622" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOutputByLabel" flags="nn" index="1iwH7d">
+        <reference id="1216860049623" name="label" index="1iwH7c" />
+        <child id="6851978633175404162" name="forModel" index="DUT31" />
+      </concept>
+      <concept id="1216860049633" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextType" flags="in" index="1iwH7U" />
+      <concept id="1217004708011" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetInputModel" flags="nn" index="1r8y6K" />
+      <concept id="1217026863835" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOriginalInputModel" flags="nn" index="1st3f0" />
+    </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="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
+      </concept>
+      <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
+      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
+        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
+      </concept>
+      <concept id="1176109685393" name="jetbrains.mps.lang.smodel.structure.Model_RootsIncludingImportedOperation" flags="nn" index="3lApI0">
+        <child id="6750920497477143611" name="conceptArgument" index="3MHPDn" />
+      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
+        <property id="1238684351431" name="asCast" index="1BlNFB" />
+      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
+      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
+        <reference id="1138056395725" name="property" index="3TsBF5" />
+      </concept>
+      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
+        <reference id="1138056546658" name="link" index="3TtcxE" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <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="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+      <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
+    </language>
+  </registry>
+  <node concept="312cEu" id="7mIqwW3we0j">
+    <property role="TrG5h" value="GeneratedSymbols" />
+    <node concept="2tJIrI" id="7mIqwW3we3L" role="jymVt" />
+    <node concept="2YIFZL" id="2GOEA2mESH" role="jymVt">
+      <property role="TrG5h" value="lookup_recoverType_default_list" />
+      <node concept="37vLTG" id="2GOEA2mESI" role="3clF46">
+        <property role="TrG5h" value="gencontext" />
+        <node concept="1iwH7U" id="2GOEA2mESJ" role="1tU5fm" />
+      </node>
+      <node concept="3Tqbb2" id="2GOEA2mESK" role="3clF45">
+        <ref role="ehGHo" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
+      </node>
+      <node concept="3Tm1VV" id="2GOEA2mESL" role="1B3o_S" />
+      <node concept="3clFbS" id="2GOEA2mESM" role="3clF47">
+        <node concept="3cpWs8" id="2GOEA2mESN" role="3cqZAp">
+          <node concept="3cpWsn" id="2GOEA2mESO" role="3cpWs9">
+            <property role="TrG5h" value="qs" />
+            <node concept="2I9FWS" id="2GOEA2mESP" role="1tU5fm">
+              <ref role="2I9WkF" to="zfi7:7lmP5gALJri" resolve="TypecheckingQueries" />
+            </node>
+            <node concept="2OqwBi" id="2GOEA2mESQ" role="33vP2m">
+              <node concept="2OqwBi" id="2GOEA2mESR" role="2Oq$k0">
+                <node concept="37vLTw" id="2GOEA2mESS" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2GOEA2mESI" resolve="gencontext" />
+                </node>
+                <node concept="1st3f0" id="2GOEA2mEST" role="2OqNvi" />
+              </node>
+              <node concept="3lApI0" id="2GOEA2mESU" role="2OqNvi">
+                <node concept="chp4Y" id="2GOEA2mESV" role="3MHPDn">
+                  <ref role="cht4Q" to="zfi7:7lmP5gALJri" resolve="TypecheckingQueries" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2GOEA2mESW" role="3cqZAp">
+          <node concept="3cpWsn" id="2GOEA2mESX" role="3cpWs9">
+            <property role="TrG5h" value="rl" />
+            <node concept="3Tqbb2" id="2GOEA2mESY" role="1tU5fm">
+              <ref role="ehGHo" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
+            </node>
+            <node concept="2OqwBi" id="2GOEA2mESZ" role="33vP2m">
+              <node concept="37vLTw" id="2GOEA2mET0" role="2Oq$k0">
+                <ref role="3cqZAo" node="2GOEA2mESI" resolve="gencontext" />
+              </node>
+              <node concept="1iwH7d" id="2GOEA2mET1" role="2OqNvi">
+                <ref role="1iwH7c" to="osbg:4LE1vMPhNy4" resolve="recoverTypeDefault" />
+                <node concept="2OqwBi" id="2GOEA2mET2" role="DUT31">
+                  <node concept="2OqwBi" id="2GOEA2mET3" role="2Oq$k0">
+                    <node concept="37vLTw" id="2GOEA2mET4" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2GOEA2mESO" resolve="qs" />
+                    </node>
+                    <node concept="1uHKPH" id="2GOEA2mET5" role="2OqNvi" />
+                  </node>
+                  <node concept="I4A8Y" id="2GOEA2mET6" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="2GOEA2mET7" role="3cqZAp">
+          <node concept="3clFbS" id="2GOEA2mET8" role="3clFbx">
+            <node concept="3clFbF" id="2GOEA2mET9" role="3cqZAp">
+              <node concept="37vLTI" id="2GOEA2mETa" role="3clFbG">
+                <node concept="2OqwBi" id="2GOEA2mETb" role="37vLTx">
+                  <node concept="37vLTw" id="2GOEA2mETc" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2GOEA2mESI" resolve="gencontext" />
+                  </node>
+                  <node concept="1iwH7d" id="2GOEA2mETd" role="2OqNvi">
+                    <ref role="1iwH7c" to="osbg:4LE1vMPhNy4" resolve="recoverTypeDefault" />
+                    <node concept="2OqwBi" id="2GOEA2mETe" role="DUT31">
+                      <node concept="37vLTw" id="2GOEA2mETf" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2GOEA2mESI" resolve="gencontext" />
+                      </node>
+                      <node concept="1r8y6K" id="2GOEA2mETg" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="2GOEA2mETh" role="37vLTJ">
+                  <ref role="3cqZAo" node="2GOEA2mESX" resolve="rl" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="2GOEA2mETi" role="3clFbw">
+            <node concept="10Nm6u" id="2GOEA2mETj" role="3uHU7w" />
+            <node concept="37vLTw" id="2GOEA2mETk" role="3uHU7B">
+              <ref role="3cqZAo" node="2GOEA2mESX" resolve="rl" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2GOEA2mFDq" role="3cqZAp">
+          <node concept="37vLTw" id="2GOEA2mFDo" role="3clFbG">
+            <ref role="3cqZAo" node="2GOEA2mESX" resolve="rl" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2GOEA2mGpi" role="jymVt" />
+    <node concept="2YIFZL" id="7mIqwW3we40" role="jymVt">
+      <property role="TrG5h" value="lookup_recoverType" />
+      <node concept="37vLTG" id="7mIqwW3we77" role="3clF46">
+        <property role="TrG5h" value="gencontext" />
+        <node concept="1iwH7U" id="7mIqwW3wfir" role="1tU5fm" />
+      </node>
+      <node concept="3Tqbb2" id="7mIqwW3we4C" role="3clF45">
+        <ref role="ehGHo" to="wq2x:6p0DfM0asBO" resolve="ConstraintDeclaration" />
+      </node>
+      <node concept="3Tm1VV" id="7mIqwW3we43" role="1B3o_S" />
+      <node concept="3clFbS" id="7mIqwW3we44" role="3clF47">
+        <node concept="3clFbF" id="7mIqwW3vUdU" role="3cqZAp">
+          <node concept="2OqwBi" id="7mIqwW45MO9" role="3clFbG">
+            <node concept="2OqwBi" id="7mIqwW45MOa" role="2Oq$k0">
+              <node concept="1rXfSq" id="2GOEA2mGNP" role="2Oq$k0">
+                <ref role="37wK5l" node="2GOEA2mESH" resolve="lookup_recoverType_default_list" />
+                <node concept="37vLTw" id="2GOEA2mH2Z" role="37wK5m">
+                  <ref role="3cqZAo" node="7mIqwW3we77" resolve="gencontext" />
+                </node>
+              </node>
+              <node concept="3Tsc0h" id="7mIqwW45MOc" role="2OqNvi">
+                <ref role="3TtcxE" to="wq2x:1HWyn8jEsaE" resolve="constraint" />
+              </node>
+            </node>
+            <node concept="1z4cxt" id="7mIqwW45MOd" role="2OqNvi">
+              <node concept="1bVj0M" id="7mIqwW45MOe" role="23t8la">
+                <node concept="3clFbS" id="7mIqwW45MOf" role="1bW5cS">
+                  <node concept="3clFbF" id="7mIqwW45MOg" role="3cqZAp">
+                    <node concept="17R0WA" id="7mIqwW45MOh" role="3clFbG">
+                      <node concept="Xl_RD" id="7mIqwW45MOi" role="3uHU7w">
+                        <property role="Xl_RC" value="__recoverType__" />
+                      </node>
+                      <node concept="2OqwBi" id="7mIqwW45MOj" role="3uHU7B">
+                        <node concept="37vLTw" id="7mIqwW45MOk" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7mIqwW45MOm" resolve="it" />
+                        </node>
+                        <node concept="3TrcHB" id="7mIqwW45MOl" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="7mIqwW45MOm" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="7mIqwW45MOn" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7mIqwW45MFy" role="jymVt" />
+    <node concept="2tJIrI" id="2GOEA2mESG" role="jymVt" />
+    <node concept="2YIFZL" id="7mIqwW3wnNP" role="jymVt">
+      <property role="TrG5h" value="lookup_recoverList" />
+      <node concept="37vLTG" id="7mIqwW3wnNQ" role="3clF46">
+        <property role="TrG5h" value="gencontext" />
+        <node concept="1iwH7U" id="7mIqwW3wnNR" role="1tU5fm" />
+      </node>
+      <node concept="3Tqbb2" id="7mIqwW3wnNS" role="3clF45">
+        <ref role="ehGHo" to="wq2x:6p0DfM0asBO" resolve="ConstraintDeclaration" />
+      </node>
+      <node concept="3Tm1VV" id="7mIqwW3wnNT" role="1B3o_S" />
+      <node concept="3clFbS" id="7mIqwW3wnNU" role="3clF47">
+        <node concept="3clFbF" id="7mIqwW3wnPn" role="3cqZAp">
+          <node concept="2OqwBi" id="7mIqwW45MJf" role="3clFbG">
+            <node concept="2OqwBi" id="7mIqwW45MJg" role="2Oq$k0">
+              <node concept="1rXfSq" id="2GOEA2mHgK" role="2Oq$k0">
+                <ref role="37wK5l" node="2GOEA2mESH" resolve="lookup_recoverType_default_list" />
+                <node concept="37vLTw" id="2GOEA2mHrf" role="37wK5m">
+                  <ref role="3cqZAo" node="7mIqwW3wnNQ" resolve="gencontext" />
+                </node>
+              </node>
+              <node concept="3Tsc0h" id="7mIqwW45MJi" role="2OqNvi">
+                <ref role="3TtcxE" to="wq2x:1HWyn8jEsaE" resolve="constraint" />
+              </node>
+            </node>
+            <node concept="1z4cxt" id="7mIqwW45MJj" role="2OqNvi">
+              <node concept="1bVj0M" id="7mIqwW45MJk" role="23t8la">
+                <node concept="3clFbS" id="7mIqwW45MJl" role="1bW5cS">
+                  <node concept="3clFbF" id="7mIqwW45MJm" role="3cqZAp">
+                    <node concept="17R0WA" id="7mIqwW45MJn" role="3clFbG">
+                      <node concept="Xl_RD" id="7mIqwW45MJo" role="3uHU7w">
+                        <property role="Xl_RC" value="__recoverList__" />
+                      </node>
+                      <node concept="2OqwBi" id="7mIqwW45MJp" role="3uHU7B">
+                        <node concept="37vLTw" id="7mIqwW45MJq" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7mIqwW45MJs" resolve="it" />
+                        </node>
+                        <node concept="3TrcHB" id="7mIqwW45MJr" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="7mIqwW45MJs" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="7mIqwW45MJt" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7mIqwW45NjP" role="jymVt" />
+    <node concept="2YIFZL" id="7mIqwW45N2I" role="jymVt">
+      <property role="TrG5h" value="lookup_assignType" />
+      <node concept="37vLTG" id="7mIqwW45N2J" role="3clF46">
+        <property role="TrG5h" value="gencontext" />
+        <node concept="1iwH7U" id="7mIqwW45N2K" role="1tU5fm" />
+      </node>
+      <node concept="3Tqbb2" id="7mIqwW45N2L" role="3clF45">
+        <ref role="ehGHo" to="wq2x:5itBwM6cWQh" resolve="ExpandMacroPrototype" />
+      </node>
+      <node concept="3Tm1VV" id="7mIqwW45N2M" role="1B3o_S" />
+      <node concept="3clFbS" id="7mIqwW45N2N" role="3clF47">
+        <node concept="3cpWs8" id="7mIqwW45N2O" role="3cqZAp">
+          <node concept="3cpWsn" id="7mIqwW45N2P" role="3cpWs9">
+            <property role="TrG5h" value="qs" />
+            <node concept="2I9FWS" id="7mIqwW45N2Q" role="1tU5fm">
+              <ref role="2I9WkF" to="zfi7:7lmP5gALJri" resolve="TypecheckingQueries" />
+            </node>
+            <node concept="2OqwBi" id="7mIqwW45N2R" role="33vP2m">
+              <node concept="2OqwBi" id="7mIqwW45N2S" role="2Oq$k0">
+                <node concept="37vLTw" id="7mIqwW45N2T" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7mIqwW45N2J" resolve="gencontext" />
+                </node>
+                <node concept="1st3f0" id="7mIqwW45N2U" role="2OqNvi" />
+              </node>
+              <node concept="3lApI0" id="7mIqwW45N2V" role="2OqNvi">
+                <node concept="chp4Y" id="7mIqwW45N2W" role="3MHPDn">
+                  <ref role="cht4Q" to="zfi7:7lmP5gALJri" resolve="TypecheckingQueries" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7mIqwW45N2X" role="3cqZAp">
+          <node concept="3cpWsn" id="7mIqwW45N2Y" role="3cpWs9">
+            <property role="TrG5h" value="mt" />
+            <node concept="3Tqbb2" id="7mIqwW45N2Z" role="1tU5fm">
+              <ref role="ehGHo" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
+            </node>
+            <node concept="2OqwBi" id="7mIqwW45N30" role="33vP2m">
+              <node concept="37vLTw" id="7mIqwW45N31" role="2Oq$k0">
+                <ref role="3cqZAo" node="7mIqwW45N2J" resolve="gencontext" />
+              </node>
+              <node concept="1iwH7d" id="7mIqwW45N32" role="2OqNvi">
+                <ref role="1iwH7c" to="osbg:4qGA5WCFyqy" resolve="expectType" />
+                <node concept="2OqwBi" id="7mIqwW45N33" role="DUT31">
+                  <node concept="2OqwBi" id="7mIqwW45N34" role="2Oq$k0">
+                    <node concept="37vLTw" id="7mIqwW45N35" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7mIqwW45N2P" resolve="qs" />
+                    </node>
+                    <node concept="1uHKPH" id="7mIqwW45N36" role="2OqNvi" />
+                  </node>
+                  <node concept="I4A8Y" id="7mIqwW45N37" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="7mIqwW45N38" role="3cqZAp">
+          <node concept="3clFbS" id="7mIqwW45N39" role="3clFbx">
+            <node concept="3clFbF" id="7mIqwW45N3a" role="3cqZAp">
+              <node concept="37vLTI" id="7mIqwW45N3b" role="3clFbG">
+                <node concept="2OqwBi" id="7mIqwW45N3c" role="37vLTx">
+                  <node concept="37vLTw" id="7mIqwW45N3d" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7mIqwW45N2J" resolve="gencontext" />
+                  </node>
+                  <node concept="1iwH7d" id="7mIqwW45N3e" role="2OqNvi">
+                    <ref role="1iwH7c" to="osbg:4qGA5WCFyqy" resolve="expectType" />
+                    <node concept="2OqwBi" id="7mIqwW45N3f" role="DUT31">
+                      <node concept="37vLTw" id="7mIqwW45N3g" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7mIqwW45N2J" resolve="gencontext" />
+                      </node>
+                      <node concept="1r8y6K" id="7mIqwW45N3h" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="7mIqwW45N3i" role="37vLTJ">
+                  <ref role="3cqZAo" node="7mIqwW45N2Y" resolve="mt" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="7mIqwW45N3j" role="3clFbw">
+            <node concept="10Nm6u" id="7mIqwW45N3k" role="3uHU7w" />
+            <node concept="37vLTw" id="7mIqwW45N3l" role="3uHU7B">
+              <ref role="3cqZAo" node="7mIqwW45N2Y" resolve="rl" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7mIqwW45N3m" role="3cqZAp">
+          <node concept="1PxgMI" id="7mIqwW45Q58" role="3clFbG">
+            <property role="1BlNFB" value="true" />
+            <node concept="chp4Y" id="7mIqwW45Qf7" role="3oSUPX">
+              <ref role="cht4Q" to="wq2x:5itBwM6cWQh" resolve="ExpandMacroPrototype" />
+            </node>
+            <node concept="2OqwBi" id="7mIqwW45N3n" role="1m5AlR">
+              <node concept="2OqwBi" id="7mIqwW45N3o" role="2Oq$k0">
+                <node concept="37vLTw" id="7mIqwW45N3p" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7mIqwW45N2Y" resolve="mt" />
+                </node>
+                <node concept="3Tsc0h" id="7mIqwW45N3q" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:5itBwM6ukmz" resolve="prototype" />
+                </node>
+              </node>
+              <node concept="1z4cxt" id="7mIqwW45N3r" role="2OqNvi">
+                <node concept="1bVj0M" id="7mIqwW45N3s" role="23t8la">
+                  <node concept="3clFbS" id="7mIqwW45N3t" role="1bW5cS">
+                    <node concept="3clFbF" id="7mIqwW45N3u" role="3cqZAp">
+                      <node concept="17R0WA" id="7mIqwW45N3v" role="3clFbG">
+                        <node concept="Xl_RD" id="7mIqwW45N3w" role="3uHU7w">
+                          <property role="Xl_RC" value="_assignType_" />
+                        </node>
+                        <node concept="2OqwBi" id="7mIqwW45N3x" role="3uHU7B">
+                          <node concept="37vLTw" id="7mIqwW45N3y" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7mIqwW45N3$" resolve="it" />
+                          </node>
+                          <node concept="3TrcHB" id="7mIqwW45N3z" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="7mIqwW45N3$" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="7mIqwW45N3_" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7mIqwW45MZj" role="jymVt" />
+    <node concept="2YIFZL" id="7mIqwW45Qoc" role="jymVt">
+      <property role="TrG5h" value="lookup_expectType" />
+      <node concept="37vLTG" id="7mIqwW45Qod" role="3clF46">
+        <property role="TrG5h" value="gencontext" />
+        <node concept="1iwH7U" id="7mIqwW45Qoe" role="1tU5fm" />
+      </node>
+      <node concept="3Tqbb2" id="7mIqwW45Qof" role="3clF45">
+        <ref role="ehGHo" to="wq2x:5itBwM6cWQh" resolve="ExpandMacroPrototype" />
+      </node>
+      <node concept="3Tm1VV" id="7mIqwW45Qog" role="1B3o_S" />
+      <node concept="3clFbS" id="7mIqwW45Qoh" role="3clF47">
+        <node concept="3cpWs8" id="7mIqwW45Qoi" role="3cqZAp">
+          <node concept="3cpWsn" id="7mIqwW45Qoj" role="3cpWs9">
+            <property role="TrG5h" value="qs" />
+            <node concept="2I9FWS" id="7mIqwW45Qok" role="1tU5fm">
+              <ref role="2I9WkF" to="zfi7:7lmP5gALJri" resolve="TypecheckingQueries" />
+            </node>
+            <node concept="2OqwBi" id="7mIqwW45Qol" role="33vP2m">
+              <node concept="2OqwBi" id="7mIqwW45Qom" role="2Oq$k0">
+                <node concept="37vLTw" id="7mIqwW45Qon" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7mIqwW45Qod" resolve="gencontext" />
+                </node>
+                <node concept="1st3f0" id="7mIqwW45Qoo" role="2OqNvi" />
+              </node>
+              <node concept="3lApI0" id="7mIqwW45Qop" role="2OqNvi">
+                <node concept="chp4Y" id="7mIqwW45Qoq" role="3MHPDn">
+                  <ref role="cht4Q" to="zfi7:7lmP5gALJri" resolve="TypecheckingQueries" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7mIqwW45Qor" role="3cqZAp">
+          <node concept="3cpWsn" id="7mIqwW45Qos" role="3cpWs9">
+            <property role="TrG5h" value="mt" />
+            <node concept="3Tqbb2" id="7mIqwW45Qot" role="1tU5fm">
+              <ref role="ehGHo" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
+            </node>
+            <node concept="2OqwBi" id="7mIqwW45Qou" role="33vP2m">
+              <node concept="37vLTw" id="7mIqwW45Qov" role="2Oq$k0">
+                <ref role="3cqZAo" node="7mIqwW45Qod" resolve="gencontext" />
+              </node>
+              <node concept="1iwH7d" id="7mIqwW45Qow" role="2OqNvi">
+                <ref role="1iwH7c" to="osbg:4qGA5WCFyqy" resolve="expectType" />
+                <node concept="2OqwBi" id="7mIqwW45Qox" role="DUT31">
+                  <node concept="2OqwBi" id="7mIqwW45Qoy" role="2Oq$k0">
+                    <node concept="37vLTw" id="7mIqwW45Qoz" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7mIqwW45Qoj" resolve="qs" />
+                    </node>
+                    <node concept="1uHKPH" id="7mIqwW45Qo$" role="2OqNvi" />
+                  </node>
+                  <node concept="I4A8Y" id="7mIqwW45Qo_" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="7mIqwW45QoA" role="3cqZAp">
+          <node concept="3clFbS" id="7mIqwW45QoB" role="3clFbx">
+            <node concept="3clFbF" id="7mIqwW45QoC" role="3cqZAp">
+              <node concept="37vLTI" id="7mIqwW45QoD" role="3clFbG">
+                <node concept="2OqwBi" id="7mIqwW45QoE" role="37vLTx">
+                  <node concept="37vLTw" id="7mIqwW45QoF" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7mIqwW45Qod" resolve="gencontext" />
+                  </node>
+                  <node concept="1iwH7d" id="7mIqwW45QoG" role="2OqNvi">
+                    <ref role="1iwH7c" to="osbg:4qGA5WCFyqy" resolve="expectType" />
+                    <node concept="2OqwBi" id="7mIqwW45QoH" role="DUT31">
+                      <node concept="37vLTw" id="7mIqwW45QoI" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7mIqwW45Qod" resolve="gencontext" />
+                      </node>
+                      <node concept="1r8y6K" id="7mIqwW45QoJ" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="7mIqwW45QoK" role="37vLTJ">
+                  <ref role="3cqZAo" node="7mIqwW45Qos" resolve="mt" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="7mIqwW45QoL" role="3clFbw">
+            <node concept="10Nm6u" id="7mIqwW45QoM" role="3uHU7w" />
+            <node concept="37vLTw" id="7mIqwW45QoN" role="3uHU7B">
+              <ref role="3cqZAo" node="7mIqwW45Qos" resolve="mt" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7mIqwW45QoO" role="3cqZAp">
+          <node concept="1PxgMI" id="7mIqwW45QoP" role="3clFbG">
+            <property role="1BlNFB" value="true" />
+            <node concept="chp4Y" id="7mIqwW45QoQ" role="3oSUPX">
+              <ref role="cht4Q" to="wq2x:5itBwM6cWQh" resolve="ExpandMacroPrototype" />
+            </node>
+            <node concept="2OqwBi" id="7mIqwW45QoR" role="1m5AlR">
+              <node concept="2OqwBi" id="7mIqwW45QoS" role="2Oq$k0">
+                <node concept="37vLTw" id="7mIqwW45QoT" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7mIqwW45Qos" resolve="mt" />
+                </node>
+                <node concept="3Tsc0h" id="7mIqwW45QoU" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:5itBwM6ukmz" resolve="prototype" />
+                </node>
+              </node>
+              <node concept="1z4cxt" id="7mIqwW45QoV" role="2OqNvi">
+                <node concept="1bVj0M" id="7mIqwW45QoW" role="23t8la">
+                  <node concept="3clFbS" id="7mIqwW45QoX" role="1bW5cS">
+                    <node concept="3clFbF" id="7mIqwW45QoY" role="3cqZAp">
+                      <node concept="17R0WA" id="7mIqwW45QoZ" role="3clFbG">
+                        <node concept="Xl_RD" id="7mIqwW45Qp0" role="3uHU7w">
+                          <property role="Xl_RC" value="_expectType_" />
+                        </node>
+                        <node concept="2OqwBi" id="7mIqwW45Qp1" role="3uHU7B">
+                          <node concept="37vLTw" id="7mIqwW45Qp2" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7mIqwW45Qp4" resolve="it" />
+                          </node>
+                          <node concept="3TrcHB" id="7mIqwW45Qp3" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="7mIqwW45Qp4" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="7mIqwW45Qp5" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7mIqwW45Qob" role="jymVt" />
+    <node concept="3Tm1VV" id="7mIqwW3we0k" role="1B3o_S" />
+  </node>
+</model>
+
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
index 7145bd50..30f3a23b 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
@@ -23,8 +23,10 @@
     <import index="zfi7" ref="r:39840d4e-f61c-4452-88c5-75b1eb10e892(jetbrains.mps.lang.typechecking.structure)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tpd4" ref="r:00000000-0000-4000-0000-011c895902b4(jetbrains.mps.lang.typesystem.structure)" />
+    <import index="fwnm" ref="r:54f00056-a241-4baf-a6f7-ba1fb6ac89f4(jetbrains.mps.lang.typechecking.generator.genutil)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="ha02" ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)" implicit="true" />
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
   </imports>
   <registry>
@@ -51,6 +53,9 @@
       <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="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
@@ -66,6 +71,8 @@
         <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="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -82,9 +89,6 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
-        <property id="1068580320021" name="value" index="3cmrfH" />
-      </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
@@ -133,6 +137,7 @@
       <concept id="1177093525992" name="jetbrains.mps.lang.generator.structure.InlineTemplate_RuleConsequence" flags="lg" index="gft3U">
         <child id="1177093586806" name="templateNode" index="gfFT$" />
       </concept>
+      <concept id="5015072279636592410" name="jetbrains.mps.lang.generator.structure.VarMacro_ValueQuery" flags="in" index="2jfdEK" />
       <concept id="1168559333462" name="jetbrains.mps.lang.generator.structure.TemplateDeclarationReference" flags="ln" index="j$656" />
       <concept id="1168619357332" name="jetbrains.mps.lang.generator.structure.RootTemplateAnnotation" flags="lg" index="n94m4">
         <reference id="1168619429071" name="applicableConcept" index="n9lRv" />
@@ -187,6 +192,12 @@
       <concept id="1131073187192" name="jetbrains.mps.lang.generator.structure.MapSrcNodeMacro" flags="ln" index="1pdMLZ">
         <child id="1225229330048" name="postMapperFunction" index="15mYut" />
       </concept>
+      <concept id="1048903277984099206" name="jetbrains.mps.lang.generator.structure.VarDeclaration" flags="ng" index="1ps_xZ">
+        <child id="1048903277984099210" name="value" index="1ps_xN" />
+      </concept>
+      <concept id="1048903277984099198" name="jetbrains.mps.lang.generator.structure.VarMacro2" flags="lg" index="1ps_y7">
+        <child id="1048903277984099213" name="variables" index="1ps_xO" />
+      </concept>
       <concept id="1167756080639" name="jetbrains.mps.lang.generator.structure.PropertyMacro_GetPropertyValue" flags="in" index="3zFVjK" />
       <concept id="1167756221419" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_templatePropertyValue" flags="nn" index="3zGtF$" />
       <concept id="1167770111131" name="jetbrains.mps.lang.generator.structure.ReferenceMacro_GetReferent" flags="in" index="3$xsQk" />
@@ -224,6 +235,9 @@
         <reference id="1216860049623" name="label" index="1iwH7c" />
       </concept>
       <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
+      <concept id="1048903277984174662" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_VarRef2" flags="nn" index="1psM6Z">
+        <reference id="1048903277984174663" name="vardecl" index="1psM6Y" />
+      </concept>
       <concept id="1217026863835" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOriginalInputModel" flags="nn" index="1st3f0" />
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
@@ -270,6 +284,9 @@
       <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="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
@@ -288,11 +305,15 @@
       <concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
         <child id="1145567471833" name="createdType" index="2T96Bj" />
       </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">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
       <concept id="6870613620390542976" name="jetbrains.mps.lang.smodel.structure.ConceptAliasOperation" flags="ng" index="3n3YKJ" />
+      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
+        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      </concept>
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
       </concept>
@@ -325,6 +346,13 @@
       <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="role_DebugInfo" 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="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
@@ -333,12 +361,11 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1172650591544" name="jetbrains.mps.baseLanguage.collections.structure.SkipOperation" flags="nn" index="7r0gD">
-        <child id="1172658456740" name="elementsToSkip" index="7T0AP" />
-      </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
+      <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+      <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
@@ -651,24 +678,28 @@
         </node>
       </node>
     </node>
-    <node concept="2VPoh5" id="j$DTRidKt6" role="2VS0gm">
-      <ref role="2VPoh2" node="7lmP5gAu4Fv" resolve="_TypeOf_" />
-      <node concept="2VP$b9" id="j$DTRidKtb" role="2VPoh3">
-        <node concept="3clFbS" id="j$DTRidKtc" role="2VODD2">
-          <node concept="3clFbF" id="j$DTRidKxb" role="3cqZAp">
-            <node concept="2OqwBi" id="j$DTRie15I" role="3clFbG">
-              <node concept="2OqwBi" id="j$DTRidL4d" role="2Oq$k0">
-                <node concept="2OqwBi" id="j$DTRidKHq" role="2Oq$k0">
-                  <node concept="1iwH7S" id="j$DTRidKxa" role="2Oq$k0" />
-                  <node concept="1st3f0" id="j$DTRidKR2" role="2OqNvi" />
-                </node>
-                <node concept="2RRcyG" id="j$DTRidLbS" role="2OqNvi">
-                  <node concept="chp4Y" id="j$DTRidLDY" role="3MHsoP">
-                    <ref role="cht4Q" to="zfi7:7lmP5gALJri" resolve="TypecheckingQueries" />
+    <node concept="1X3_iC" id="4APe_wKcEgD" role="lGtFl">
+      <property role="3V$3am" value="createRootRule" />
+      <property role="3V$3ak" value="b401a680-8325-4110-8fd3-84331ff25bef/1095416546421/1167088157977" />
+      <node concept="2VPoh5" id="j$DTRidKt6" role="8Wnug">
+        <ref role="2VPoh2" node="7lmP5gAu4Fv" resolve="_TypeOf_" />
+        <node concept="2VP$b9" id="j$DTRidKtb" role="2VPoh3">
+          <node concept="3clFbS" id="j$DTRidKtc" role="2VODD2">
+            <node concept="3clFbF" id="j$DTRidKxb" role="3cqZAp">
+              <node concept="2OqwBi" id="j$DTRie15I" role="3clFbG">
+                <node concept="2OqwBi" id="j$DTRidL4d" role="2Oq$k0">
+                  <node concept="2OqwBi" id="j$DTRidKHq" role="2Oq$k0">
+                    <node concept="1iwH7S" id="j$DTRidKxa" role="2Oq$k0" />
+                    <node concept="1st3f0" id="j$DTRidKR2" role="2OqNvi" />
+                  </node>
+                  <node concept="2RRcyG" id="j$DTRidLbS" role="2OqNvi">
+                    <node concept="chp4Y" id="j$DTRidLDY" role="3MHsoP">
+                      <ref role="cht4Q" to="zfi7:7lmP5gALJri" resolve="TypecheckingQueries" />
+                    </node>
                   </node>
                 </node>
+                <node concept="3GX2aA" id="j$DTRie4hd" role="2OqNvi" />
               </node>
-              <node concept="3GX2aA" id="j$DTRie4hd" role="2OqNvi" />
             </node>
           </node>
         </node>
@@ -777,17 +808,82 @@
                           <property role="P3scX" value="35320f26-77cb-4c55-be9f-a97a27770af1/8829335963593820278/8829335963593822893" />
                           <node concept="3$xsQk" id="1vAI4X$OMx2" role="3$ytzL">
                             <node concept="3clFbS" id="1vAI4X$OMx3" role="2VODD2">
-                              <node concept="3clFbF" id="1vAI4X$OMAJ" role="3cqZAp">
-                                <node concept="2OqwBi" id="1vAI4X$OML5" role="3clFbG">
-                                  <node concept="1iwH7S" id="1vAI4X$OMAI" role="2Oq$k0" />
-                                  <node concept="1iwH70" id="1vAI4X$OMT2" role="2OqNvi">
-                                    <ref role="1iwH77" node="1vAI4X$KXom" resolve="feature_logical" />
-                                    <node concept="2OqwBi" id="1vAI4X$ONj1" role="1iwH7V">
-                                      <node concept="30H73N" id="1vAI4X$ON49" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="1vAI4X$ONCg" role="2OqNvi">
+                              <node concept="1X3_iC" id="4APe_wK_zvV" role="lGtFl">
+                                <property role="3V$3am" value="statement" />
+                                <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                                <node concept="3clFbF" id="1vAI4X$OMAJ" role="8Wnug">
+                                  <node concept="2OqwBi" id="1vAI4X$OML5" role="3clFbG">
+                                    <node concept="1iwH7S" id="1vAI4X$OMAI" role="2Oq$k0" />
+                                    <node concept="1iwH70" id="1vAI4X$OMT2" role="2OqNvi">
+                                      <ref role="1iwH77" node="1vAI4X$KXom" resolve="feature_logical" />
+                                      <node concept="2OqwBi" id="1vAI4X$ONj1" role="1iwH7V">
+                                        <node concept="30H73N" id="1vAI4X$ON49" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="1vAI4X$ONCg" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="zfi7:1vAI4X$MlAp" resolve="feature" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3cpWs8" id="4APe_wK_yXW" role="3cqZAp">
+                                <node concept="3cpWsn" id="4APe_wK_yXX" role="3cpWs9">
+                                  <property role="TrG5h" value="varname" />
+                                  <node concept="17QB3L" id="4APe_wK_yXY" role="1tU5fm" />
+                                  <node concept="2OqwBi" id="4APe_wK_yY1" role="33vP2m">
+                                    <node concept="2OqwBi" id="4APe_wK_yY2" role="2Oq$k0">
+                                      <node concept="30H73N" id="4APe_wK_yY3" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="4APe_wK_yY4" role="2OqNvi">
                                         <ref role="3Tt5mk" to="zfi7:1vAI4X$MlAp" resolve="feature" />
                                       </node>
                                     </node>
+                                    <node concept="3TrcHB" id="4APe_wK_yY5" role="2OqNvi">
+                                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbF" id="4APe_wK_yY6" role="3cqZAp">
+                                <node concept="2OqwBi" id="4APe_wK_yY7" role="3clFbG">
+                                  <node concept="2OqwBi" id="4APe_wK_yY8" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="4APe_wK_yY9" role="2Oq$k0">
+                                      <node concept="3l3mFP" id="4APe_wK_yYa" role="2Oq$k0" />
+                                      <node concept="2Xjw5R" id="4APe_wK_yYb" role="2OqNvi">
+                                        <node concept="1xMEDy" id="4APe_wK_yYc" role="1xVPHs">
+                                          <node concept="chp4Y" id="4APe_wK_yYd" role="ri$Ld">
+                                            <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="2qgKlT" id="4APe_wK_yYe" role="2OqNvi">
+                                      <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+                                    </node>
+                                  </node>
+                                  <node concept="1z4cxt" id="4APe_wK_yYf" role="2OqNvi">
+                                    <node concept="1bVj0M" id="4APe_wK_yYg" role="23t8la">
+                                      <node concept="3clFbS" id="4APe_wK_yYh" role="1bW5cS">
+                                        <node concept="3clFbF" id="4APe_wK_yYi" role="3cqZAp">
+                                          <node concept="17R0WA" id="4APe_wK_yYj" role="3clFbG">
+                                            <node concept="37vLTw" id="4APe_wK_yYk" role="3uHU7w">
+                                              <ref role="3cqZAo" node="4APe_wK_yXX" resolve="varname" />
+                                            </node>
+                                            <node concept="2OqwBi" id="4APe_wK_yYl" role="3uHU7B">
+                                              <node concept="37vLTw" id="4APe_wK_yYm" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="4APe_wK_yYo" resolve="it" />
+                                              </node>
+                                              <node concept="3TrcHB" id="4APe_wK_yYn" role="2OqNvi">
+                                                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="Rh6nW" id="4APe_wK_yYo" role="1bW2Oz">
+                                        <property role="TrG5h" value="it" />
+                                        <node concept="2jxLKc" id="4APe_wK_yYp" role="1tU5fm" />
+                                      </node>
+                                    </node>
                                   </node>
                                 </node>
                               </node>
@@ -849,15 +945,85 @@
                           <property role="P3scX" value="35320f26-77cb-4c55-be9f-a97a27770af1/8829335963593820278/8829335963593822893" />
                           <node concept="3$xsQk" id="1PN9XOGFgQz" role="3$ytzL">
                             <node concept="3clFbS" id="1PN9XOGFgQ$" role="2VODD2">
-                              <node concept="3clFbF" id="1PN9XOGFgQ_" role="3cqZAp">
-                                <node concept="2OqwBi" id="1PN9XOGFgQA" role="3clFbG">
-                                  <node concept="1iwH7S" id="1PN9XOGFgQB" role="2Oq$k0" />
-                                  <node concept="1iwH70" id="1PN9XOGFgQC" role="2OqNvi">
-                                    <ref role="1iwH77" node="1PN9XOGEAUt" resolve="feature_type" />
-                                    <node concept="2OqwBi" id="1PN9XOGFgQD" role="1iwH7V">
-                                      <node concept="30H73N" id="1PN9XOGFgQE" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="1PN9XOGFgQF" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="zfi7:1vAI4X$MlAp" resolve="feature" />
+                              <node concept="1X3_iC" id="4APe_wKs3qc" role="lGtFl">
+                                <property role="3V$3am" value="statement" />
+                                <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                                <node concept="3clFbF" id="1PN9XOGFgQ_" role="8Wnug">
+                                  <node concept="2OqwBi" id="1PN9XOGFgQA" role="3clFbG">
+                                    <node concept="1iwH7S" id="1PN9XOGFgQB" role="2Oq$k0" />
+                                    <node concept="1iwH70" id="1PN9XOGFgQC" role="2OqNvi">
+                                      <ref role="1iwH77" node="1PN9XOGEAUt" resolve="feature_node" />
+                                      <node concept="2OqwBi" id="1PN9XOGFgQD" role="1iwH7V">
+                                        <node concept="30H73N" id="1PN9XOGFgQE" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="1PN9XOGFgQF" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="zfi7:1vAI4X$MlAp" resolve="feature" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3cpWs8" id="4APe_wKs1QA" role="3cqZAp">
+                                <node concept="3cpWsn" id="4APe_wKs1QB" role="3cpWs9">
+                                  <property role="TrG5h" value="varname" />
+                                  <node concept="17QB3L" id="4APe_wKs1QC" role="1tU5fm" />
+                                  <node concept="3cpWs3" id="4APe_wKs1QD" role="33vP2m">
+                                    <node concept="Xl_RD" id="4APe_wKs1QE" role="3uHU7w">
+                                      <property role="Xl_RC" value="Type" />
+                                    </node>
+                                    <node concept="2OqwBi" id="4APe_wKs1QF" role="3uHU7B">
+                                      <node concept="2OqwBi" id="4APe_wKs2ky" role="2Oq$k0">
+                                        <node concept="30H73N" id="4APe_wKs1QG" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="4APe_wKs2Lb" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="zfi7:1vAI4X$MlAp" resolve="feature" />
+                                        </node>
+                                      </node>
+                                      <node concept="3TrcHB" id="4APe_wKs1QH" role="2OqNvi">
+                                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbF" id="4APe_wKs1QI" role="3cqZAp">
+                                <node concept="2OqwBi" id="4APe_wKs1QJ" role="3clFbG">
+                                  <node concept="2OqwBi" id="4APe_wKs1QK" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="4APe_wKs1QL" role="2Oq$k0">
+                                      <node concept="3l3mFP" id="4APe_wKs1QM" role="2Oq$k0" />
+                                      <node concept="2Xjw5R" id="4APe_wKs1QN" role="2OqNvi">
+                                        <node concept="1xMEDy" id="4APe_wKs1QO" role="1xVPHs">
+                                          <node concept="chp4Y" id="4APe_wKs1QP" role="ri$Ld">
+                                            <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="2qgKlT" id="4APe_wKs1QQ" role="2OqNvi">
+                                      <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+                                    </node>
+                                  </node>
+                                  <node concept="1z4cxt" id="4APe_wKs1QR" role="2OqNvi">
+                                    <node concept="1bVj0M" id="4APe_wKs1QS" role="23t8la">
+                                      <node concept="3clFbS" id="4APe_wKs1QT" role="1bW5cS">
+                                        <node concept="3clFbF" id="4APe_wKs1QU" role="3cqZAp">
+                                          <node concept="17R0WA" id="4APe_wKs1QV" role="3clFbG">
+                                            <node concept="37vLTw" id="4APe_wKs1QW" role="3uHU7w">
+                                              <ref role="3cqZAo" node="4APe_wKs1QB" resolve="varname" />
+                                            </node>
+                                            <node concept="2OqwBi" id="4APe_wKs1QX" role="3uHU7B">
+                                              <node concept="37vLTw" id="4APe_wKs1QY" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="4APe_wKs1R0" resolve="it" />
+                                              </node>
+                                              <node concept="3TrcHB" id="4APe_wKs1QZ" role="2OqNvi">
+                                                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="Rh6nW" id="4APe_wKs1R0" role="1bW2Oz">
+                                        <property role="TrG5h" value="it" />
+                                        <node concept="2jxLKc" id="4APe_wKs1R1" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -940,15 +1106,85 @@
                           <property role="P3scX" value="35320f26-77cb-4c55-be9f-a97a27770af1/8829335963593820278/8829335963593822893" />
                           <node concept="3$xsQk" id="3Co8b0rRSHH" role="3$ytzL">
                             <node concept="3clFbS" id="3Co8b0rRSHI" role="2VODD2">
-                              <node concept="3clFbF" id="3Co8b0rRSHJ" role="3cqZAp">
-                                <node concept="2OqwBi" id="3Co8b0rRSHK" role="3clFbG">
-                                  <node concept="1iwH7S" id="3Co8b0rRSHL" role="2Oq$k0" />
-                                  <node concept="1iwH70" id="3Co8b0rRSHM" role="2OqNvi">
-                                    <ref role="1iwH77" node="1PN9XOGEAUt" resolve="feature_node" />
-                                    <node concept="2OqwBi" id="3Co8b0rRSHN" role="1iwH7V">
-                                      <node concept="30H73N" id="3Co8b0rRSHO" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="3Co8b0rRSHP" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="zfi7:1vAI4X$MlAp" resolve="feature" />
+                              <node concept="1X3_iC" id="4APe_wKs47G" role="lGtFl">
+                                <property role="3V$3am" value="statement" />
+                                <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                                <node concept="3clFbF" id="3Co8b0rRSHJ" role="8Wnug">
+                                  <node concept="2OqwBi" id="3Co8b0rRSHK" role="3clFbG">
+                                    <node concept="1iwH7S" id="3Co8b0rRSHL" role="2Oq$k0" />
+                                    <node concept="1iwH70" id="3Co8b0rRSHM" role="2OqNvi">
+                                      <ref role="1iwH77" node="1PN9XOGEAUt" resolve="feature_node" />
+                                      <node concept="2OqwBi" id="3Co8b0rRSHN" role="1iwH7V">
+                                        <node concept="30H73N" id="3Co8b0rRSHO" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="3Co8b0rRSHP" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="zfi7:1vAI4X$MlAp" resolve="feature" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3cpWs8" id="4APe_wKs3_m" role="3cqZAp">
+                                <node concept="3cpWsn" id="4APe_wKs3_n" role="3cpWs9">
+                                  <property role="TrG5h" value="varname" />
+                                  <node concept="17QB3L" id="4APe_wKs3_o" role="1tU5fm" />
+                                  <node concept="3cpWs3" id="4APe_wKs3_p" role="33vP2m">
+                                    <node concept="Xl_RD" id="4APe_wKs3_q" role="3uHU7w">
+                                      <property role="Xl_RC" value="Types" />
+                                    </node>
+                                    <node concept="2OqwBi" id="4APe_wKs3_r" role="3uHU7B">
+                                      <node concept="2OqwBi" id="4APe_wKs3_s" role="2Oq$k0">
+                                        <node concept="30H73N" id="4APe_wKs3_t" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="4APe_wKs3_u" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="zfi7:1vAI4X$MlAp" resolve="feature" />
+                                        </node>
+                                      </node>
+                                      <node concept="3TrcHB" id="4APe_wKs3_v" role="2OqNvi">
+                                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbF" id="4APe_wKs3_w" role="3cqZAp">
+                                <node concept="2OqwBi" id="4APe_wKs3_x" role="3clFbG">
+                                  <node concept="2OqwBi" id="4APe_wKs3_y" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="4APe_wKs3_z" role="2Oq$k0">
+                                      <node concept="3l3mFP" id="4APe_wKs3_$" role="2Oq$k0" />
+                                      <node concept="2Xjw5R" id="4APe_wKs3__" role="2OqNvi">
+                                        <node concept="1xMEDy" id="4APe_wKs3_A" role="1xVPHs">
+                                          <node concept="chp4Y" id="4APe_wKs3_B" role="ri$Ld">
+                                            <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="2qgKlT" id="4APe_wKs3_C" role="2OqNvi">
+                                      <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+                                    </node>
+                                  </node>
+                                  <node concept="1z4cxt" id="4APe_wKs3_D" role="2OqNvi">
+                                    <node concept="1bVj0M" id="4APe_wKs3_E" role="23t8la">
+                                      <node concept="3clFbS" id="4APe_wKs3_F" role="1bW5cS">
+                                        <node concept="3clFbF" id="4APe_wKs3_G" role="3cqZAp">
+                                          <node concept="17R0WA" id="4APe_wKs3_H" role="3clFbG">
+                                            <node concept="37vLTw" id="4APe_wKs3_I" role="3uHU7w">
+                                              <ref role="3cqZAo" node="4APe_wKs3_n" resolve="varname" />
+                                            </node>
+                                            <node concept="2OqwBi" id="4APe_wKs3_J" role="3uHU7B">
+                                              <node concept="37vLTw" id="4APe_wKs3_K" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="4APe_wKs3_M" resolve="it" />
+                                              </node>
+                                              <node concept="3TrcHB" id="4APe_wKs3_L" role="2OqNvi">
+                                                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="Rh6nW" id="4APe_wKs3_M" role="1bW2Oz">
+                                        <property role="TrG5h" value="it" />
+                                        <node concept="2jxLKc" id="4APe_wKs3_N" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
@@ -1036,6 +1272,44 @@
                                 <ref role="1PxDUh" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
                               </node>
                             </node>
+                            <node concept="1ZhdrF" id="7mIqwW45TxX" role="lGtFl">
+                              <property role="2qtEX8" value="declaration" />
+                              <property role="P3scX" value="c4803b19-6d89-4a3b-bf82-390769514add/6097203247185614707/6097203247185614710" />
+                              <node concept="3$xsQk" id="7mIqwW45TxY" role="3$ytzL">
+                                <node concept="3clFbS" id="7mIqwW45TxZ" role="2VODD2">
+                                  <node concept="3clFbF" id="7mIqwW45TyO" role="3cqZAp">
+                                    <node concept="2OqwBi" id="7mIqwW45Zkq" role="3clFbG">
+                                      <node concept="2OqwBi" id="7mIqwW45TYv" role="2Oq$k0">
+                                        <node concept="2YIFZM" id="7mIqwW45TyP" role="2Oq$k0">
+                                          <ref role="37wK5l" to="fwnm:7mIqwW45N2I" resolve="lookup_assigntype" />
+                                          <ref role="1Pybhc" to="fwnm:7mIqwW3we0j" resolve="GeneratedSymbols" />
+                                          <node concept="1iwH7S" id="7mIqwW45TyQ" role="37wK5m" />
+                                        </node>
+                                        <node concept="3Tsc0h" id="7mIqwW45Uhy" role="2OqNvi">
+                                          <ref role="3TtcxE" to="wq2x:5itBwM6wU6s" resolve="parameter" />
+                                        </node>
+                                      </node>
+                                      <node concept="1uHKPH" id="7mIqwW463AQ" role="2OqNvi" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="1ZhdrF" id="7mIqwW45LfD" role="lGtFl">
+                          <property role="2qtEX8" value="template" />
+                          <property role="P3scX" value="c4803b19-6d89-4a3b-bf82-390769514add/6097203247182936001/6097203247182937177" />
+                          <node concept="3$xsQk" id="7mIqwW45LfE" role="3$ytzL">
+                            <node concept="3clFbS" id="7mIqwW45LfF" role="2VODD2">
+                              <node concept="3clFbF" id="7mIqwW45SL0" role="3cqZAp">
+                                <node concept="2YIFZM" id="7mIqwW45SQv" role="3clFbG">
+                                  <ref role="37wK5l" to="fwnm:7mIqwW45N2I" resolve="lookup_assigntype" />
+                                  <ref role="1Pybhc" to="fwnm:7mIqwW3we0j" resolve="GeneratedSymbols" />
+                                  <node concept="1iwH7S" id="7mIqwW45SXA" role="37wK5m" />
+                                </node>
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -1116,6 +1390,44 @@
                                 <ref role="1PxDUh" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
                               </node>
                             </node>
+                            <node concept="1ZhdrF" id="7mIqwW463E7" role="lGtFl">
+                              <property role="2qtEX8" value="declaration" />
+                              <property role="P3scX" value="c4803b19-6d89-4a3b-bf82-390769514add/6097203247185614707/6097203247185614710" />
+                              <node concept="3$xsQk" id="7mIqwW463E8" role="3$ytzL">
+                                <node concept="3clFbS" id="7mIqwW463E9" role="2VODD2">
+                                  <node concept="3clFbF" id="7mIqwW463EY" role="3cqZAp">
+                                    <node concept="2OqwBi" id="7mIqwW469ow" role="3clFbG">
+                                      <node concept="2OqwBi" id="7mIqwW464df" role="2Oq$k0">
+                                        <node concept="2YIFZM" id="7mIqwW463TG" role="2Oq$k0">
+                                          <ref role="37wK5l" to="fwnm:7mIqwW45Qoc" resolve="lookup_expecttype" />
+                                          <ref role="1Pybhc" to="fwnm:7mIqwW3we0j" resolve="GeneratedSymbols" />
+                                          <node concept="1iwH7S" id="7mIqwW463TH" role="37wK5m" />
+                                        </node>
+                                        <node concept="3Tsc0h" id="7mIqwW464z0" role="2OqNvi">
+                                          <ref role="3TtcxE" to="wq2x:5itBwM6wU6s" resolve="parameter" />
+                                        </node>
+                                      </node>
+                                      <node concept="1uHKPH" id="7mIqwW46dEY" role="2OqNvi" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="1ZhdrF" id="7mIqwW45T3Q" role="lGtFl">
+                          <property role="2qtEX8" value="template" />
+                          <property role="P3scX" value="c4803b19-6d89-4a3b-bf82-390769514add/6097203247182936001/6097203247182937177" />
+                          <node concept="3$xsQk" id="7mIqwW45T3R" role="3$ytzL">
+                            <node concept="3clFbS" id="7mIqwW45T3S" role="2VODD2">
+                              <node concept="3clFbF" id="7mIqwW45T5Y" role="3cqZAp">
+                                <node concept="2YIFZM" id="7mIqwW45TeV" role="3clFbG">
+                                  <ref role="37wK5l" to="fwnm:7mIqwW45Qoc" resolve="lookup_expecttype" />
+                                  <ref role="1Pybhc" to="fwnm:7mIqwW3we0j" resolve="GeneratedSymbols" />
+                                  <node concept="1iwH7S" id="7mIqwW45TeW" role="37wK5m" />
+                                </node>
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -1330,6 +1642,7 @@
         <node concept="1nLNNL" id="6N2bvv_l2PD" role="3cqZAp">
           <node concept="1nLNMm" id="6N2bvv_l2PF" role="1nLNNK">
             <node concept="3Aq93q" id="6N2bvv_l2Rd" role="1nLNMb">
+              <property role="3ArMco" value="true" />
               <node concept="3I6sU6" id="6N2bvv_l2Re" role="3Ip0Jz">
                 <node concept="3I6s7M" id="6N2bvv_l2RH" role="3I6sU7">
                   <node concept="3Aqt3T" id="6N2bvv_l2RG" role="3I6s78">
@@ -1337,13 +1650,8 @@
                     <node concept="a7P8L" id="6N2bvv_l30i" role="3AunhB">
                       <ref role="a7OzE" node="6N2bvv_l2nb" resolve="Nodes" />
                     </node>
-                    <node concept="1HFMs5" id="6N2bvv_l35R" role="3AunhB">
-                      <node concept="a7P8L" id="6N2bvv_l35M" role="1uarlU">
-                        <ref role="a7OzE" node="6N2bvv_l2mG" resolve="Terms" />
-                      </node>
-                      <node concept="Hz6ka" id="2rIdnPwt5Wz" role="1uarlW">
-                        <node concept="KCUsM" id="2rIdnPwt5Yf" role="Hz6kd" />
-                      </node>
+                    <node concept="a7P8L" id="4APe_wKVlaW" role="3AunhB">
+                      <ref role="a7OzE" node="6N2bvv_l2mG" resolve="Terms" />
                     </node>
                   </node>
                 </node>
@@ -1367,101 +1675,88 @@
               </node>
               <node concept="32pEOW" id="24ciDNzxNFe" role="3vLBG7" />
             </node>
+            <node concept="3xSepi" id="4APe_wKVkE9" role="3xSepv">
+              <node concept="3Aq9E8" id="4APe_wKVkEa" role="3xSepj">
+                <node concept="3I6sU6" id="4APe_wKVkEb" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="4APe_wKVkYl" role="3I6sU7">
+                    <node concept="3A8Hvi" id="4APe_wKVkYm" role="3I6s78">
+                      <node concept="HKQnh" id="4APe_wKVkYn" role="3A8w4Q">
+                        <node concept="2ShNRf" id="4APe_wKVkYo" role="HKQng">
+                          <node concept="2T8Vx0" id="4APe_wKVkYp" role="2ShVmc">
+                            <node concept="2I9FWS" id="4APe_wKVkYq" role="2T96Bj" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="4APe_wKVkYr" role="3A8wtg">
+                        <ref role="a7OzE" node="6N2bvv_l2nb" resolve="Nodes" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9_M" id="4APe_wKVkUa" role="1nLNMa">
+              <node concept="3I6sU6" id="4APe_wKVkUb" role="3Ip0Jz">
+                <node concept="3I6s7M" id="4APe_wKVkVQ" role="3I6sU7">
+                  <node concept="3wWvb2" id="4APe_wKVkVR" role="3I6s78">
+                    <node concept="3clFbC" id="4APe_wKVkVS" role="3wWo3s">
+                      <node concept="10Nm6u" id="4APe_wKVkVT" role="3uHU7w" />
+                      <node concept="1Ft4W6" id="4APe_wKVkVU" role="3uHU7B">
+                        <node concept="a7P8L" id="4APe_wKVkVV" role="1FtiSR">
+                          <ref role="a7OzE" node="6N2bvv_l2nb" resolve="Nodes" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="3clFbH" id="6N2bvv_l2SC" role="3cqZAp" />
-        <node concept="1nLNNL" id="6N2bvv_l2kG" role="3cqZAp">
-          <node concept="1nLNMm" id="6N2bvv_l2kI" role="1nLNNK">
-            <node concept="3Aq93q" id="6N2bvv_l2lI" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="6N2bvv_l2lJ" role="3Ip0Jz">
-                <node concept="3I6s7M" id="6N2bvv_l2z8" role="3I6sU7">
-                  <node concept="3Aqt3T" id="6N2bvv_l2z7" role="3I6s78">
-                    <ref role="3AqCNq" node="6N2bvv_l2qf" resolve="recoverList" />
-                    <node concept="a7P8L" id="6N2bvv_l2$$" role="3AunhB">
-                      <ref role="a7OzE" node="5TXeSYSHy4s" resolve="Nodes" />
+        <node concept="3clFbH" id="4APe_wKVkPt" role="3cqZAp" />
+        <node concept="1nLNNL" id="4APe_wKVkJt" role="3cqZAp">
+          <node concept="1nLNMm" id="4APe_wKVkJu" role="1nLNNK">
+            <node concept="3Aq93q" id="4APe_wKVkJv" role="1nLNMb">
+              <node concept="3I6sU6" id="4APe_wKVkJw" role="3Ip0Jz">
+                <node concept="3I6s7M" id="4APe_wKVkJx" role="3I6sU7">
+                  <node concept="3Aqt3T" id="4APe_wKVkJy" role="3I6s78">
+                    <ref role="3AqCNq" node="6N2bvv_l2qf" resolve="__recoverList__" />
+                    <node concept="a7P8L" id="4APe_wKVkJz" role="3AunhB">
+                      <ref role="a7OzE" node="4APe_wKVkJD" resolve="Nodes" />
                     </node>
-                    <node concept="1HFMs5" id="2rIdnPwt61u" role="3AunhB">
-                      <node concept="a7P8L" id="2rIdnPwt61v" role="1uarlU">
-                        <ref role="a7OzE" node="5TXeSYSHy4v" resolve="Terms" />
+                    <node concept="1HFMs5" id="4APe_wKVkJ$" role="3AunhB">
+                      <node concept="a7P8L" id="4APe_wKVkJ_" role="1uarlU">
+                        <ref role="a7OzE" node="4APe_wKVkJG" resolve="Terms" />
                       </node>
-                      <node concept="Hz6ka" id="2rIdnPwt65e" role="1uarlW">
-                        <node concept="1Pxxm1" id="7L5omgek1kU" role="Hz6kd">
-                          <node concept="3wAshV" id="3zXFZnUhsNd" role="1Pxxm0">
-                            <node concept="a7P8L" id="2rIdnPwt68A" role="3wAq21">
-                              <ref role="a7OzE" node="6N2bvv_l2E6" resolve="T" />
-                            </node>
-                          </node>
-                          <node concept="3wAshV" id="3zXFZnUhsNe" role="1Pxxm2">
-                            <node concept="a7P8L" id="2rIdnPwt6c0" role="3wAq21">
-                              <ref role="a7OzE" node="6N2bvv_l2Kl" resolve="Tail" />
-                            </node>
-                          </node>
-                        </node>
+                      <node concept="Hz6ka" id="4APe_wKVkJA" role="1uarlW">
+                        <node concept="KCUsM" id="4APe_wKVkJB" role="Hz6kd" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3NuqgR" id="6N2bvv_l2mF" role="0Rg$4">
-              <node concept="aZer4" id="6N2bvv_l2E6" role="3XD1gS">
-                <property role="TrG5h" value="T" />
-              </node>
-              <node concept="32pEOW" id="24ciDNzxNFf" role="3vLBG7" />
-            </node>
-            <node concept="3NuqgR" id="6N2bvv_l2Kk" role="0Rg$4">
-              <node concept="aZer4" id="6N2bvv_l2Kl" role="3XD1gS">
-                <property role="TrG5h" value="Tail" />
-              </node>
-              <node concept="VbTHi" id="7L5omgek2tj" role="3vLBG7" />
-            </node>
-            <node concept="3NuqgR" id="5TXeSYSHy4r" role="0Rg$4">
-              <node concept="aZer4" id="5TXeSYSHy4s" role="3XD1gS">
+            <node concept="3NuqgR" id="4APe_wKVkJC" role="0Rg$4">
+              <node concept="aZer4" id="4APe_wKVkJD" role="3XD1gS">
                 <property role="TrG5h" value="Nodes" />
               </node>
-              <node concept="2I9FWS" id="5TXeSYSHy4t" role="3vLBG7" />
+              <node concept="2I9FWS" id="4APe_wKVkJE" role="3vLBG7" />
             </node>
-            <node concept="3NuqgR" id="5TXeSYSHy4u" role="0Rg$4">
-              <node concept="aZer4" id="5TXeSYSHy4v" role="3XD1gS">
+            <node concept="3NuqgR" id="4APe_wKVkJF" role="0Rg$4">
+              <node concept="aZer4" id="4APe_wKVkJG" role="3XD1gS">
                 <property role="TrG5h" value="Terms" />
               </node>
-              <node concept="32pEOW" id="24ciDNzxNFg" role="3vLBG7" />
+              <node concept="32pEOW" id="4APe_wKVkJH" role="3vLBG7" />
             </node>
-            <node concept="3xSepi" id="6E2cNicdiky" role="3xSepv">
-              <node concept="3Aq9E8" id="6N2bvv_pZTM" role="3xSepj">
-                <node concept="3I6sU6" id="6N2bvv_pZTN" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="1VeWL_cIIYU" role="3I6sU7">
-                    <node concept="3A8Hvi" id="1VeWL_cIIZ0" role="3I6s78">
-                      <node concept="HKQnh" id="1VeWL_cIJ21" role="3A8w4Q">
-                        <node concept="2ShNRf" id="1VeWL_cIJ29" role="HKQng">
-                          <node concept="2T8Vx0" id="1VeWL_cIKfM" role="2ShVmc">
-                            <node concept="2I9FWS" id="1VeWL_cIKfO" role="2T96Bj" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="1VeWL_cIIYJ" role="3A8wtg">
-                        <ref role="a7OzE" node="5TXeSYSHy4s" resolve="Nodes" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
+            <node concept="3NuqgR" id="4APe_wKVkJI" role="0Rg$4">
+              <node concept="aZer4" id="4APe_wKVkJJ" role="3XD1gS">
+                <property role="TrG5h" value="X" />
               </node>
+              <node concept="32pEOW" id="4APe_wKVkJK" role="3vLBG7" />
             </node>
-            <node concept="3Aq9_M" id="1VeWL_cIDYo" role="1nLNMa">
-              <node concept="3I6sU6" id="1VeWL_cIDYp" role="3Ip0Jz">
-                <node concept="3I6s7M" id="1VeWL_cIDYx" role="3I6sU7">
-                  <node concept="3wWvb2" id="1VeWL_cIDYw" role="3I6s78">
-                    <node concept="3clFbC" id="1VeWL_cIHJB" role="3wWo3s">
-                      <node concept="10Nm6u" id="1VeWL_cIImN" role="3uHU7w" />
-                      <node concept="1Ft4W6" id="1VeWL_cIDY_" role="3uHU7B">
-                        <node concept="a7P8L" id="1VeWL_cIDY$" role="1FtiSR">
-                          <ref role="a7OzE" node="5TXeSYSHy4s" resolve="Nodes" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
+            <node concept="3xSepi" id="4APe_wKVkJL" role="3xSepv">
+              <node concept="3Aq9E8" id="4APe_wKVkJM" role="3xSepj">
+                <node concept="3I6sU6" id="4APe_wKVkJN" role="3Ip0Jz" />
               </node>
             </node>
           </node>
@@ -1668,9 +1963,6 @@
             </node>
             <node concept="3NuqgR" id="5f6wxQ33YbC" role="0Rg$4">
               <node concept="3Tqbb2" id="5f6wxQ33YbM" role="3vLBG7" />
-              <node concept="aZer4" id="7lmP5gAtZCW" role="3XD1gS">
-                <property role="TrG5h" value="Location" />
-              </node>
               <node concept="aZer4" id="5QftlvwZ25T" role="3XD1gS">
                 <property role="TrG5h" value="Node" />
               </node>
@@ -1836,9 +2128,25 @@
     <property role="TrG5h" value="_RecoverType_" />
     <ref role="2YbDB9" node="j$DTRidoLS" resolve="_RecoverType_Default_" />
     <node concept="n94m4" id="j$DTRidKsN" role="lGtFl" />
+    <node concept="1ZhdrF" id="4APe_wL9AVe" role="lGtFl">
+      <property role="2qtEX8" value="extends" />
+      <property role="P3scX" value="c4803b19-6d89-4a3b-bf82-390769514add/8335224865066015764/3541122455446356437" />
+      <node concept="3$xsQk" id="4APe_wL9AVf" role="3$ytzL">
+        <node concept="3clFbS" id="4APe_wL9AVg" role="2VODD2">
+          <node concept="3clFbF" id="2GOEA2mHG9" role="3cqZAp">
+            <node concept="2YIFZM" id="2GOEA2mHN1" role="3clFbG">
+              <ref role="37wK5l" to="fwnm:2GOEA2mESH" resolve="lookup_recoverType_default_list" />
+              <ref role="1Pybhc" to="fwnm:7mIqwW3we0j" resolve="GeneratedSymbols" />
+              <node concept="1iwH7S" id="2GOEA2mHSX" role="37wK5m" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="0oKg$" id="7lmP5gAtYRF">
     <property role="TrG5h" value="_ExpectTypeMacro_" />
+    <node concept="n94m4" id="4APe_wLcowW" role="lGtFl" />
     <node concept="3iyZe8" id="7lmP5gAtYUv" role="0oKgB">
       <ref role="3iRiWT" node="7lmP5gAtYUr" resolve="_expectType_" />
       <node concept="3clFbS" id="7lmP5gAtYUw" role="3iwQuN">
@@ -1851,6 +2159,21 @@
             <node concept="a7P8L" id="4qGA5WCPGBT" role="3AunhB">
               <ref role="a7OzE" node="4qGA5WCJneg" resolve="TypeTerm" />
             </node>
+            <node concept="1ZhdrF" id="4APe_wLcrtw" role="lGtFl">
+              <property role="2qtEX8" value="template" />
+              <property role="P3scX" value="c4803b19-6d89-4a3b-bf82-390769514add/7368070394767045637/7368070394767091750" />
+              <node concept="3$xsQk" id="4APe_wLcrtx" role="3$ytzL">
+                <node concept="3clFbS" id="4APe_wLcrty" role="2VODD2">
+                  <node concept="3clFbF" id="7mIqwW3wiMI" role="3cqZAp">
+                    <node concept="2YIFZM" id="7mIqwW3wiR6" role="3clFbG">
+                      <ref role="37wK5l" to="fwnm:7mIqwW3we40" resolve="lookup_recoverType" />
+                      <ref role="1Pybhc" to="fwnm:7mIqwW3we0j" resolve="GeneratedSymbols" />
+                      <node concept="1iwH7S" id="7mIqwW3wiTE" role="37wK5m" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
         <node concept="3Aqczg" id="7lmP5gAu0Ff" role="3cqZAp">
@@ -2019,7 +2342,7 @@
     </node>
   </node>
   <node concept="13MO4I" id="1vAI4X$GZYB">
-    <property role="TrG5h" value="frag_recoverType" />
+    <property role="TrG5h" value="frag_recover" />
     <property role="3GE5qa" value="typeTerm" />
     <ref role="3gUMe" to="zfi7:6wBZuQUG1yn" resolve="TypeNodeBuilder" />
     <node concept="AVZre" id="1vAI4X$H8Jp" role="13RCb5">
@@ -2053,12 +2376,63 @@
                                 <property role="P3scX" value="35320f26-77cb-4c55-be9f-a97a27770af1/8829335963593820278/8829335963593822893" />
                                 <node concept="3$xsQk" id="1vAI4X$W2N$" role="3$ytzL">
                                   <node concept="3clFbS" id="1vAI4X$W2N_" role="2VODD2">
-                                    <node concept="3clFbF" id="1vAI4X$W33Y" role="3cqZAp">
-                                      <node concept="2OqwBi" id="1vAI4X$W3f8" role="3clFbG">
-                                        <node concept="1iwH7S" id="1vAI4X$W33X" role="2Oq$k0" />
-                                        <node concept="1iwH70" id="1vAI4X$W3nT" role="2OqNvi">
-                                          <ref role="1iwH77" node="1vAI4X$KXom" resolve="feature_logical" />
-                                          <node concept="30H73N" id="1vAI4X$W3_s" role="1iwH7V" />
+                                    <node concept="1X3_iC" id="4APe_wKptDn" role="lGtFl">
+                                      <property role="3V$3am" value="statement" />
+                                      <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                                      <node concept="3clFbF" id="1vAI4X$W33Y" role="8Wnug">
+                                        <node concept="2OqwBi" id="1vAI4X$W3f8" role="3clFbG">
+                                          <node concept="1iwH7S" id="1vAI4X$W33X" role="2Oq$k0" />
+                                          <node concept="1iwH70" id="1vAI4X$W3nT" role="2OqNvi">
+                                            <ref role="1iwH77" node="1vAI4X$KXom" resolve="feature_logical" />
+                                            <node concept="30H73N" id="1vAI4X$W3_s" role="1iwH7V" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3clFbF" id="4APe_wKptIm" role="3cqZAp">
+                                      <node concept="2OqwBi" id="4APe_wKpxd_" role="3clFbG">
+                                        <node concept="2OqwBi" id="4APe_wKpuLJ" role="2Oq$k0">
+                                          <node concept="2OqwBi" id="4APe_wKptXs" role="2Oq$k0">
+                                            <node concept="3l3mFP" id="4APe_wKptIl" role="2Oq$k0" />
+                                            <node concept="2Xjw5R" id="4APe_wKpui_" role="2OqNvi">
+                                              <node concept="1xMEDy" id="4APe_wKpuiB" role="1xVPHs">
+                                                <node concept="chp4Y" id="4APe_wKpuv7" role="ri$Ld">
+                                                  <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="2qgKlT" id="4APe_wKpuZH" role="2OqNvi">
+                                            <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+                                          </node>
+                                        </node>
+                                        <node concept="1z4cxt" id="4APe_wKpxM_" role="2OqNvi">
+                                          <node concept="1bVj0M" id="4APe_wKpxMB" role="23t8la">
+                                            <node concept="3clFbS" id="4APe_wKpxMC" role="1bW5cS">
+                                              <node concept="3clFbF" id="4APe_wKpxT4" role="3cqZAp">
+                                                <node concept="17R0WA" id="4APe_wKp$Zm" role="3clFbG">
+                                                  <node concept="2OqwBi" id="4APe_wKp_tv" role="3uHU7w">
+                                                    <node concept="30H73N" id="4APe_wKp_9K" role="2Oq$k0" />
+                                                    <node concept="3TrcHB" id="4APe_wKpBYC" role="2OqNvi">
+                                                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                    </node>
+                                                  </node>
+                                                  <node concept="2OqwBi" id="4APe_wKp$cy" role="3uHU7B">
+                                                    <node concept="37vLTw" id="4APe_wKpxT3" role="2Oq$k0">
+                                                      <ref role="3cqZAo" node="4APe_wKpxMD" resolve="it" />
+                                                    </node>
+                                                    <node concept="3TrcHB" id="4APe_wKp$sQ" role="2OqNvi">
+                                                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                            <node concept="Rh6nW" id="4APe_wKpxMD" role="1bW2Oz">
+                                              <property role="TrG5h" value="it" />
+                                              <node concept="2jxLKc" id="4APe_wKpxME" role="1tU5fm" />
+                                            </node>
+                                          </node>
                                         </node>
                                       </node>
                                     </node>
@@ -2069,16 +2443,11 @@
                             <node concept="1WS0z7" id="1vAI4X$LVax" role="lGtFl">
                               <node concept="3JmXsc" id="1vAI4X$LVay" role="3Jn$fo">
                                 <node concept="3clFbS" id="1vAI4X$LVaz" role="2VODD2">
-                                  <node concept="3clFbF" id="1vAI4X$LVh7" role="3cqZAp">
-                                    <node concept="2OqwBi" id="1vAI4X$LVJX" role="3clFbG">
-                                      <node concept="2OqwBi" id="1vAI4X$LVnl" role="2Oq$k0">
-                                        <node concept="30H73N" id="1vAI4X$LVh6" role="2Oq$k0" />
-                                        <node concept="2qgKlT" id="1vAI4X$LVve" role="2OqNvi">
-                                          <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
-                                        </node>
-                                      </node>
-                                      <node concept="2qgKlT" id="1vAI4X$LVZL" role="2OqNvi">
-                                        <ref role="37wK5l" to="x5bw:7c96q9tALRr" resolve="valueFeatures" />
+                                  <node concept="3clFbF" id="4APe_wKi9Mj" role="3cqZAp">
+                                    <node concept="2OqwBi" id="4APe_wKi9UG" role="3clFbG">
+                                      <node concept="1iwH7S" id="4APe_wKi9Mi" role="2Oq$k0" />
+                                      <node concept="1psM6Z" id="4APe_wKia74" role="2OqNvi">
+                                        <ref role="1psM6Y" node="4APe_wKhFxW" resolve="allValue" />
                                       </node>
                                     </node>
                                   </node>
@@ -2102,16 +2471,11 @@
                             <node concept="1WS0z7" id="1vAI4X$KTE$" role="lGtFl">
                               <node concept="3JmXsc" id="1vAI4X$KTE_" role="3Jn$fo">
                                 <node concept="3clFbS" id="1vAI4X$KTEA" role="2VODD2">
-                                  <node concept="3clFbF" id="1vAI4X$KTK_" role="3cqZAp">
-                                    <node concept="2OqwBi" id="1vAI4X$KUze" role="3clFbG">
-                                      <node concept="2OqwBi" id="1vAI4X$KTWf" role="2Oq$k0">
-                                        <node concept="30H73N" id="1vAI4X$KTK$" role="2Oq$k0" />
-                                        <node concept="2qgKlT" id="1vAI4X$KUgs" role="2OqNvi">
-                                          <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
-                                        </node>
-                                      </node>
-                                      <node concept="2qgKlT" id="1vAI4X$KUNR" role="2OqNvi">
-                                        <ref role="37wK5l" to="x5bw:3Co8b0rO8iu" resolve="childFeatures" />
+                                  <node concept="3clFbF" id="4APe_wKiaOQ" role="3cqZAp">
+                                    <node concept="2OqwBi" id="4APe_wKiaXf" role="3clFbG">
+                                      <node concept="1iwH7S" id="4APe_wKiaOP" role="2Oq$k0" />
+                                      <node concept="1psM6Z" id="4APe_wKib7x" role="2OqNvi">
+                                        <ref role="1psM6Y" node="4APe_wKhDgm" resolve="allChild" />
                                       </node>
                                     </node>
                                   </node>
@@ -2136,12 +2500,63 @@
                                 <property role="P3scX" value="35320f26-77cb-4c55-be9f-a97a27770af1/8829335963593820278/8829335963593822893" />
                                 <node concept="3$xsQk" id="1vAI4X$LcaX" role="3$ytzL">
                                   <node concept="3clFbS" id="1vAI4X$LcaY" role="2VODD2">
-                                    <node concept="3clFbF" id="1vAI4X$Ld6u" role="3cqZAp">
-                                      <node concept="2OqwBi" id="1vAI4X$LdhC" role="3clFbG">
-                                        <node concept="1iwH7S" id="1vAI4X$Ld6t" role="2Oq$k0" />
-                                        <node concept="1iwH70" id="1vAI4X$LdxW" role="2OqNvi">
-                                          <ref role="1iwH77" node="1vAI4X$KXom" resolve="feature_logical" />
-                                          <node concept="30H73N" id="1vAI4X$LdJb" role="1iwH7V" />
+                                    <node concept="1X3_iC" id="4APe_wKpDHf" role="lGtFl">
+                                      <property role="3V$3am" value="statement" />
+                                      <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                                      <node concept="3clFbF" id="1vAI4X$Ld6u" role="8Wnug">
+                                        <node concept="2OqwBi" id="1vAI4X$LdhC" role="3clFbG">
+                                          <node concept="1iwH7S" id="1vAI4X$Ld6t" role="2Oq$k0" />
+                                          <node concept="1iwH70" id="1vAI4X$LdxW" role="2OqNvi">
+                                            <ref role="1iwH77" node="1vAI4X$KXom" resolve="feature_logical" />
+                                            <node concept="30H73N" id="1vAI4X$LdJb" role="1iwH7V" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3clFbF" id="4APe_wKpDJ1" role="3cqZAp">
+                                      <node concept="2OqwBi" id="4APe_wKpDJ2" role="3clFbG">
+                                        <node concept="2OqwBi" id="4APe_wKpDJ3" role="2Oq$k0">
+                                          <node concept="2OqwBi" id="4APe_wKpDJ4" role="2Oq$k0">
+                                            <node concept="3l3mFP" id="4APe_wKpDJ5" role="2Oq$k0" />
+                                            <node concept="2Xjw5R" id="4APe_wKpDJ6" role="2OqNvi">
+                                              <node concept="1xMEDy" id="4APe_wKpDJ7" role="1xVPHs">
+                                                <node concept="chp4Y" id="4APe_wKpDJ8" role="ri$Ld">
+                                                  <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="2qgKlT" id="4APe_wKpDJ9" role="2OqNvi">
+                                            <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+                                          </node>
+                                        </node>
+                                        <node concept="1z4cxt" id="4APe_wKpDJa" role="2OqNvi">
+                                          <node concept="1bVj0M" id="4APe_wKpDJb" role="23t8la">
+                                            <node concept="3clFbS" id="4APe_wKpDJc" role="1bW5cS">
+                                              <node concept="3clFbF" id="4APe_wKpDJd" role="3cqZAp">
+                                                <node concept="17R0WA" id="4APe_wKpDJe" role="3clFbG">
+                                                  <node concept="2OqwBi" id="4APe_wKpDJf" role="3uHU7w">
+                                                    <node concept="30H73N" id="4APe_wKpDJg" role="2Oq$k0" />
+                                                    <node concept="3TrcHB" id="4APe_wKpDJh" role="2OqNvi">
+                                                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                    </node>
+                                                  </node>
+                                                  <node concept="2OqwBi" id="4APe_wKpDJi" role="3uHU7B">
+                                                    <node concept="37vLTw" id="4APe_wKpDJj" role="2Oq$k0">
+                                                      <ref role="3cqZAo" node="4APe_wKpDJl" resolve="it" />
+                                                    </node>
+                                                    <node concept="3TrcHB" id="4APe_wKpDJk" role="2OqNvi">
+                                                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                            <node concept="Rh6nW" id="4APe_wKpDJl" role="1bW2Oz">
+                                              <property role="TrG5h" value="it" />
+                                              <node concept="2jxLKc" id="4APe_wKpDJm" role="1tU5fm" />
+                                            </node>
+                                          </node>
                                         </node>
                                       </node>
                                     </node>
@@ -2155,16 +2570,11 @@
                             <node concept="1WS0z7" id="3Co8b0rOuaV" role="lGtFl">
                               <node concept="3JmXsc" id="3Co8b0rOuaW" role="3Jn$fo">
                                 <node concept="3clFbS" id="3Co8b0rOuaX" role="2VODD2">
-                                  <node concept="3clFbF" id="3Co8b0rOuaY" role="3cqZAp">
-                                    <node concept="2OqwBi" id="3Co8b0rOuaZ" role="3clFbG">
-                                      <node concept="2OqwBi" id="3Co8b0rOub0" role="2Oq$k0">
-                                        <node concept="30H73N" id="3Co8b0rOub1" role="2Oq$k0" />
-                                        <node concept="2qgKlT" id="3Co8b0rOub2" role="2OqNvi">
-                                          <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
-                                        </node>
-                                      </node>
-                                      <node concept="2qgKlT" id="3Co8b0rOub3" role="2OqNvi">
-                                        <ref role="37wK5l" to="x5bw:3Co8b0rO986" resolve="listFeatures" />
+                                  <node concept="3clFbF" id="4APe_wKibTI" role="3cqZAp">
+                                    <node concept="2OqwBi" id="4APe_wKic27" role="3clFbG">
+                                      <node concept="1iwH7S" id="4APe_wKibTH" role="2Oq$k0" />
+                                      <node concept="1psM6Z" id="4APe_wKicgD" role="2OqNvi">
+                                        <ref role="1psM6Y" node="4APe_wKhEzi" resolve="allList" />
                                       </node>
                                     </node>
                                   </node>
@@ -2189,12 +2599,63 @@
                                 <property role="P3scX" value="35320f26-77cb-4c55-be9f-a97a27770af1/8829335963593820278/8829335963593822893" />
                                 <node concept="3$xsQk" id="3Co8b0rOwpX" role="3$ytzL">
                                   <node concept="3clFbS" id="3Co8b0rOwpY" role="2VODD2">
-                                    <node concept="3clFbF" id="3Co8b0rOubd" role="3cqZAp">
-                                      <node concept="2OqwBi" id="3Co8b0rOube" role="3clFbG">
-                                        <node concept="1iwH7S" id="3Co8b0rOubf" role="2Oq$k0" />
-                                        <node concept="1iwH70" id="3Co8b0rOubg" role="2OqNvi">
-                                          <ref role="1iwH77" node="1vAI4X$KXom" resolve="feature_logical" />
-                                          <node concept="30H73N" id="3Co8b0rOubh" role="1iwH7V" />
+                                    <node concept="1X3_iC" id="4APe_wKpEmw" role="lGtFl">
+                                      <property role="3V$3am" value="statement" />
+                                      <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                                      <node concept="3clFbF" id="3Co8b0rOubd" role="8Wnug">
+                                        <node concept="2OqwBi" id="3Co8b0rOube" role="3clFbG">
+                                          <node concept="1iwH7S" id="3Co8b0rOubf" role="2Oq$k0" />
+                                          <node concept="1iwH70" id="3Co8b0rOubg" role="2OqNvi">
+                                            <ref role="1iwH77" node="1vAI4X$KXom" resolve="feature_logical" />
+                                            <node concept="30H73N" id="3Co8b0rOubh" role="1iwH7V" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3clFbF" id="4APe_wKpEnI" role="3cqZAp">
+                                      <node concept="2OqwBi" id="4APe_wKpEnJ" role="3clFbG">
+                                        <node concept="2OqwBi" id="4APe_wKpEnK" role="2Oq$k0">
+                                          <node concept="2OqwBi" id="4APe_wKpEnL" role="2Oq$k0">
+                                            <node concept="3l3mFP" id="4APe_wKpEnM" role="2Oq$k0" />
+                                            <node concept="2Xjw5R" id="4APe_wKpEnN" role="2OqNvi">
+                                              <node concept="1xMEDy" id="4APe_wKpEnO" role="1xVPHs">
+                                                <node concept="chp4Y" id="4APe_wKpEnP" role="ri$Ld">
+                                                  <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="2qgKlT" id="4APe_wKpEnQ" role="2OqNvi">
+                                            <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+                                          </node>
+                                        </node>
+                                        <node concept="1z4cxt" id="4APe_wKpEnR" role="2OqNvi">
+                                          <node concept="1bVj0M" id="4APe_wKpEnS" role="23t8la">
+                                            <node concept="3clFbS" id="4APe_wKpEnT" role="1bW5cS">
+                                              <node concept="3clFbF" id="4APe_wKpEnU" role="3cqZAp">
+                                                <node concept="17R0WA" id="4APe_wKpEnV" role="3clFbG">
+                                                  <node concept="2OqwBi" id="4APe_wKpEnW" role="3uHU7w">
+                                                    <node concept="30H73N" id="4APe_wKpEnX" role="2Oq$k0" />
+                                                    <node concept="3TrcHB" id="4APe_wKpEnY" role="2OqNvi">
+                                                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                    </node>
+                                                  </node>
+                                                  <node concept="2OqwBi" id="4APe_wKpEnZ" role="3uHU7B">
+                                                    <node concept="37vLTw" id="4APe_wKpEo0" role="2Oq$k0">
+                                                      <ref role="3cqZAo" node="4APe_wKpEo2" resolve="it" />
+                                                    </node>
+                                                    <node concept="3TrcHB" id="4APe_wKpEo1" role="2OqNvi">
+                                                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                            <node concept="Rh6nW" id="4APe_wKpEo2" role="1bW2Oz">
+                                              <property role="TrG5h" value="it" />
+                                              <node concept="2jxLKc" id="4APe_wKpEo3" role="1tU5fm" />
+                                            </node>
+                                          </node>
                                         </node>
                                       </node>
                                     </node>
@@ -2232,31 +2693,11 @@
                         <property role="P3scX" value="c4803b19-6d89-4a3b-bf82-390769514add/7368070394767045637/7368070394767091750" />
                         <node concept="3$xsQk" id="1PN9XOGEIqP" role="3$ytzL">
                           <node concept="3clFbS" id="1PN9XOGEIqQ" role="2VODD2">
-                            <node concept="3cpWs8" id="1PN9XOGEIAl" role="3cqZAp">
-                              <node concept="3cpWsn" id="1PN9XOGEIAm" role="3cpWs9">
-                                <property role="TrG5h" value="rlist" />
-                                <node concept="3Tqbb2" id="1PN9XOGEIAn" role="1tU5fm">
-                                  <ref role="ehGHo" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
-                                </node>
-                                <node concept="2OqwBi" id="1PN9XOGEIAo" role="33vP2m">
-                                  <node concept="1iwH7S" id="1PN9XOGEIAp" role="2Oq$k0" />
-                                  <node concept="1iwH7d" id="1PN9XOGEIAq" role="2OqNvi">
-                                    <ref role="1iwH7c" node="4LE1vMPhNy4" resolve="recoverTypeDefault" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3clFbF" id="1PN9XOGEIAr" role="3cqZAp">
-                              <node concept="2OqwBi" id="1PN9XOGEIAs" role="3clFbG">
-                                <node concept="2OqwBi" id="1PN9XOGEIAt" role="2Oq$k0">
-                                  <node concept="37vLTw" id="1PN9XOGEIAu" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="1PN9XOGEIAm" resolve="rlist" />
-                                  </node>
-                                  <node concept="3Tsc0h" id="1PN9XOGEIAv" role="2OqNvi">
-                                    <ref role="3TtcxE" to="wq2x:1HWyn8jEsaE" resolve="constraint" />
-                                  </node>
-                                </node>
-                                <node concept="1uHKPH" id="1PN9XOGEIAw" role="2OqNvi" />
+                            <node concept="3clFbF" id="7mIqwW3wmSI" role="3cqZAp">
+                              <node concept="2YIFZM" id="7mIqwW3wmSJ" role="3clFbG">
+                                <ref role="37wK5l" to="fwnm:7mIqwW3we40" resolve="lookup_recoverType" />
+                                <ref role="1Pybhc" to="fwnm:7mIqwW3we0j" resolve="GeneratedSymbols" />
+                                <node concept="1iwH7S" id="7mIqwW3wmSK" role="37wK5m" />
                               </node>
                             </node>
                           </node>
@@ -2282,19 +2723,14 @@
                 <node concept="aZer4" id="1PN9XOGEEIe" role="3XD1gS">
                   <property role="TrG5h" value="ChildType" />
                   <node concept="1WS0z7" id="1PN9XOGEGqa" role="lGtFl">
-                    <ref role="2rW$FS" node="1PN9XOGEAUt" resolve="feature_type" />
+                    <ref role="2rW$FS" node="1PN9XOGEAUt" resolve="feature_node" />
                     <node concept="3JmXsc" id="1PN9XOGEGqb" role="3Jn$fo">
                       <node concept="3clFbS" id="1PN9XOGEGqc" role="2VODD2">
-                        <node concept="3clFbF" id="1PN9XOGEGqS" role="3cqZAp">
-                          <node concept="2OqwBi" id="1PN9XOGEGqT" role="3clFbG">
-                            <node concept="2OqwBi" id="1PN9XOGEGqU" role="2Oq$k0">
-                              <node concept="30H73N" id="1PN9XOGEGqV" role="2Oq$k0" />
-                              <node concept="2qgKlT" id="1PN9XOGEGqW" role="2OqNvi">
-                                <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
-                              </node>
-                            </node>
-                            <node concept="2qgKlT" id="1PN9XOGEGqX" role="2OqNvi">
-                              <ref role="37wK5l" to="x5bw:3Co8b0rO8iu" resolve="childFeatures" />
+                        <node concept="3clFbF" id="4APe_wKhWGm" role="3cqZAp">
+                          <node concept="2OqwBi" id="4APe_wKhWGo" role="3clFbG">
+                            <node concept="1iwH7S" id="4APe_wKhWGp" role="2Oq$k0" />
+                            <node concept="1psM6Z" id="4APe_wKhWGq" role="2OqNvi">
+                              <ref role="1psM6Y" node="4APe_wKhDgm" resolve="allChild" />
                             </node>
                           </node>
                         </node>
@@ -2327,20 +2763,15 @@
                 <node concept="1W57fq" id="1PN9XOGEGan" role="lGtFl">
                   <node concept="3IZrLx" id="1PN9XOGEGao" role="3IZSJc">
                     <node concept="3clFbS" id="1PN9XOGEGap" role="2VODD2">
-                      <node concept="3clFbF" id="1PN9XOGEGe$" role="3cqZAp">
-                        <node concept="2OqwBi" id="1PN9XOGEGe_" role="3clFbG">
-                          <node concept="2OqwBi" id="1PN9XOGEGeA" role="2Oq$k0">
-                            <node concept="2OqwBi" id="1PN9XOGEGeB" role="2Oq$k0">
-                              <node concept="30H73N" id="1PN9XOGEGeC" role="2Oq$k0" />
-                              <node concept="2qgKlT" id="1PN9XOGEGeD" role="2OqNvi">
-                                <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
-                              </node>
-                            </node>
-                            <node concept="2qgKlT" id="1PN9XOGEGeE" role="2OqNvi">
-                              <ref role="37wK5l" to="x5bw:3Co8b0rO8iu" resolve="childFeatures" />
+                      <node concept="3clFbF" id="4APe_wKhT$s" role="3cqZAp">
+                        <node concept="2OqwBi" id="4APe_wKhU9h" role="3clFbG">
+                          <node concept="2OqwBi" id="4APe_wKhTM8" role="2Oq$k0">
+                            <node concept="1iwH7S" id="4APe_wKhT$r" role="2Oq$k0" />
+                            <node concept="1psM6Z" id="4APe_wKhTTX" role="2OqNvi">
+                              <ref role="1psM6Y" node="4APe_wKhDgm" resolve="allChild" />
                             </node>
                           </node>
-                          <node concept="3GX2aA" id="1PN9XOGEGeF" role="2OqNvi" />
+                          <node concept="3GX2aA" id="4APe_wKhWvu" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
@@ -2354,16 +2785,11 @@
                     <ref role="2rW$FS" node="1vAI4X$KXom" resolve="feature_logical" />
                     <node concept="3JmXsc" id="1vAI4X$L4B$" role="3Jn$fo">
                       <node concept="3clFbS" id="1vAI4X$L4B_" role="2VODD2">
-                        <node concept="3clFbF" id="1vAI4X$L6dD" role="3cqZAp">
-                          <node concept="2OqwBi" id="1vAI4X$L6dE" role="3clFbG">
-                            <node concept="2OqwBi" id="1vAI4X$LGiG" role="2Oq$k0">
-                              <node concept="30H73N" id="1vAI4X$LGfH" role="2Oq$k0" />
-                              <node concept="2qgKlT" id="1vAI4X$LGrG" role="2OqNvi">
-                                <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
-                              </node>
-                            </node>
-                            <node concept="2qgKlT" id="1vAI4X$L6dG" role="2OqNvi">
-                              <ref role="37wK5l" to="x5bw:3Co8b0rO8iu" resolve="childFeatures" />
+                        <node concept="3clFbF" id="4APe_wKhYcD" role="3cqZAp">
+                          <node concept="2OqwBi" id="4APe_wKhYcF" role="3clFbG">
+                            <node concept="1iwH7S" id="4APe_wKhYcG" role="2Oq$k0" />
+                            <node concept="1psM6Z" id="4APe_wKhYcH" role="2OqNvi">
+                              <ref role="1psM6Y" node="4APe_wKhDgm" resolve="allChild" />
                             </node>
                           </node>
                         </node>
@@ -2391,20 +2817,15 @@
                 <node concept="1W57fq" id="1vAI4X$LybC" role="lGtFl">
                   <node concept="3IZrLx" id="1vAI4X$LybD" role="3IZSJc">
                     <node concept="3clFbS" id="1vAI4X$LybE" role="2VODD2">
-                      <node concept="3clFbF" id="1vAI4X$L_Fl" role="3cqZAp">
-                        <node concept="2OqwBi" id="1vAI4X$L_ZQ" role="3clFbG">
-                          <node concept="2OqwBi" id="1vAI4X$L_Fm" role="2Oq$k0">
-                            <node concept="2OqwBi" id="1vAI4X$LE7h" role="2Oq$k0">
-                              <node concept="30H73N" id="1vAI4X$LE4D" role="2Oq$k0" />
-                              <node concept="2qgKlT" id="1vAI4X$LEoY" role="2OqNvi">
-                                <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
-                              </node>
-                            </node>
-                            <node concept="2qgKlT" id="1vAI4X$L_Ft" role="2OqNvi">
-                              <ref role="37wK5l" to="x5bw:3Co8b0rO8iu" resolve="childFeatures" />
+                      <node concept="3clFbF" id="4APe_wKhXE5" role="3cqZAp">
+                        <node concept="2OqwBi" id="4APe_wKhXE6" role="3clFbG">
+                          <node concept="2OqwBi" id="4APe_wKhXE7" role="2Oq$k0">
+                            <node concept="1iwH7S" id="4APe_wKhXE8" role="2Oq$k0" />
+                            <node concept="1psM6Z" id="4APe_wKhXE9" role="2OqNvi">
+                              <ref role="1psM6Y" node="4APe_wKhDgm" resolve="allChild" />
                             </node>
                           </node>
-                          <node concept="3GX2aA" id="1vAI4X$LATj" role="2OqNvi" />
+                          <node concept="3GX2aA" id="4APe_wKhXEa" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
@@ -2418,16 +2839,11 @@
                     <ref role="2rW$FS" node="1PN9XOGEAUt" resolve="feature_node" />
                     <node concept="3JmXsc" id="3Co8b0rOgiz" role="3Jn$fo">
                       <node concept="3clFbS" id="3Co8b0rOgi$" role="2VODD2">
-                        <node concept="3clFbF" id="3Co8b0rOgi_" role="3cqZAp">
-                          <node concept="2OqwBi" id="3Co8b0rOgiA" role="3clFbG">
-                            <node concept="2OqwBi" id="3Co8b0rOgiB" role="2Oq$k0">
-                              <node concept="30H73N" id="3Co8b0rOgiC" role="2Oq$k0" />
-                              <node concept="2qgKlT" id="3Co8b0rOgiD" role="2OqNvi">
-                                <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
-                              </node>
-                            </node>
-                            <node concept="2qgKlT" id="3Co8b0rOgiE" role="2OqNvi">
-                              <ref role="37wK5l" to="x5bw:3Co8b0rO986" resolve="listFeatures" />
+                        <node concept="3clFbF" id="4APe_wKi0HX" role="3cqZAp">
+                          <node concept="2OqwBi" id="4APe_wKi0HZ" role="3clFbG">
+                            <node concept="1iwH7S" id="4APe_wKi0I0" role="2Oq$k0" />
+                            <node concept="1psM6Z" id="4APe_wKi0I1" role="2OqNvi">
+                              <ref role="1psM6Y" node="4APe_wKhEzi" resolve="allList" />
                             </node>
                           </node>
                         </node>
@@ -2460,20 +2876,15 @@
                 <node concept="1W57fq" id="3Co8b0rOgiP" role="lGtFl">
                   <node concept="3IZrLx" id="3Co8b0rOgiQ" role="3IZSJc">
                     <node concept="3clFbS" id="3Co8b0rOgiR" role="2VODD2">
-                      <node concept="3clFbF" id="3Co8b0rOgiS" role="3cqZAp">
-                        <node concept="2OqwBi" id="3Co8b0rOgiT" role="3clFbG">
-                          <node concept="2OqwBi" id="3Co8b0rOgiU" role="2Oq$k0">
-                            <node concept="2OqwBi" id="3Co8b0rOgiV" role="2Oq$k0">
-                              <node concept="30H73N" id="3Co8b0rOgiW" role="2Oq$k0" />
-                              <node concept="2qgKlT" id="3Co8b0rOgiX" role="2OqNvi">
-                                <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
-                              </node>
-                            </node>
-                            <node concept="2qgKlT" id="3Co8b0rOgiY" role="2OqNvi">
-                              <ref role="37wK5l" to="x5bw:3Co8b0rO986" resolve="listFeatures" />
+                      <node concept="3clFbF" id="4APe_wKhZGW" role="3cqZAp">
+                        <node concept="2OqwBi" id="4APe_wKhZGX" role="3clFbG">
+                          <node concept="2OqwBi" id="4APe_wKhZGY" role="2Oq$k0">
+                            <node concept="1iwH7S" id="4APe_wKhZGZ" role="2Oq$k0" />
+                            <node concept="1psM6Z" id="4APe_wKhZH0" role="2OqNvi">
+                              <ref role="1psM6Y" node="4APe_wKhEzi" resolve="allList" />
                             </node>
                           </node>
-                          <node concept="3GX2aA" id="3Co8b0rOgiZ" role="2OqNvi" />
+                          <node concept="3GX2aA" id="4APe_wKhZH1" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
@@ -2487,16 +2898,11 @@
                     <ref role="2rW$FS" node="1vAI4X$KXom" resolve="feature_logical" />
                     <node concept="3JmXsc" id="3Co8b0rOkRS" role="3Jn$fo">
                       <node concept="3clFbS" id="3Co8b0rOkRT" role="2VODD2">
-                        <node concept="3clFbF" id="3Co8b0rOkRU" role="3cqZAp">
-                          <node concept="2OqwBi" id="3Co8b0rOkRV" role="3clFbG">
-                            <node concept="2OqwBi" id="3Co8b0rOkRW" role="2Oq$k0">
-                              <node concept="30H73N" id="3Co8b0rOkRX" role="2Oq$k0" />
-                              <node concept="2qgKlT" id="3Co8b0rOkRY" role="2OqNvi">
-                                <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
-                              </node>
-                            </node>
-                            <node concept="2qgKlT" id="3Co8b0rOkRZ" role="2OqNvi">
-                              <ref role="37wK5l" to="x5bw:3Co8b0rO986" resolve="listFeatures" />
+                        <node concept="3clFbF" id="4APe_wKi5WB" role="3cqZAp">
+                          <node concept="2OqwBi" id="4APe_wKi5WD" role="3clFbG">
+                            <node concept="1iwH7S" id="4APe_wKi5WE" role="2Oq$k0" />
+                            <node concept="1psM6Z" id="4APe_wKi5WF" role="2OqNvi">
+                              <ref role="1psM6Y" node="4APe_wKhEzi" resolve="allList" />
                             </node>
                           </node>
                         </node>
@@ -2524,20 +2930,15 @@
                 <node concept="1W57fq" id="3Co8b0rOkS8" role="lGtFl">
                   <node concept="3IZrLx" id="3Co8b0rOkS9" role="3IZSJc">
                     <node concept="3clFbS" id="3Co8b0rOkSa" role="2VODD2">
-                      <node concept="3clFbF" id="3Co8b0rOkSb" role="3cqZAp">
-                        <node concept="2OqwBi" id="3Co8b0rOkSc" role="3clFbG">
-                          <node concept="2OqwBi" id="3Co8b0rOkSd" role="2Oq$k0">
-                            <node concept="2OqwBi" id="3Co8b0rOkSe" role="2Oq$k0">
-                              <node concept="30H73N" id="3Co8b0rOkSf" role="2Oq$k0" />
-                              <node concept="2qgKlT" id="3Co8b0rOkSg" role="2OqNvi">
-                                <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
-                              </node>
-                            </node>
-                            <node concept="2qgKlT" id="3Co8b0rOkSh" role="2OqNvi">
-                              <ref role="37wK5l" to="x5bw:3Co8b0rO986" resolve="listFeatures" />
+                      <node concept="3clFbF" id="4APe_wKi2Ej" role="3cqZAp">
+                        <node concept="2OqwBi" id="4APe_wKi4e0" role="3clFbG">
+                          <node concept="2OqwBi" id="4APe_wKi2El" role="2Oq$k0">
+                            <node concept="1iwH7S" id="4APe_wKi2Em" role="2Oq$k0" />
+                            <node concept="1psM6Z" id="4APe_wKi2En" role="2OqNvi">
+                              <ref role="1psM6Y" node="4APe_wKhEzi" resolve="allList" />
                             </node>
                           </node>
-                          <node concept="3GX2aA" id="3Co8b0rOkSi" role="2OqNvi" />
+                          <node concept="3GX2aA" id="4APe_wKi5Me" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
@@ -2620,37 +3021,32 @@
                 <node concept="1WS0z7" id="1vAI4X$VOms" role="lGtFl">
                   <node concept="3JmXsc" id="1vAI4X$VOmt" role="3Jn$fo">
                     <node concept="3clFbS" id="1vAI4X$VOmu" role="2VODD2">
-                      <node concept="3clFbF" id="1vAI4X$VOyn" role="3cqZAp">
-                        <node concept="2OqwBi" id="1vAI4X$VTFH" role="3clFbG">
-                          <node concept="2OqwBi" id="1vAI4X$VOyo" role="2Oq$k0">
-                            <node concept="2OqwBi" id="1vAI4X$VOyp" role="2Oq$k0">
-                              <node concept="30H73N" id="1vAI4X$VOyq" role="2Oq$k0" />
-                              <node concept="2qgKlT" id="1vAI4X$VOyr" role="2OqNvi">
-                                <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
-                              </node>
-                            </node>
-                            <node concept="2qgKlT" id="1vAI4X$VOys" role="2OqNvi">
-                              <ref role="37wK5l" to="x5bw:7c96q9tALRr" resolve="valueFeatures" />
+                      <node concept="3clFbF" id="4APe_wKi7pz" role="3cqZAp">
+                        <node concept="2OqwBi" id="4APe_wKj4PN" role="3clFbG">
+                          <node concept="2OqwBi" id="4APe_wKi7Yl" role="2Oq$k0">
+                            <node concept="1iwH7S" id="4APe_wKi7py" role="2Oq$k0" />
+                            <node concept="1psM6Z" id="4APe_wKi8kR" role="2OqNvi">
+                              <ref role="1psM6Y" node="4APe_wKhFxW" resolve="allValue" />
                             </node>
                           </node>
-                          <node concept="3$u5V9" id="1vAI4X$VUos" role="2OqNvi">
-                            <node concept="1bVj0M" id="1vAI4X$VUou" role="23t8la">
-                              <node concept="3clFbS" id="1vAI4X$VUov" role="1bW5cS">
-                                <node concept="3clFbF" id="1vAI4X$VUAD" role="3cqZAp">
-                                  <node concept="1PxgMI" id="1vAI4X$VV9n" role="3clFbG">
+                          <node concept="3$u5V9" id="4APe_wKj8Jh" role="2OqNvi">
+                            <node concept="1bVj0M" id="4APe_wKj8Jj" role="23t8la">
+                              <node concept="3clFbS" id="4APe_wKj8Jk" role="1bW5cS">
+                                <node concept="3clFbF" id="4APe_wKj9gU" role="3cqZAp">
+                                  <node concept="1PxgMI" id="4APe_wKjbWl" role="3clFbG">
                                     <property role="1BlNFB" value="true" />
-                                    <node concept="chp4Y" id="1vAI4X$VVjz" role="3oSUPX">
+                                    <node concept="chp4Y" id="4APe_wKjciH" role="3oSUPX">
                                       <ref role="cht4Q" to="wq2x:JOGAOsxnj6" resolve="ValueFeature" />
                                     </node>
-                                    <node concept="37vLTw" id="1vAI4X$VUAC" role="1m5AlR">
-                                      <ref role="3cqZAo" node="1vAI4X$VUow" resolve="it" />
+                                    <node concept="37vLTw" id="4APe_wKj9gT" role="1m5AlR">
+                                      <ref role="3cqZAo" node="4APe_wKj8Jl" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="Rh6nW" id="1vAI4X$VUow" role="1bW2Oz">
+                              <node concept="Rh6nW" id="4APe_wKj8Jl" role="1bW2Oz">
                                 <property role="TrG5h" value="it" />
-                                <node concept="2jxLKc" id="1vAI4X$VUox" role="1tU5fm" />
+                                <node concept="2jxLKc" id="4APe_wKj8Jm" role="1tU5fm" />
                               </node>
                             </node>
                           </node>
@@ -2673,12 +3069,77 @@
                             <property role="P3scX" value="35320f26-77cb-4c55-be9f-a97a27770af1/8829335963593820278/8829335963593822893" />
                             <node concept="3$xsQk" id="1PN9XOGEJp2" role="3$ytzL">
                               <node concept="3clFbS" id="1PN9XOGEJp3" role="2VODD2">
-                                <node concept="3clFbF" id="1PN9XOGEJyW" role="3cqZAp">
-                                  <node concept="2OqwBi" id="1PN9XOGEJHi" role="3clFbG">
-                                    <node concept="1iwH7S" id="1PN9XOGEJyV" role="2Oq$k0" />
-                                    <node concept="1iwH70" id="1PN9XOGEJMN" role="2OqNvi">
-                                      <ref role="1iwH77" node="1PN9XOGEAUt" resolve="feature_type" />
-                                      <node concept="30H73N" id="1PN9XOGEK5h" role="1iwH7V" />
+                                <node concept="1X3_iC" id="4APe_wKqB36" role="lGtFl">
+                                  <property role="3V$3am" value="statement" />
+                                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                                  <node concept="3clFbF" id="1PN9XOGEJyW" role="8Wnug">
+                                    <node concept="2OqwBi" id="1PN9XOGEJHi" role="3clFbG">
+                                      <node concept="1iwH7S" id="1PN9XOGEJyV" role="2Oq$k0" />
+                                      <node concept="1iwH70" id="1PN9XOGEJMN" role="2OqNvi">
+                                        <ref role="1iwH77" node="1PN9XOGEAUt" resolve="feature_node" />
+                                        <node concept="30H73N" id="1PN9XOGEK5h" role="1iwH7V" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3cpWs8" id="4APe_wKq$SA" role="3cqZAp">
+                                  <node concept="3cpWsn" id="4APe_wKq$SB" role="3cpWs9">
+                                    <property role="TrG5h" value="varname" />
+                                    <node concept="17QB3L" id="4APe_wKq$EZ" role="1tU5fm" />
+                                    <node concept="3cpWs3" id="4APe_wKqAGv" role="33vP2m">
+                                      <node concept="Xl_RD" id="4APe_wKqAG_" role="3uHU7w">
+                                        <property role="Xl_RC" value="Type" />
+                                      </node>
+                                      <node concept="2OqwBi" id="4APe_wKq$SC" role="3uHU7B">
+                                        <node concept="30H73N" id="4APe_wKq$SD" role="2Oq$k0" />
+                                        <node concept="3TrcHB" id="4APe_wKq$SE" role="2OqNvi">
+                                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbF" id="4APe_wKqzSw" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4APe_wKqzSx" role="3clFbG">
+                                    <node concept="2OqwBi" id="4APe_wKqzSy" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="4APe_wKqzSz" role="2Oq$k0">
+                                        <node concept="3l3mFP" id="4APe_wKqzS$" role="2Oq$k0" />
+                                        <node concept="2Xjw5R" id="4APe_wKqzS_" role="2OqNvi">
+                                          <node concept="1xMEDy" id="4APe_wKqzSA" role="1xVPHs">
+                                            <node concept="chp4Y" id="4APe_wKqzSB" role="ri$Ld">
+                                              <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="2qgKlT" id="4APe_wKqzSC" role="2OqNvi">
+                                        <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+                                      </node>
+                                    </node>
+                                    <node concept="1z4cxt" id="4APe_wKqzSD" role="2OqNvi">
+                                      <node concept="1bVj0M" id="4APe_wKqzSE" role="23t8la">
+                                        <node concept="3clFbS" id="4APe_wKqzSF" role="1bW5cS">
+                                          <node concept="3clFbF" id="4APe_wKqzSG" role="3cqZAp">
+                                            <node concept="17R0WA" id="4APe_wKqzSH" role="3clFbG">
+                                              <node concept="37vLTw" id="4APe_wKq$SF" role="3uHU7w">
+                                                <ref role="3cqZAo" node="4APe_wKq$SB" resolve="name" />
+                                              </node>
+                                              <node concept="2OqwBi" id="4APe_wKqzSL" role="3uHU7B">
+                                                <node concept="37vLTw" id="4APe_wKqzSM" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="4APe_wKqzSO" resolve="it" />
+                                                </node>
+                                                <node concept="3TrcHB" id="4APe_wKqzSN" role="2OqNvi">
+                                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="Rh6nW" id="4APe_wKqzSO" role="1bW2Oz">
+                                          <property role="TrG5h" value="it" />
+                                          <node concept="2jxLKc" id="4APe_wKqzSP" role="1tU5fm" />
+                                        </node>
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
@@ -2693,12 +3154,63 @@
                             <property role="P3scX" value="35320f26-77cb-4c55-be9f-a97a27770af1/8829335963593820278/8829335963593822893" />
                             <node concept="3$xsQk" id="1PN9XOGENaU" role="3$ytzL">
                               <node concept="3clFbS" id="1PN9XOGENaV" role="2VODD2">
-                                <node concept="3clFbF" id="1PN9XOGEND6" role="3cqZAp">
-                                  <node concept="2OqwBi" id="1PN9XOGEND7" role="3clFbG">
-                                    <node concept="1iwH7S" id="1PN9XOGEND8" role="2Oq$k0" />
-                                    <node concept="1iwH70" id="1PN9XOGEND9" role="2OqNvi">
-                                      <ref role="1iwH77" node="1vAI4X$KXom" resolve="feature_logical" />
-                                      <node concept="30H73N" id="1PN9XOGENDa" role="1iwH7V" />
+                                <node concept="1X3_iC" id="4APe_wKqCK4" role="lGtFl">
+                                  <property role="3V$3am" value="statement" />
+                                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                                  <node concept="3clFbF" id="1PN9XOGEND6" role="8Wnug">
+                                    <node concept="2OqwBi" id="1PN9XOGEND7" role="3clFbG">
+                                      <node concept="1iwH7S" id="1PN9XOGEND8" role="2Oq$k0" />
+                                      <node concept="1iwH70" id="1PN9XOGEND9" role="2OqNvi">
+                                        <ref role="1iwH77" node="1vAI4X$KXom" resolve="feature_logical" />
+                                        <node concept="30H73N" id="1PN9XOGENDa" role="1iwH7V" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbF" id="4APe_wKqCh3" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4APe_wKqCh4" role="3clFbG">
+                                    <node concept="2OqwBi" id="4APe_wKqCh5" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="4APe_wKqCh6" role="2Oq$k0">
+                                        <node concept="3l3mFP" id="4APe_wKqCh7" role="2Oq$k0" />
+                                        <node concept="2Xjw5R" id="4APe_wKqCh8" role="2OqNvi">
+                                          <node concept="1xMEDy" id="4APe_wKqCh9" role="1xVPHs">
+                                            <node concept="chp4Y" id="4APe_wKqCha" role="ri$Ld">
+                                              <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="2qgKlT" id="4APe_wKqChb" role="2OqNvi">
+                                        <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+                                      </node>
+                                    </node>
+                                    <node concept="1z4cxt" id="4APe_wKqChc" role="2OqNvi">
+                                      <node concept="1bVj0M" id="4APe_wKqChd" role="23t8la">
+                                        <node concept="3clFbS" id="4APe_wKqChe" role="1bW5cS">
+                                          <node concept="3clFbF" id="4APe_wKqChf" role="3cqZAp">
+                                            <node concept="17R0WA" id="4APe_wKqChg" role="3clFbG">
+                                              <node concept="2OqwBi" id="4APe_wKqChh" role="3uHU7w">
+                                                <node concept="30H73N" id="4APe_wKqChi" role="2Oq$k0" />
+                                                <node concept="3TrcHB" id="4APe_wKqChj" role="2OqNvi">
+                                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                </node>
+                                              </node>
+                                              <node concept="2OqwBi" id="4APe_wKqChk" role="3uHU7B">
+                                                <node concept="37vLTw" id="4APe_wKqChl" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="4APe_wKqChn" resolve="it" />
+                                                </node>
+                                                <node concept="3TrcHB" id="4APe_wKqChm" role="2OqNvi">
+                                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="Rh6nW" id="4APe_wKqChn" role="1bW2Oz">
+                                          <property role="TrG5h" value="it" />
+                                          <node concept="2jxLKc" id="4APe_wKqCho" role="1tU5fm" />
+                                        </node>
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
@@ -2711,31 +3223,11 @@
                           <property role="P3scX" value="c4803b19-6d89-4a3b-bf82-390769514add/7368070394767045637/7368070394767091750" />
                           <node concept="3$xsQk" id="1PN9XOGEIH7" role="3$ytzL">
                             <node concept="3clFbS" id="1PN9XOGEIH8" role="2VODD2">
-                              <node concept="3cpWs8" id="1PN9XOGEIHF" role="3cqZAp">
-                                <node concept="3cpWsn" id="1PN9XOGEIHG" role="3cpWs9">
-                                  <property role="TrG5h" value="rlist" />
-                                  <node concept="3Tqbb2" id="1PN9XOGEIHH" role="1tU5fm">
-                                    <ref role="ehGHo" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
-                                  </node>
-                                  <node concept="2OqwBi" id="1PN9XOGEIHI" role="33vP2m">
-                                    <node concept="1iwH7S" id="1PN9XOGEIHJ" role="2Oq$k0" />
-                                    <node concept="1iwH7d" id="1PN9XOGEIHK" role="2OqNvi">
-                                      <ref role="1iwH7c" node="4LE1vMPhNy4" resolve="recoverTypeDefault" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbF" id="1PN9XOGEIHL" role="3cqZAp">
-                                <node concept="2OqwBi" id="1PN9XOGEIHM" role="3clFbG">
-                                  <node concept="2OqwBi" id="1PN9XOGEIHN" role="2Oq$k0">
-                                    <node concept="37vLTw" id="1PN9XOGEIHO" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="1PN9XOGEIHG" resolve="rlist" />
-                                    </node>
-                                    <node concept="3Tsc0h" id="1PN9XOGEIHP" role="2OqNvi">
-                                      <ref role="3TtcxE" to="wq2x:1HWyn8jEsaE" resolve="constraint" />
-                                    </node>
-                                  </node>
-                                  <node concept="1uHKPH" id="1PN9XOGEIHQ" role="2OqNvi" />
+                              <node concept="3clFbF" id="7mIqwW3wncR" role="3cqZAp">
+                                <node concept="2YIFZM" id="7mIqwW3wncS" role="3clFbG">
+                                  <ref role="37wK5l" to="fwnm:7mIqwW3we40" resolve="lookup_recoverType" />
+                                  <ref role="1Pybhc" to="fwnm:7mIqwW3we0j" resolve="GeneratedSymbols" />
+                                  <node concept="1iwH7S" id="7mIqwW3wncT" role="37wK5m" />
                                 </node>
                               </node>
                             </node>
@@ -2745,16 +3237,11 @@
                       <node concept="1WS0z7" id="1PN9XOGEJjM" role="lGtFl">
                         <node concept="3JmXsc" id="1PN9XOGEJjN" role="3Jn$fo">
                           <node concept="3clFbS" id="1PN9XOGEJjO" role="2VODD2">
-                            <node concept="3clFbF" id="1PN9XOGEJk_" role="3cqZAp">
-                              <node concept="2OqwBi" id="1PN9XOGEJkA" role="3clFbG">
-                                <node concept="2OqwBi" id="1PN9XOGEJkB" role="2Oq$k0">
-                                  <node concept="30H73N" id="1PN9XOGEJkC" role="2Oq$k0" />
-                                  <node concept="2qgKlT" id="1PN9XOGEJkD" role="2OqNvi">
-                                    <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
-                                  </node>
-                                </node>
-                                <node concept="2qgKlT" id="1PN9XOGEJkE" role="2OqNvi">
-                                  <ref role="37wK5l" to="x5bw:3Co8b0rO8iu" resolve="childFeatures" />
+                            <node concept="3clFbF" id="4APe_wKkGkq" role="3cqZAp">
+                              <node concept="2OqwBi" id="4APe_wKkGzJ" role="3clFbG">
+                                <node concept="1iwH7S" id="4APe_wKkGkp" role="2Oq$k0" />
+                                <node concept="1psM6Z" id="4APe_wKkGXW" role="2OqNvi">
+                                  <ref role="1psM6Y" node="4APe_wKhDgm" resolve="allChild" />
                                 </node>
                               </node>
                             </node>
@@ -2776,12 +3263,77 @@
                             <property role="P3scX" value="35320f26-77cb-4c55-be9f-a97a27770af1/8829335963593820278/8829335963593822893" />
                             <node concept="3$xsQk" id="3Co8b0rOTSt" role="3$ytzL">
                               <node concept="3clFbS" id="3Co8b0rOTSu" role="2VODD2">
-                                <node concept="3clFbF" id="3Co8b0rOTSv" role="3cqZAp">
-                                  <node concept="2OqwBi" id="3Co8b0rOTSw" role="3clFbG">
-                                    <node concept="1iwH7S" id="3Co8b0rOTSx" role="2Oq$k0" />
-                                    <node concept="1iwH70" id="3Co8b0rOTSy" role="2OqNvi">
-                                      <ref role="1iwH77" node="1PN9XOGEAUt" resolve="feature_node" />
-                                      <node concept="30H73N" id="3Co8b0rOTSz" role="1iwH7V" />
+                                <node concept="1X3_iC" id="4APe_wKqBrn" role="lGtFl">
+                                  <property role="3V$3am" value="statement" />
+                                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                                  <node concept="3clFbF" id="3Co8b0rOTSv" role="8Wnug">
+                                    <node concept="2OqwBi" id="3Co8b0rOTSw" role="3clFbG">
+                                      <node concept="1iwH7S" id="3Co8b0rOTSx" role="2Oq$k0" />
+                                      <node concept="1iwH70" id="3Co8b0rOTSy" role="2OqNvi">
+                                        <ref role="1iwH77" node="1PN9XOGEAUt" resolve="feature_node" />
+                                        <node concept="30H73N" id="3Co8b0rOTSz" role="1iwH7V" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3cpWs8" id="4APe_wKqBue" role="3cqZAp">
+                                  <node concept="3cpWsn" id="4APe_wKqBuf" role="3cpWs9">
+                                    <property role="TrG5h" value="varname" />
+                                    <node concept="17QB3L" id="4APe_wKqBug" role="1tU5fm" />
+                                    <node concept="3cpWs3" id="4APe_wKqBuh" role="33vP2m">
+                                      <node concept="Xl_RD" id="4APe_wKqBui" role="3uHU7w">
+                                        <property role="Xl_RC" value="Types" />
+                                      </node>
+                                      <node concept="2OqwBi" id="4APe_wKqBuj" role="3uHU7B">
+                                        <node concept="30H73N" id="4APe_wKqBuk" role="2Oq$k0" />
+                                        <node concept="3TrcHB" id="4APe_wKqBul" role="2OqNvi">
+                                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbF" id="4APe_wKqBum" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4APe_wKqBun" role="3clFbG">
+                                    <node concept="2OqwBi" id="4APe_wKqBuo" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="4APe_wKqBup" role="2Oq$k0">
+                                        <node concept="3l3mFP" id="4APe_wKqBuq" role="2Oq$k0" />
+                                        <node concept="2Xjw5R" id="4APe_wKqBur" role="2OqNvi">
+                                          <node concept="1xMEDy" id="4APe_wKqBus" role="1xVPHs">
+                                            <node concept="chp4Y" id="4APe_wKqBut" role="ri$Ld">
+                                              <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="2qgKlT" id="4APe_wKqBuu" role="2OqNvi">
+                                        <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+                                      </node>
+                                    </node>
+                                    <node concept="1z4cxt" id="4APe_wKqBuv" role="2OqNvi">
+                                      <node concept="1bVj0M" id="4APe_wKqBuw" role="23t8la">
+                                        <node concept="3clFbS" id="4APe_wKqBux" role="1bW5cS">
+                                          <node concept="3clFbF" id="4APe_wKqBuy" role="3cqZAp">
+                                            <node concept="17R0WA" id="4APe_wKqBuz" role="3clFbG">
+                                              <node concept="37vLTw" id="4APe_wKqBu$" role="3uHU7w">
+                                                <ref role="3cqZAo" node="4APe_wKqBuf" resolve="varname" />
+                                              </node>
+                                              <node concept="2OqwBi" id="4APe_wKqBu_" role="3uHU7B">
+                                                <node concept="37vLTw" id="4APe_wKqBuA" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="4APe_wKqBuC" resolve="it" />
+                                                </node>
+                                                <node concept="3TrcHB" id="4APe_wKqBuB" role="2OqNvi">
+                                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="Rh6nW" id="4APe_wKqBuC" role="1bW2Oz">
+                                          <property role="TrG5h" value="it" />
+                                          <node concept="2jxLKc" id="4APe_wKqBuD" role="1tU5fm" />
+                                        </node>
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
@@ -2796,12 +3348,63 @@
                             <property role="P3scX" value="35320f26-77cb-4c55-be9f-a97a27770af1/8829335963593820278/8829335963593822893" />
                             <node concept="3$xsQk" id="3Co8b0rOTSA" role="3$ytzL">
                               <node concept="3clFbS" id="3Co8b0rOTSB" role="2VODD2">
-                                <node concept="3clFbF" id="3Co8b0rOTSC" role="3cqZAp">
-                                  <node concept="2OqwBi" id="3Co8b0rOTSD" role="3clFbG">
-                                    <node concept="1iwH7S" id="3Co8b0rOTSE" role="2Oq$k0" />
-                                    <node concept="1iwH70" id="3Co8b0rOTSF" role="2OqNvi">
-                                      <ref role="1iwH77" node="1vAI4X$KXom" resolve="feature_logical" />
-                                      <node concept="30H73N" id="3Co8b0rOTSG" role="1iwH7V" />
+                                <node concept="1X3_iC" id="4APe_wKqDom" role="lGtFl">
+                                  <property role="3V$3am" value="statement" />
+                                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                                  <node concept="3clFbF" id="3Co8b0rOTSC" role="8Wnug">
+                                    <node concept="2OqwBi" id="3Co8b0rOTSD" role="3clFbG">
+                                      <node concept="1iwH7S" id="3Co8b0rOTSE" role="2Oq$k0" />
+                                      <node concept="1iwH70" id="3Co8b0rOTSF" role="2OqNvi">
+                                        <ref role="1iwH77" node="1vAI4X$KXom" resolve="feature_logical" />
+                                        <node concept="30H73N" id="3Co8b0rOTSG" role="1iwH7V" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbF" id="4APe_wKqCT2" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4APe_wKqCT3" role="3clFbG">
+                                    <node concept="2OqwBi" id="4APe_wKqCT4" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="4APe_wKqCT5" role="2Oq$k0">
+                                        <node concept="3l3mFP" id="4APe_wKqCT6" role="2Oq$k0" />
+                                        <node concept="2Xjw5R" id="4APe_wKqCT7" role="2OqNvi">
+                                          <node concept="1xMEDy" id="4APe_wKqCT8" role="1xVPHs">
+                                            <node concept="chp4Y" id="4APe_wKqCT9" role="ri$Ld">
+                                              <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="2qgKlT" id="4APe_wKqCTa" role="2OqNvi">
+                                        <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+                                      </node>
+                                    </node>
+                                    <node concept="1z4cxt" id="4APe_wKqCTb" role="2OqNvi">
+                                      <node concept="1bVj0M" id="4APe_wKqCTc" role="23t8la">
+                                        <node concept="3clFbS" id="4APe_wKqCTd" role="1bW5cS">
+                                          <node concept="3clFbF" id="4APe_wKqCTe" role="3cqZAp">
+                                            <node concept="17R0WA" id="4APe_wKqCTf" role="3clFbG">
+                                              <node concept="2OqwBi" id="4APe_wKqCTg" role="3uHU7w">
+                                                <node concept="30H73N" id="4APe_wKqCTh" role="2Oq$k0" />
+                                                <node concept="3TrcHB" id="4APe_wKqCTi" role="2OqNvi">
+                                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                </node>
+                                              </node>
+                                              <node concept="2OqwBi" id="4APe_wKqCTj" role="3uHU7B">
+                                                <node concept="37vLTw" id="4APe_wKqCTk" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="4APe_wKqCTm" resolve="it" />
+                                                </node>
+                                                <node concept="3TrcHB" id="4APe_wKqCTl" role="2OqNvi">
+                                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="Rh6nW" id="4APe_wKqCTm" role="1bW2Oz">
+                                          <property role="TrG5h" value="it" />
+                                          <node concept="2jxLKc" id="4APe_wKqCTn" role="1tU5fm" />
+                                        </node>
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
@@ -2814,38 +3417,11 @@
                           <property role="P3scX" value="c4803b19-6d89-4a3b-bf82-390769514add/7368070394767045637/7368070394767091750" />
                           <node concept="3$xsQk" id="3Co8b0rOTSI" role="3$ytzL">
                             <node concept="3clFbS" id="3Co8b0rOTSJ" role="2VODD2">
-                              <node concept="3cpWs8" id="3Co8b0rOTSK" role="3cqZAp">
-                                <node concept="3cpWsn" id="3Co8b0rOTSL" role="3cpWs9">
-                                  <property role="TrG5h" value="rlist" />
-                                  <node concept="3Tqbb2" id="3Co8b0rOTSM" role="1tU5fm">
-                                    <ref role="ehGHo" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
-                                  </node>
-                                  <node concept="2OqwBi" id="3Co8b0rOTSN" role="33vP2m">
-                                    <node concept="1iwH7S" id="3Co8b0rOTSO" role="2Oq$k0" />
-                                    <node concept="1iwH7d" id="3Co8b0rOTSP" role="2OqNvi">
-                                      <ref role="1iwH7c" node="4LE1vMPhNy4" resolve="recoverTypeDefault" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbF" id="3Co8b0rOTSQ" role="3cqZAp">
-                                <node concept="2OqwBi" id="3Co8b0rOTSR" role="3clFbG">
-                                  <node concept="2OqwBi" id="3Co8b0rRvoZ" role="2Oq$k0">
-                                    <node concept="2OqwBi" id="3Co8b0rOTSS" role="2Oq$k0">
-                                      <node concept="37vLTw" id="3Co8b0rOTST" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3Co8b0rOTSL" resolve="rlist" />
-                                      </node>
-                                      <node concept="3Tsc0h" id="3Co8b0rOTSU" role="2OqNvi">
-                                        <ref role="3TtcxE" to="wq2x:1HWyn8jEsaE" resolve="constraint" />
-                                      </node>
-                                    </node>
-                                    <node concept="7r0gD" id="3Co8b0rRy_P" role="2OqNvi">
-                                      <node concept="3cmrfG" id="3Co8b0rRy_Y" role="7T0AP">
-                                        <property role="3cmrfH" value="1" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="1uHKPH" id="3Co8b0rOTSV" role="2OqNvi" />
+                              <node concept="3clFbF" id="7mIqwW3wn$v" role="3cqZAp">
+                                <node concept="2YIFZM" id="7mIqwW3SL6y" role="3clFbG">
+                                  <ref role="37wK5l" to="fwnm:7mIqwW3wnNP" resolve="lookup_recoverList" />
+                                  <ref role="1Pybhc" to="fwnm:7mIqwW3we0j" resolve="GeneratedSymbols" />
+                                  <node concept="1iwH7S" id="7mIqwW3SL6z" role="37wK5m" />
                                 </node>
                               </node>
                             </node>
@@ -2855,16 +3431,11 @@
                       <node concept="1WS0z7" id="3Co8b0rOTSW" role="lGtFl">
                         <node concept="3JmXsc" id="3Co8b0rOTSX" role="3Jn$fo">
                           <node concept="3clFbS" id="3Co8b0rOTSY" role="2VODD2">
-                            <node concept="3clFbF" id="3Co8b0rOTSZ" role="3cqZAp">
-                              <node concept="2OqwBi" id="3Co8b0rOTT0" role="3clFbG">
-                                <node concept="2OqwBi" id="3Co8b0rOTT1" role="2Oq$k0">
-                                  <node concept="30H73N" id="3Co8b0rOTT2" role="2Oq$k0" />
-                                  <node concept="2qgKlT" id="3Co8b0rOTT3" role="2OqNvi">
-                                    <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
-                                  </node>
-                                </node>
-                                <node concept="2qgKlT" id="3Co8b0rOTT4" role="2OqNvi">
-                                  <ref role="37wK5l" to="x5bw:3Co8b0rO986" resolve="listFeatures" />
+                            <node concept="3clFbF" id="4APe_wKkI1I" role="3cqZAp">
+                              <node concept="2OqwBi" id="4APe_wKkIeV" role="3clFbG">
+                                <node concept="1iwH7S" id="4APe_wKkI1H" role="2Oq$k0" />
+                                <node concept="1psM6Z" id="4APe_wKkIBr" role="2OqNvi">
+                                  <ref role="1psM6Y" node="4APe_wKhEzi" resolve="allList" />
                                 </node>
                               </node>
                             </node>
@@ -2905,6 +3476,134 @@
                 </node>
               </node>
             </node>
+            <node concept="1ps_y7" id="4APe_wKhDgl" role="lGtFl">
+              <node concept="1ps_xZ" id="4APe_wKhDgm" role="1ps_xO">
+                <property role="TrG5h" value="allChild" />
+                <node concept="2jfdEK" id="4APe_wKhDgn" role="1ps_xN">
+                  <node concept="3clFbS" id="4APe_wKhDgo" role="2VODD2">
+                    <node concept="3clFbF" id="4APe_wKhHAc" role="3cqZAp">
+                      <node concept="2OqwBi" id="4APe_wKhLnl" role="3clFbG">
+                        <node concept="2OqwBi" id="4APe_wKhIs7" role="2Oq$k0">
+                          <node concept="2OqwBi" id="4APe_wKhHAf" role="2Oq$k0">
+                            <node concept="30H73N" id="4APe_wKhHAg" role="2Oq$k0" />
+                            <node concept="2qgKlT" id="4APe_wKhHAh" role="2OqNvi">
+                              <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
+                            </node>
+                          </node>
+                          <node concept="2qgKlT" id="4APe_wKhJ2b" role="2OqNvi">
+                            <ref role="37wK5l" to="x5bw:4lCLOtww4qi" resolve="prototypesStack" />
+                          </node>
+                        </node>
+                        <node concept="3goQfb" id="4APe_wKhNM3" role="2OqNvi">
+                          <node concept="1bVj0M" id="4APe_wKhNM5" role="23t8la">
+                            <node concept="3clFbS" id="4APe_wKhNM6" role="1bW5cS">
+                              <node concept="3clFbF" id="4APe_wKhNYI" role="3cqZAp">
+                                <node concept="2OqwBi" id="4APe_wKhOgh" role="3clFbG">
+                                  <node concept="37vLTw" id="4APe_wKhNYH" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="4APe_wKhNM7" resolve="it" />
+                                  </node>
+                                  <node concept="2qgKlT" id="4APe_wKhP1n" role="2OqNvi">
+                                    <ref role="37wK5l" to="x5bw:3Co8b0rO8iu" resolve="childFeatures" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="Rh6nW" id="4APe_wKhNM7" role="1bW2Oz">
+                              <property role="TrG5h" value="it" />
+                              <node concept="2jxLKc" id="4APe_wKhNM8" role="1tU5fm" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1ps_xZ" id="4APe_wKhEzi" role="1ps_xO">
+                <property role="TrG5h" value="allList" />
+                <node concept="2jfdEK" id="4APe_wKhEzj" role="1ps_xN">
+                  <node concept="3clFbS" id="4APe_wKhEzk" role="2VODD2">
+                    <node concept="3clFbF" id="4APe_wKhQR0" role="3cqZAp">
+                      <node concept="2OqwBi" id="4APe_wKhQR1" role="3clFbG">
+                        <node concept="2OqwBi" id="4APe_wKhQR2" role="2Oq$k0">
+                          <node concept="2OqwBi" id="4APe_wKhQR3" role="2Oq$k0">
+                            <node concept="30H73N" id="4APe_wKhQR4" role="2Oq$k0" />
+                            <node concept="2qgKlT" id="4APe_wKhQR5" role="2OqNvi">
+                              <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
+                            </node>
+                          </node>
+                          <node concept="2qgKlT" id="4APe_wKhQR6" role="2OqNvi">
+                            <ref role="37wK5l" to="x5bw:4lCLOtww4qi" resolve="prototypesStack" />
+                          </node>
+                        </node>
+                        <node concept="3goQfb" id="4APe_wKhQR7" role="2OqNvi">
+                          <node concept="1bVj0M" id="4APe_wKhQR8" role="23t8la">
+                            <node concept="3clFbS" id="4APe_wKhQR9" role="1bW5cS">
+                              <node concept="3clFbF" id="4APe_wKhQRa" role="3cqZAp">
+                                <node concept="2OqwBi" id="4APe_wKhQRb" role="3clFbG">
+                                  <node concept="37vLTw" id="4APe_wKhQRc" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="4APe_wKhQRe" resolve="it" />
+                                  </node>
+                                  <node concept="2qgKlT" id="4APe_wKhQRd" role="2OqNvi">
+                                    <ref role="37wK5l" to="x5bw:3Co8b0rO986" resolve="listFeatures" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="Rh6nW" id="4APe_wKhQRe" role="1bW2Oz">
+                              <property role="TrG5h" value="it" />
+                              <node concept="2jxLKc" id="4APe_wKhQRf" role="1tU5fm" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1ps_xZ" id="4APe_wKhFxW" role="1ps_xO">
+                <property role="TrG5h" value="allValue" />
+                <node concept="2jfdEK" id="4APe_wKhFxX" role="1ps_xN">
+                  <node concept="3clFbS" id="4APe_wKhFxY" role="2VODD2">
+                    <node concept="3clFbF" id="4APe_wKhSEt" role="3cqZAp">
+                      <node concept="2OqwBi" id="4APe_wKhSEu" role="3clFbG">
+                        <node concept="2OqwBi" id="4APe_wKhSEv" role="2Oq$k0">
+                          <node concept="2OqwBi" id="4APe_wKhSEw" role="2Oq$k0">
+                            <node concept="30H73N" id="4APe_wKhSEx" role="2Oq$k0" />
+                            <node concept="2qgKlT" id="4APe_wKhSEy" role="2OqNvi">
+                              <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
+                            </node>
+                          </node>
+                          <node concept="2qgKlT" id="4APe_wKhSEz" role="2OqNvi">
+                            <ref role="37wK5l" to="x5bw:4lCLOtww4qi" resolve="prototypesStack" />
+                          </node>
+                        </node>
+                        <node concept="3goQfb" id="4APe_wKhSE$" role="2OqNvi">
+                          <node concept="1bVj0M" id="4APe_wKhSE_" role="23t8la">
+                            <node concept="3clFbS" id="4APe_wKhSEA" role="1bW5cS">
+                              <node concept="3clFbF" id="4APe_wKhSEB" role="3cqZAp">
+                                <node concept="2OqwBi" id="4APe_wKhSEC" role="3clFbG">
+                                  <node concept="37vLTw" id="4APe_wKhSED" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="4APe_wKhSEF" resolve="it" />
+                                  </node>
+                                  <node concept="2qgKlT" id="4APe_wKhSEE" role="2OqNvi">
+                                    <ref role="37wK5l" to="x5bw:7c96q9tALRr" resolve="valueFeatures" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="Rh6nW" id="4APe_wKhSEF" role="1bW2Oz">
+                              <property role="TrG5h" value="it" />
+                              <node concept="2jxLKc" id="4APe_wKhSEG" role="1tU5fm" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
         <node concept="raruj" id="1vAI4X$H8JV" role="lGtFl" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
index 691e0a00..bbd90ebb 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
@@ -66,7 +66,6 @@
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
         <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
         <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
-        <module reference="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67(jetbrains.mps.baseLanguage.lightweightdsl)" version="0" />
         <module reference="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
@@ -111,6 +110,8 @@
     <dependency reexport="false">bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)</dependency>
     <dependency reexport="false">35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</dependency>
     <dependency reexport="false">3a13115c-633c-4c5c-bbcc-75c4219e9555(jetbrains.mps.lang.quotation)</dependency>
+    <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
+    <dependency reexport="false">c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
@@ -134,6 +135,7 @@
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.descriptor.aspects.types@genplan.mps b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.descriptor.aspects.types@genplan.mps
index dd2d3f6c..11c2abf4 100644
--- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.descriptor.aspects.types@genplan.mps
+++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.descriptor.aspects.types@genplan.mps
@@ -10,16 +10,26 @@
   </imports>
   <registry>
     <language id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan">
+      <concept id="869728027904920839" name="jetbrains.mps.lang.generator.plan.structure.CheckpointSynchronization" flags="ng" index="26qawf">
+        <child id="3750601816087335480" name="checkpoint" index="3pRG92" />
+      </concept>
       <concept id="3705377275350227759" name="jetbrains.mps.lang.generator.plan.structure.IncludePlan" flags="ng" index="NozSJ">
         <reference id="3705377275350227762" name="plan" index="NozSM" />
       </concept>
       <concept id="1820634577908471803" name="jetbrains.mps.lang.generator.plan.structure.Plan" flags="ng" index="2VgMpV">
         <child id="1820634577908471815" name="steps" index="2VgMA7" />
       </concept>
+      <concept id="1820634577908471809" name="jetbrains.mps.lang.generator.plan.structure.Checkpoint" flags="ng" index="2VgMA1">
+        <child id="3750601816081740498" name="cpSpec" index="3ps6aC" />
+      </concept>
       <concept id="1820634577908471810" name="jetbrains.mps.lang.generator.plan.structure.Transform" flags="ng" index="2VgMA2">
         <property id="2209292798354050154" name="individualStepPerGenerator" index="1s431M" />
         <child id="2944629966652439181" name="languages" index="1t_9vn" />
       </concept>
+      <concept id="6257322641293267918" name="jetbrains.mps.lang.generator.plan.structure.CheckpointDeclaration" flags="ng" index="19BiC4" />
+      <concept id="3750601816081740541" name="jetbrains.mps.lang.generator.plan.structure.DeclaredCheckpointSpec" flags="ng" index="3ps6a7">
+        <reference id="3750601816081740544" name="cpDecl" index="3ps6dU" />
+      </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="3542851458883438784" name="jetbrains.mps.lang.smodel.structure.LanguageId" flags="nn" index="2V$Bhx">
@@ -35,6 +45,9 @@
   </registry>
   <node concept="2VgMpV" id="C1f6iDJrPS">
     <property role="TrG5h" value="TypesAspect" />
+    <node concept="19BiC4" id="4APe_wL1VPG" role="2VgMA7">
+      <property role="TrG5h" value="TypecheckingSymbols" />
+    </node>
     <node concept="2VgMA2" id="C1f6iDORpM" role="2VgMA7">
       <property role="1s431M" value="true" />
       <node concept="2V$Bhx" id="C1f6iDORpL" role="1t_9vn">
@@ -56,6 +69,16 @@
         <property role="2V$B1Q" value="jetbrains.mps.lang.typechecking" />
       </node>
     </node>
+    <node concept="2VgMA1" id="4APe_wL6Vf4" role="2VgMA7">
+      <node concept="3ps6a7" id="4APe_wL6Vfs" role="3ps6aC">
+        <ref role="3ps6dU" node="4APe_wL1VPG" resolve="FOO" />
+      </node>
+    </node>
+    <node concept="26qawf" id="4APe_wL9AqS" role="2VgMA7">
+      <node concept="3ps6a7" id="4APe_wL9Ari" role="3pRG92">
+        <ref role="3ps6dU" node="4APe_wL1VPG" resolve="FOO" />
+      </node>
+    </node>
     <node concept="2VgMA2" id="sL9MTQwV_n" role="2VgMA7">
       <property role="1s431M" value="true" />
       <node concept="2V$Bhx" id="sL9MTQwV_p" role="1t_9vn">