diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
index a4c91e24..210f55ff 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
@@ -83,6 +83,8 @@
   <dependencies>
     <dependency reexport="false">0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)</dependency>
     <dependency reexport="false">ad4d7d30-3da5-4d56-8273-c9d815b12234(jetbrains.mps.logicExt)</dependency>
+    <dependency reexport="false">65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt)</dependency>
+    <dependency reexport="false">88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
@@ -130,6 +132,7 @@
     <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="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="88dcbb14-19c3-4776-8f81-33611ca4d87c(jetbrains.mps.baseLanguage.sequence)" version="0" />
     <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
@@ -142,6 +145,7 @@
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
index 8bb77143..0790b15c 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
@@ -12,11 +12,20 @@
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="54p4" ref="r:4756f1c3-ee0d-4da9-817d-c7dad8ea74b8(jetbrains.mps.logicExt.types)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-    <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" implicit="true" />
+    <import index="jxwi" ref="r:6ecd2c91-8e0b-4c6a-878e-d699a7336100(jetbrains.mps.lang.smodelExt.types)" />
+    <import index="yh6q" ref="r:14dbdd37-ab02-4407-8e3c-3308d6f4fbba(jetbrains.mps.baseLanguage.sequence.types)" />
+    <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
+    <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
+    <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" />
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
+        <child id="1082485599096" name="statements" index="9aQI4" />
+      </concept>
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
         <child id="1239714902950" name="expression" index="2$L3a6" />
       </concept>
@@ -27,6 +36,9 @@
         <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="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -37,26 +49,38 @@
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
       <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
+        <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
         <child id="1144230900587" name="variable" index="1Duv9x" />
       </concept>
@@ -64,8 +88,16 @@
         <child id="1144231399730" name="condition" index="1Dwp0S" />
         <child id="1144231408325" name="iteration" index="1Dwrff" />
       </concept>
-      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
-        <child id="8356039341262087992" name="line" index="1aUNEU" />
+    </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="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
+      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
+        <child id="1196350785114" name="quotedNode" index="2c44tc" />
       </concept>
     </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
@@ -91,12 +123,20 @@
       <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
         <child id="4780620083400582654" name="logical" index="1nq8_t" />
       </concept>
+      <concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
+        <child id="8713947027062064784" name="logical" index="1FtiSR" />
+      </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </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" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
@@ -104,10 +144,25 @@
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
+      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
+      <concept id="1154546920561" name="jetbrains.mps.lang.smodel.structure.OperationParm_ConceptList" flags="ng" index="3gmYPX">
+        <child id="1154546920563" name="concept" index="3gmYPZ" />
+      </concept>
+      <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
+        <reference id="1154546997487" name="concept" index="3gnhBz" />
+      </concept>
       <concept id="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="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <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" />
+      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
+        <reference id="1138056395725" name="property" index="3TsBF5" />
+      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
@@ -116,26 +171,41 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
-    </language>
-    <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
-      <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="ng" index="3oM_SD">
-        <property id="155656958578482949" name="value" index="3oM_SC" />
+      <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="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="ng" index="1PaTwC">
-        <child id="2535923850359271783" name="elements" index="1PaTwD" />
+      <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">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1225711141656" name="jetbrains.mps.baseLanguage.collections.structure.ListElementAccessExpression" flags="nn" index="1y4W85">
         <child id="1225711182005" name="list" index="1y566C" />
         <child id="1225711191269" name="index" index="1y58nS" />
       </concept>
+      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
     <language id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules">
+      <concept id="1618328391714763069" name="jetbrains.mps.lang.coderules.structure.MacroTable" flags="ng" index="0oKg$">
+        <reference id="6097203247219331496" name="extends" index="3tg4Y$" />
+        <child id="1618328391714763070" name="macro" index="0oKgB" />
+      </concept>
+      <concept id="7326790520856487884" name="jetbrains.mps.lang.coderules.structure.ProvideFeedbackOperation" flags="ng" index="26X5F$">
+        <property id="7326790520856501351" name="severity" index="26X25f" />
+        <child id="7326790520856501349" name="message" index="26X25d" />
+      </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
@@ -148,11 +218,7 @@
         <reference id="861509610434243089" name="prototype" index="ns1xW" />
         <child id="861509610434243084" name="template" index="ns1xx" />
       </concept>
-      <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf">
-        <child id="861509610434276451" name="feature" index="nspSe" />
-      </concept>
-      <concept id="861509610434294982" name="jetbrains.mps.lang.coderules.structure.ValueFeature" flags="ng" index="nssqF" />
-      <concept id="861509610434289827" name="jetbrains.mps.lang.coderules.structure.ChildFeature" flags="ng" index="nstbe" />
+      <concept id="861509610434276450" name="jetbrains.mps.lang.coderules.structure.TermTemplate" flags="ng" index="nspSf" />
       <concept id="861509610434435669" name="jetbrains.mps.lang.coderules.structure.TermFeatureOverride" flags="ng" index="nsMwS">
         <reference id="861509610434435672" name="feature" index="nsMwP" />
         <child id="861509610434435670" name="getter" index="nsMwV" />
@@ -163,9 +229,29 @@
       </concept>
       <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.RulesList" flags="ng" index="AVZre">
         <reference id="3541122455446356437" name="extends" index="2YbDB9" />
+        <child id="1980609059185345194" name="constraint" index="8PkJo" />
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
       </concept>
+      <concept id="6856711987714624232" name="jetbrains.mps.lang.coderules.structure.LateExpressionItem" flags="ng" index="HKQnh">
+        <child id="6856711987714624233" name="code" index="HKQng" />
+      </concept>
+      <concept id="1204249894870288679" name="jetbrains.mps.lang.coderules.structure.RequireAllStatement" flags="ng" index="Oftf1">
+        <child id="1204249894870289978" name="nodes" index="Oftjs" />
+      </concept>
+      <concept id="5042557354438383712" name="jetbrains.mps.lang.coderules.structure.TermListType" flags="ig" index="VbTHi" />
       <concept id="2381360340662937504" name="jetbrains.mps.lang.coderules.structure.TermType" flags="ig" index="32pEOW" />
+      <concept id="6097203247156088058" name="jetbrains.mps.lang.coderules.structure.ExpandMacroInputSpecification" flags="ng" index="3ixlbQ">
+        <reference id="6097203247156276310" name="applicableConcept" index="3ixz9q" />
+        <child id="6097203247156107501" name="input" index="3ix8rx" />
+      </concept>
+      <concept id="6097203247156229793" name="jetbrains.mps.lang.coderules.structure.ExpandMacroInputDeclaration" flags="ng" index="3ixQyH" />
+      <concept id="6097203247155932548" name="jetbrains.mps.lang.coderules.structure.ExpandMacroTemplate" flags="ng" index="3iyZe8">
+        <reference id="6097203247158702389" name="prototype" index="3iRiWT" />
+        <child id="6097203247156392058" name="inputSpec" index="3iweTQ" />
+        <child id="6097203247156492735" name="code" index="3iwQuN" />
+        <child id="6097203247156594418" name="variable" index="3iJhzY" />
+        <child id="6097203247216428965" name="logical" index="3tb1AD" />
+      </concept>
       <concept id="6097203247182936001" name="jetbrains.mps.lang.coderules.structure.ExpandMacroConstraint" flags="ng" index="3jbYBd">
         <reference id="6097203247182937177" name="template" index="3jbY9l" />
         <child id="6097203247182937145" name="input" index="3jbY8P" />
@@ -176,6 +262,12 @@
         <child id="6097203247185219723" name="argument" index="3jicU7" />
         <child id="6097203247184212024" name="logical" index="3jm6SO" />
       </concept>
+      <concept id="4957570047287105024" name="jetbrains.mps.lang.coderules.structure.FailConstraint" flags="ng" index="1lpGmL">
+        <child id="4957570047287138243" name="message" index="1lp$hM" />
+      </concept>
+      <concept id="3575255234196628445" name="jetbrains.mps.lang.coderules.structure.RequireStatement" flags="ng" index="1mebxG">
+        <child id="3575255234196628696" name="node" index="1mebXD" />
+      </concept>
       <concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
         <child id="4814011019633607808" name="parameter" index="0Rg$4" />
         <child id="3575255234174969658" name="head" index="1nLNMb" />
@@ -188,13 +280,24 @@
       <concept id="3575255234174969664" name="jetbrains.mps.lang.coderules.structure.ConstraintRuleStatement" flags="ng" index="1nLNNL">
         <child id="3575255234174969665" name="rule" index="1nLNNK" />
       </concept>
+      <concept id="8908809128801951597" name="jetbrains.mps.lang.coderules.structure.MacroBodyLogicalDeclaration" flags="ng" index="3uniRu" />
+      <concept id="5372587443968979218" name="jetbrains.mps.lang.coderules.structure.ExpressionConstraint" flags="ng" index="3wWvb2">
+        <child id="5372587443968983820" name="expression" index="3wWo3s" />
+      </concept>
       <concept id="7674753015762572646" name="jetbrains.mps.lang.coderules.structure.BodyBlock" flags="ng" index="3xSepi">
         <child id="7674753015762572647" name="body" index="3xSepj" />
       </concept>
+      <concept id="1878265754077060950" name="jetbrains.mps.lang.coderules.structure.ConstraintParameterDeclaration" flags="ng" index="1zAUYm">
+        <child id="6036655413802463897" name="dataType" index="3gTf24" />
+      </concept>
       <concept id="7368070394769089081" name="jetbrains.mps.lang.coderules.structure.RuleInputDeclaration" flags="ng" index="3A20r5" />
       <concept id="7368070394769139970" name="jetbrains.mps.lang.coderules.structure.RuleInputReference" flags="ng" index="3A2sRY">
         <reference id="7368070394769213644" name="declaration" index="3A2yKK" />
       </concept>
+      <concept id="7368070394770780974" name="jetbrains.mps.lang.coderules.structure.UnifiesConstraint" flags="ng" index="3A8Hvi">
+        <child id="7368070394770793930" name="value" index="3A8w4Q" />
+        <child id="7368070394770793388" name="assignee" index="3A8wtg" />
+      </concept>
       <concept id="7368070394766963750" name="jetbrains.mps.lang.coderules.structure.Head" flags="ng" index="3Aq93q">
         <property id="7368070394767443940" name="keep" index="3ArMco" />
       </concept>
@@ -205,6 +308,9 @@
       <concept id="7368070394766978092" name="jetbrains.mps.lang.coderules.structure.EmitConstraintStatement" flags="ng" index="3Aqczg">
         <child id="7368070394767031348" name="constraint" index="3Aqpz8" />
       </concept>
+      <concept id="7368070394767067636" name="jetbrains.mps.lang.coderules.structure.ConstraintDeclaration" flags="ng" index="3AqmO8">
+        <child id="1878265754077059170" name="parameters" index="1zAUyy" />
+      </concept>
       <concept id="7368070394767045637" name="jetbrains.mps.lang.coderules.structure.UserConstraint" flags="ng" index="3Aqt3T">
         <reference id="7368070394767091750" name="template" index="3AqCNq" />
         <child id="7368070394768117915" name="argument" index="3AunhB" />
@@ -226,8 +332,271 @@
     </language>
   </registry>
   <node concept="AVZre" id="7LI_gNMWq1K">
-    <property role="TrG5h" value="Check" />
-    <ref role="2YbDB9" to="kqnc:34$A1Mf51rY" resolve="TypeOf" />
+    <property role="TrG5h" value="CheckCoderules" />
+    <ref role="2YbDB9" to="54p4:7LI_gNMjLUJ" resolve="CheckLogic" />
+    <node concept="1X3_iC" id="14oWJ2NFiZK" role="lGtFl">
+      <property role="3V$3am" value="template" />
+      <property role="3V$3ak" value="c4803b19-6d89-4a3b-bf82-390769514add/8335224865066015764/3575255234175157601" />
+      <node concept="1nLNMY" id="14oWJ2NAa6M" role="8Wnug">
+        <property role="TrG5h" value="logicalVariable" />
+        <node concept="3clFbS" id="14oWJ2NAa6N" role="1nLNMH">
+          <node concept="1nLNNL" id="14oWJ2NAr7B" role="3cqZAp">
+            <node concept="1nLNMm" id="14oWJ2NAr7C" role="1nLNNK">
+              <node concept="3Aq93q" id="14oWJ2NArjl" role="1nLNMb">
+                <property role="3ArMco" value="true" />
+                <node concept="3I6sU6" id="14oWJ2NArjm" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="14oWJ2NArv4" role="3I6sU7">
+                    <node concept="3Aqt3T" id="14oWJ2NArv3" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                      <node concept="37jhX" id="14oWJ2NAtl9" role="3AunhB">
+                        <node concept="2OqwBi" id="14oWJ2NAunH" role="37jj2">
+                          <node concept="3A2sRY" id="14oWJ2NAtl7" role="2Oq$k0">
+                            <ref role="3A2yKK" node="14oWJ2NAa6P" resolve="lv" />
+                          </node>
+                          <node concept="3TrEf2" id="14oWJ2NAyLz" role="2OqNvi">
+                            <ref role="3Tt5mk" to="5j4j:7E86$tK_PaH" resolve="declaration" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="1HFMs5" id="14oWJ2NAzBQ" role="3AunhB">
+                        <node concept="a7P8L" id="14oWJ2NAzrS" role="1uarlU">
+                          <ref role="a7OzE" node="14oWJ2NArEN" resolve="LogicalType" />
+                        </node>
+                        <node concept="ns1u0" id="14oWJ2NAzNX" role="1uarlW">
+                          <ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
+                          <node concept="nsMwS" id="14oWJ2NAzZQ" role="ns1xD">
+                            <ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
+                            <node concept="1nq8_$" id="14oWJ2NA$nD" role="nsMwV">
+                              <node concept="a7P8L" id="14oWJ2NA$nC" role="1nq8_t">
+                                <ref role="a7OzE" node="14oWJ2NAseb" resolve="DType" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3NuqgR" id="14oWJ2NArEM" role="0Rg$4">
+                <node concept="aZer4" id="14oWJ2NArEN" role="3XD1gS">
+                  <property role="TrG5h" value="LogicalType" />
+                </node>
+                <node concept="aZer4" id="14oWJ2NAseb" role="3XD1gS">
+                  <property role="TrG5h" value="DType" />
+                </node>
+                <node concept="32pEOW" id="14oWJ2NArQD" role="3vLBG7" />
+              </node>
+              <node concept="3xSepi" id="14oWJ2NA$zN" role="3xSepv">
+                <node concept="3Aq9E8" id="14oWJ2NA$zO" role="3xSepj">
+                  <node concept="3I6sU6" id="14oWJ2NA$zP" role="3Ip0Jz">
+                    <node concept="3IrJb3" id="14oWJ2NA$JQ" role="3I6sU7">
+                      <node concept="3clFbS" id="14oWJ2NA$JR" role="3IrJb0">
+                        <node concept="3clFbJ" id="14oWJ2NAaGP" role="3cqZAp">
+                          <node concept="2OqwBi" id="14oWJ2NAl_j" role="3clFbw">
+                            <node concept="2OqwBi" id="14oWJ2NAbUO" role="2Oq$k0">
+                              <node concept="3A2sRY" id="14oWJ2NAaSA" role="2Oq$k0">
+                                <ref role="3A2yKK" node="14oWJ2NAa6P" resolve="lv" />
+                              </node>
+                              <node concept="2Xjw5R" id="14oWJ2NAjaL" role="2OqNvi">
+                                <node concept="3gmYPX" id="14oWJ2NAjup" role="1xVPHs">
+                                  <node concept="3gn64h" id="14oWJ2NAjKs" role="3gmYPZ">
+                                    <ref role="3gnhBz" to="wq2x:4EfgX2EvF4i" resolve="ExpressionConstraint" />
+                                  </node>
+                                  <node concept="3gn64h" id="14oWJ2NAkdN" role="3gmYPZ">
+                                    <ref role="3gnhBz" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="1mIQ4w" id="14oWJ2NAqkH" role="2OqNvi">
+                              <node concept="chp4Y" id="14oWJ2NAqGT" role="cj9EA">
+                                <ref role="cht4Q" to="wq2x:4EfgX2EvF4i" resolve="ExpressionConstraint" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbS" id="14oWJ2NAaGR" role="3clFbx">
+                            <node concept="3Aqczg" id="14oWJ2NAARn" role="3cqZAp">
+                              <node concept="3Aqt3T" id="14oWJ2NAARm" role="3Aqpz8">
+                                <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                                <node concept="37jhX" id="14oWJ2NABfo" role="3AunhB">
+                                  <node concept="3A2sRY" id="14oWJ2NABfm" role="37jj2">
+                                    <ref role="3A2yKK" node="14oWJ2NAa6P" resolve="lv" />
+                                  </node>
+                                </node>
+                                <node concept="a7P8L" id="14oWJ2NABrC" role="3AunhB">
+                                  <ref role="a7OzE" node="14oWJ2NAseb" resolve="DType" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbH" id="14oWJ2NAC9a" role="3cqZAp" />
+                          </node>
+                          <node concept="9aQIb" id="14oWJ2NABBR" role="9aQIa">
+                            <node concept="3clFbS" id="14oWJ2NABBS" role="9aQI4">
+                              <node concept="3Aqczg" id="14oWJ2NACll" role="3cqZAp">
+                                <node concept="3Aqt3T" id="14oWJ2NAClm" role="3Aqpz8">
+                                  <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                                  <node concept="37jhX" id="14oWJ2NACln" role="3AunhB">
+                                    <node concept="3A2sRY" id="14oWJ2NAClo" role="37jj2">
+                                      <ref role="3A2yKK" node="14oWJ2NAa6P" resolve="lv" />
+                                    </node>
+                                  </node>
+                                  <node concept="a7P8L" id="14oWJ2NACV2" role="3AunhB">
+                                    <ref role="a7OzE" node="14oWJ2NArEN" resolve="LogicalType" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2t___k" id="14oWJ2NAa6O" role="1nLNMg">
+          <ref role="2t_S0q" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
+          <node concept="3A20r5" id="14oWJ2NAa6P" role="2t_VXX">
+            <property role="TrG5h" value="lv" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="14oWJ2NFh5g" role="1nK1Vg">
+      <property role="TrG5h" value="logicalItemValueExpression" />
+      <node concept="3clFbS" id="14oWJ2NFh5h" role="1nLNMH">
+        <node concept="1nLNNL" id="14oWJ2NFhGA" role="3cqZAp">
+          <node concept="1nLNMm" id="14oWJ2NFhGB" role="1nLNNK">
+            <node concept="3Aq93q" id="14oWJ2NFhGC" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="14oWJ2NFhGD" role="3Ip0Jz">
+                <node concept="3I6s7M" id="14oWJ2NFhGE" role="3I6sU7">
+                  <node concept="3Aqt3T" id="14oWJ2NFhGF" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                    <node concept="37jhX" id="14oWJ2NFhGG" role="3AunhB">
+                      <node concept="2OqwBi" id="14oWJ2NFhGH" role="37jj2">
+                        <node concept="2OqwBi" id="14oWJ2NFmiX" role="2Oq$k0">
+                          <node concept="3A2sRY" id="14oWJ2NFk1Z" role="2Oq$k0">
+                            <ref role="3A2yKK" node="14oWJ2NFh5j" resolve="live" />
+                          </node>
+                          <node concept="3TrEf2" id="14oWJ2NFrxo" role="2OqNvi">
+                            <ref role="3Tt5mk" to="5j4j:7zIaasjAKqg" resolve="logical" />
+                          </node>
+                        </node>
+                        <node concept="3TrEf2" id="14oWJ2NFhGJ" role="2OqNvi">
+                          <ref role="3Tt5mk" to="5j4j:7E86$tK_PaH" resolve="declaration" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1HFMs5" id="14oWJ2NFhGK" role="3AunhB">
+                      <node concept="a7P8L" id="14oWJ2NFhGL" role="1uarlU">
+                        <ref role="a7OzE" node="14oWJ2NFhGR" resolve="LogicalType" />
+                      </node>
+                      <node concept="ns1u0" id="14oWJ2NFhGM" role="1uarlW">
+                        <ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
+                        <node concept="nsMwS" id="14oWJ2NFhGN" role="ns1xD">
+                          <ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
+                          <node concept="1nq8_$" id="14oWJ2NFhGO" role="nsMwV">
+                            <node concept="a7P8L" id="14oWJ2NFhGP" role="1nq8_t">
+                              <ref role="a7OzE" node="14oWJ2NFhGS" resolve="DType" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="14oWJ2NFhGQ" role="0Rg$4">
+              <node concept="aZer4" id="14oWJ2NFhGR" role="3XD1gS">
+                <property role="TrG5h" value="LogicalType" />
+              </node>
+              <node concept="aZer4" id="14oWJ2NFhGS" role="3XD1gS">
+                <property role="TrG5h" value="DType" />
+              </node>
+              <node concept="32pEOW" id="14oWJ2NFhGT" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="14oWJ2NFhGU" role="3xSepv">
+              <node concept="3Aq9E8" id="14oWJ2NFhGV" role="3xSepj">
+                <node concept="3I6sU6" id="14oWJ2NFhGW" role="3Ip0Jz">
+                  <node concept="3IrJb3" id="14oWJ2NFhGX" role="3I6sU7">
+                    <node concept="3clFbS" id="14oWJ2NFhGY" role="3IrJb0">
+                      <node concept="3clFbJ" id="14oWJ2NFhGZ" role="3cqZAp">
+                        <node concept="2OqwBi" id="14oWJ2NFhH0" role="3clFbw">
+                          <node concept="2OqwBi" id="14oWJ2NFhH1" role="2Oq$k0">
+                            <node concept="3A2sRY" id="14oWJ2NFkQx" role="2Oq$k0">
+                              <ref role="3A2yKK" node="14oWJ2NFh5j" resolve="live" />
+                            </node>
+                            <node concept="2Xjw5R" id="14oWJ2NFhH3" role="2OqNvi">
+                              <node concept="3gmYPX" id="14oWJ2NFhH4" role="1xVPHs">
+                                <node concept="3gn64h" id="14oWJ2NFhH5" role="3gmYPZ">
+                                  <ref role="3gnhBz" to="wq2x:4EfgX2EvF4i" resolve="ExpressionConstraint" />
+                                </node>
+                                <node concept="3gn64h" id="14oWJ2NFhH6" role="3gmYPZ">
+                                  <ref role="3gnhBz" to="wq2x:20Ay2VefOBs" resolve="ConstraintLogicalClause" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="1mIQ4w" id="14oWJ2NFhH7" role="2OqNvi">
+                            <node concept="chp4Y" id="14oWJ2NFhH8" role="cj9EA">
+                              <ref role="cht4Q" to="wq2x:4EfgX2EvF4i" resolve="ExpressionConstraint" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbS" id="14oWJ2NFhH9" role="3clFbx">
+                          <node concept="3Aqczg" id="14oWJ2NFhHa" role="3cqZAp">
+                            <node concept="3Aqt3T" id="14oWJ2NFhHb" role="3Aqpz8">
+                              <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                              <node concept="37jhX" id="14oWJ2NFhHc" role="3AunhB">
+                                <node concept="3A2sRY" id="14oWJ2NFune" role="37jj2">
+                                  <ref role="3A2yKK" node="14oWJ2NFh5j" resolve="live" />
+                                </node>
+                              </node>
+                              <node concept="a7P8L" id="14oWJ2NFhHe" role="3AunhB">
+                                <ref role="a7OzE" node="14oWJ2NFhGS" resolve="DType" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbH" id="14oWJ2NFhHf" role="3cqZAp" />
+                        </node>
+                        <node concept="9aQIb" id="14oWJ2NFhHg" role="9aQIa">
+                          <node concept="3clFbS" id="14oWJ2NFhHh" role="9aQI4">
+                            <node concept="3Aqczg" id="14oWJ2NFhHi" role="3cqZAp">
+                              <node concept="3Aqt3T" id="14oWJ2NFhHj" role="3Aqpz8">
+                                <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                                <node concept="37jhX" id="14oWJ2NFhHk" role="3AunhB">
+                                  <node concept="3A2sRY" id="14oWJ2NFv5_" role="37jj2">
+                                    <ref role="3A2yKK" node="14oWJ2NFh5j" resolve="live" />
+                                  </node>
+                                </node>
+                                <node concept="a7P8L" id="14oWJ2NFhHm" role="3AunhB">
+                                  <ref role="a7OzE" node="14oWJ2NFhGR" resolve="LogicalType" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="14oWJ2NFh5i" role="1nLNMg">
+        <ref role="2t_S0q" to="5j4j:7zIaasjAAux" resolve="LogicalItemValueExpression" />
+        <node concept="3A20r5" id="14oWJ2NFh5j" role="2t_VXX">
+          <property role="TrG5h" value="live" />
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="7LI_gNMWuaG" role="1nK1Vg">
       <property role="TrG5h" value="logicalContextExpression" />
       <node concept="3clFbS" id="7LI_gNMWuaH" role="1nLNMH">
@@ -294,54 +663,69 @@
     <node concept="1nLNMY" id="7LI_gNMWuca" role="1nK1Vg">
       <property role="TrG5h" value="origSpec" />
       <node concept="3clFbS" id="7LI_gNMWucb" role="1nLNMH">
-        <node concept="1nLNNL" id="7LI_gNMWw2v" role="3cqZAp">
-          <node concept="1nLNMm" id="7LI_gNMWw2w" role="1nLNNK">
-            <node concept="3Aq93q" id="7LI_gNMWwik" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="7LI_gNMWwil" role="3Ip0Jz">
-                <node concept="3I6s7M" id="7LI_gNMWwiB" role="3I6sU7">
-                  <node concept="3Aqt3T" id="7LI_gNMWwi$" role="3I6s78">
-                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
-                    <node concept="37jhX" id="7LI_gNMWwjd" role="3AunhB">
-                      <node concept="2OqwBi" id="7LI_gNMWwtM" role="37jj2">
-                        <node concept="3A2sRY" id="7LI_gNMWwjb" role="2Oq$k0">
-                          <ref role="3A2yKK" node="7LI_gNMWvZg" resolve="os" />
+        <node concept="3clFbJ" id="3lXUvG09Ug3" role="3cqZAp">
+          <node concept="3clFbS" id="3lXUvG09Ug5" role="3clFbx">
+            <node concept="1nLNNL" id="7LI_gNMWw2v" role="3cqZAp">
+              <node concept="1nLNMm" id="7LI_gNMWw2w" role="1nLNNK">
+                <node concept="3Aq93q" id="7LI_gNMWwik" role="1nLNMb">
+                  <property role="3ArMco" value="true" />
+                  <node concept="3I6sU6" id="7LI_gNMWwil" role="3Ip0Jz">
+                    <node concept="3I6s7M" id="7LI_gNMWwiB" role="3I6sU7">
+                      <node concept="3Aqt3T" id="7LI_gNMWwi$" role="3I6s78">
+                        <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                        <node concept="37jhX" id="7LI_gNMWwjd" role="3AunhB">
+                          <node concept="2OqwBi" id="7LI_gNMWwtM" role="37jj2">
+                            <node concept="3A2sRY" id="7LI_gNMWwjb" role="2Oq$k0">
+                              <ref role="3A2yKK" node="7LI_gNMWvZg" resolve="os" />
+                            </node>
+                            <node concept="3TrEf2" id="7LI_gNMWwG0" role="2OqNvi">
+                              <ref role="3Tt5mk" to="wq2x:1laj_RSpMKx" resolve="origin" />
+                            </node>
+                          </node>
                         </node>
-                        <node concept="3TrEf2" id="7LI_gNMWwG0" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:1laj_RSpMKx" resolve="origin" />
+                        <node concept="a7P8L" id="7LI_gNMWwII" role="3AunhB">
+                          <ref role="a7OzE" node="7LI_gNMWwiI" resolve="Type" />
                         </node>
                       </node>
                     </node>
-                    <node concept="a7P8L" id="7LI_gNMWwII" role="3AunhB">
-                      <ref role="a7OzE" node="7LI_gNMWwiI" resolve="Type" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3xSepi" id="7LI_gNMWwis" role="3xSepv">
-              <node concept="3Aq9E8" id="7LI_gNMWwit" role="3xSepj">
-                <node concept="3I6sU6" id="7LI_gNMWwiu" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="7LI_gNMWwIY" role="3I6sU7">
-                    <node concept="3Aqt3T" id="7LI_gNMWwIX" role="3I6s78">
-                      <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="convertsTo" />
-                      <node concept="a7P8L" id="7LI_gNMWwJ6" role="3AunhB">
-                        <ref role="a7OzE" node="7LI_gNMWwiI" resolve="Type" />
-                      </node>
-                      <node concept="ns1u0" id="7LI_gNMWwJe" role="3AunhB">
-                        <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
-                      </node>
-                    </node>
                   </node>
                 </node>
+                <node concept="3xSepi" id="7LI_gNMWwis" role="3xSepv">
+                  <node concept="3Aq9E8" id="7LI_gNMWwit" role="3xSepj">
+                    <node concept="3I6sU6" id="7LI_gNMWwiu" role="3Ip0Jz">
+                      <node concept="3I6s7M" id="7LI_gNMWwIY" role="3I6sU7">
+                        <node concept="3Aqt3T" id="7LI_gNMWwIX" role="3I6s78">
+                          <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="defaultConvertsTo" />
+                          <node concept="a7P8L" id="7LI_gNMWwJ6" role="3AunhB">
+                            <ref role="a7OzE" node="7LI_gNMWwiI" resolve="Type" />
+                          </node>
+                          <node concept="ns1u0" id="7LI_gNMWwJe" role="3AunhB">
+                            <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3NuqgR" id="7LI_gNMWwiH" role="0Rg$4">
+                  <node concept="aZer4" id="7LI_gNMWwiI" role="3XD1gS">
+                    <property role="TrG5h" value="Type" />
+                  </node>
+                  <node concept="32pEOW" id="7LI_gNMWwiU" role="3vLBG7" />
+                </node>
               </node>
             </node>
-            <node concept="3NuqgR" id="7LI_gNMWwiH" role="0Rg$4">
-              <node concept="aZer4" id="7LI_gNMWwiI" role="3XD1gS">
-                <property role="TrG5h" value="Type" />
+          </node>
+          <node concept="2OqwBi" id="3lXUvG0a3pC" role="3clFbw">
+            <node concept="2OqwBi" id="3lXUvG09Vm1" role="2Oq$k0">
+              <node concept="3A2sRY" id="3lXUvG09Upp" role="2Oq$k0">
+                <ref role="3A2yKK" node="7LI_gNMWvZg" resolve="os" />
+              </node>
+              <node concept="3TrEf2" id="3lXUvG0a09E" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:1laj_RSpMKx" resolve="origin" />
               </node>
-              <node concept="32pEOW" id="7LI_gNMWwiU" role="3vLBG7" />
             </node>
+            <node concept="3x8VRR" id="3lXUvG0a819" role="2OqNvi" />
           </node>
         </node>
       </node>
@@ -442,25 +826,28 @@
                         </node>
                       </node>
                       <node concept="ns1u0" id="7LI_gNMWxaQ" role="3AunhB">
-                        <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                        <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="7LI_gNMWxiz" role="ns1xD">
-                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                          <node concept="2OqwBi" id="7LI_gNMWxRY" role="nsMwV">
-                            <node concept="1PxgMI" id="7LI_gNMWxK6" role="2Oq$k0">
-                              <property role="1BlNFB" value="true" />
-                              <node concept="chp4Y" id="7LI_gNMWxKS" role="3oSUPX">
-                                <ref role="cht4Q" to="wq2x:5NuEpF1if3e" resolve="RuleInputSpecification" />
-                              </node>
-                              <node concept="2OqwBi" id="7LI_gNMWxsx" role="1m5AlR">
-                                <node concept="3A2sRY" id="7LI_gNMWxiB" role="2Oq$k0">
-                                  <ref role="3A2yKK" node="7LI_gNMWxa3" resolve="rid" />
+                          <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
+                          <node concept="2OqwBi" id="3bgqfmmKMvX" role="nsMwV">
+                            <node concept="2OqwBi" id="7LI_gNMWxRY" role="2Oq$k0">
+                              <node concept="1PxgMI" id="7LI_gNMWxK6" role="2Oq$k0">
+                                <property role="1BlNFB" value="true" />
+                                <node concept="chp4Y" id="7LI_gNMWxKS" role="3oSUPX">
+                                  <ref role="cht4Q" to="wq2x:5NuEpF1if3e" resolve="RuleInputSpecification" />
                                 </node>
-                                <node concept="1mfA1w" id="7LI_gNMWxDp" role="2OqNvi" />
+                                <node concept="2OqwBi" id="7LI_gNMWxsx" role="1m5AlR">
+                                  <node concept="3A2sRY" id="7LI_gNMWxiB" role="2Oq$k0">
+                                    <ref role="3A2yKK" node="7LI_gNMWxa3" resolve="rid" />
+                                  </node>
+                                  <node concept="1mfA1w" id="7LI_gNMWxDp" role="2OqNvi" />
+                                </node>
+                              </node>
+                              <node concept="3TrEf2" id="3bgqfmmKMhu" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:5NuEpF1iiA0" resolve="applicableConcept" />
                               </node>
                             </node>
-                            <node concept="2qgKlT" id="7LI_gNMW$7r" role="2OqNvi">
-                              <ref role="37wK5l" to="x5bw:7LI_gNMWz2i" resolve="getApplicableConcept" />
-                            </node>
+                            <node concept="iZEcu" id="3bgqfmmKMMM" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
@@ -518,12 +905,12 @@
                 <node concept="3I6sU6" id="7LI_gNMWZik" role="3Ip0Jz">
                   <node concept="3I6s7M" id="7LI_gNMWZip" role="3I6sU7">
                     <node concept="3Aqt3T" id="7LI_gNMWZio" role="3I6s78">
-                      <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="convertsTo" />
+                      <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="defaultConvertsTo" />
                       <node concept="a7P8L" id="7LI_gNMWZix" role="3AunhB">
                         <ref role="a7OzE" node="7LI_gNMWYUQ" resolve="Type" />
                       </node>
                       <node concept="ns1u0" id="7LI_gNMWZiD" role="3AunhB">
-                        <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                        <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                       </node>
                     </node>
                   </node>
@@ -579,17 +966,17 @@
                 <node concept="3I6sU6" id="7LI_gNMXkon" role="3Ip0Jz">
                   <node concept="3I6s7M" id="7LI_gNMXkow" role="3I6sU7">
                     <node concept="3Aqt3T" id="7LI_gNMXkov" role="3I6s78">
-                      <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="convertsTo" />
+                      <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="defaultConvertsTo" />
                       <node concept="a7P8L" id="7LI_gNMXkoC" role="3AunhB">
                         <ref role="a7OzE" node="7LI_gNMXknA" resolve="Type" />
                       </node>
                       <node concept="ns1u0" id="7LI_gNMXkoK" role="3AunhB">
-                        <ref role="ns1xF" node="7LI_gNMXjAs" resolve="sequence" />
+                        <ref role="ns1xF" to="yh6q:3MFPGC50Ab3" resolve="sequence" />
                         <node concept="nsMwS" id="7LI_gNMXkoN" role="ns1xD">
-                          <ref role="nsMwP" node="7LI_gNMXjAH" resolve="parameter" />
+                          <ref role="nsMwP" to="yh6q:3MFPGC50Aiu" resolve="elem" />
                           <node concept="1nq8_$" id="7LI_gNMXkoS" role="nsMwV">
                             <node concept="ns1u0" id="7LI_gNMXkoR" role="1nq8_t">
-                              <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                              <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                             </node>
                           </node>
                         </node>
@@ -680,6 +1067,146 @@
         </node>
       </node>
     </node>
+    <node concept="1nLNMY" id="7LI_gNMXDD5" role="1nK1Vg">
+      <property role="TrG5h" value="expandMacroParameterDecl" />
+      <node concept="3clFbS" id="7LI_gNMXDD6" role="1nLNMH">
+        <node concept="1nLNNL" id="7LI_gNMXEMC" role="3cqZAp">
+          <node concept="1nLNMm" id="7LI_gNMXEMD" role="1nLNNK">
+            <node concept="3Aq93q" id="7LI_gNMXEME" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="7LI_gNMXEMF" role="3Ip0Jz">
+                <node concept="3IrJb3" id="2Qsys8b5nsS" role="3I6sU7">
+                  <node concept="3clFbS" id="2Qsys8b5nsT" role="3IrJb0">
+                    <node concept="3clFbJ" id="2Qsys8b5nt3" role="3cqZAp">
+                      <node concept="2OqwBi" id="2Qsys8b5o2T" role="3clFbw">
+                        <node concept="2OqwBi" id="2Qsys8b5nDn" role="2Oq$k0">
+                          <node concept="3A2sRY" id="2Qsys8b5ntf" role="2Oq$k0">
+                            <ref role="3A2yKK" node="7LI_gNMXDUV" resolve="empd" />
+                          </node>
+                          <node concept="3TrEf2" id="2Qsys8b5nTA" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:5itBwM6zLOl" resolve="init" />
+                          </node>
+                        </node>
+                        <node concept="3x8VRR" id="2Qsys8b5ocj" role="2OqNvi" />
+                      </node>
+                      <node concept="3clFbS" id="2Qsys8b5nt5" role="3clFbx">
+                        <node concept="3Aqczg" id="2Qsys8b5oss" role="3cqZAp">
+                          <node concept="3Aqt3T" id="2Qsys8b5osr" role="3Aqpz8">
+                            <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                            <node concept="37jhX" id="2Qsys8b5osz" role="3AunhB">
+                              <node concept="2OqwBi" id="2Qsys8b5oA$" role="37jj2">
+                                <node concept="3A2sRY" id="2Qsys8b5osx" role="2Oq$k0">
+                                  <ref role="3A2yKK" node="7LI_gNMXDUV" resolve="empd" />
+                                </node>
+                                <node concept="3TrEf2" id="2Qsys8b5oOo" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:5itBwM6zLOl" resolve="init" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="a7P8L" id="2Qsys8b5oOJ" role="3AunhB">
+                              <ref role="a7OzE" node="7LI_gNMXEMO" resolve="InitType" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="9aQIb" id="2Qsys8b5oOW" role="9aQIa">
+                        <node concept="3clFbS" id="2Qsys8b5oOX" role="9aQI4">
+                          <node concept="3Aqczg" id="2Qsys8b5oQ1" role="3cqZAp">
+                            <node concept="3Aqt3T" id="2Qsys8b5oQ0" role="3Aqpz8">
+                              <ref role="3AqCNq" to="kqnc:34$A1MfabR$" resolve="checkAll" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="7LI_gNMXEMN" role="0Rg$4">
+              <node concept="aZer4" id="7LI_gNMXEMO" role="3XD1gS">
+                <property role="TrG5h" value="InitType" />
+              </node>
+              <node concept="aZer4" id="7LI_gNMXEMP" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="32pEOW" id="7LI_gNMXEMQ" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="7LI_gNMXEMR" role="3xSepv">
+              <node concept="3Aq9E8" id="7LI_gNMXEMS" role="3xSepj">
+                <node concept="3I6sU6" id="7LI_gNMXEMT" role="3Ip0Jz">
+                  <node concept="3IrJb3" id="2Qsys8b5oXC" role="3I6sU7">
+                    <node concept="3clFbS" id="2Qsys8b5oXD" role="3IrJb0">
+                      <node concept="3Aqczg" id="2Qsys8b5oXE" role="3cqZAp">
+                        <node concept="3jbYBd" id="7LI_gNMXEMV" role="3Aqpz8">
+                          <ref role="3jbY9l" to="kqnc:5itBwMau8m1" resolve="lift" />
+                          <node concept="2OqwBi" id="7LI_gNMXEMW" role="3jbY8P">
+                            <node concept="3A2sRY" id="7LI_gNMXEMX" role="2Oq$k0">
+                              <ref role="3A2yKK" node="7LI_gNMXDUV" resolve="empd" />
+                            </node>
+                            <node concept="3TrEf2" id="7LI_gNMXEMY" role="2OqNvi">
+                              <ref role="3Tt5mk" to="wq2x:5itBwM6wB6D" resolve="type" />
+                            </node>
+                          </node>
+                          <node concept="a7P8L" id="7LI_gNMXEMZ" role="3jbY8V">
+                            <ref role="a7OzE" node="7LI_gNMXEMP" resolve="Type" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbJ" id="2Qsys8b5p0m" role="3cqZAp">
+                        <node concept="3clFbS" id="2Qsys8b5p0o" role="3clFbx">
+                          <node concept="3Aqczg" id="2Qsys8b5oZM" role="3cqZAp">
+                            <node concept="3Aqt3T" id="2Qsys8b5oZK" role="3Aqpz8">
+                              <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="defaultConvertsTo" />
+                              <node concept="a7P8L" id="2Qsys8b5oZV" role="3AunhB">
+                                <ref role="a7OzE" node="7LI_gNMXEMO" resolve="InitType" />
+                              </node>
+                              <node concept="a7P8L" id="2Qsys8b5oZW" role="3AunhB">
+                                <ref role="a7OzE" node="7LI_gNMXEMP" resolve="Type" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="2Qsys8b5pE4" role="3clFbw">
+                          <node concept="2OqwBi" id="2Qsys8b5pcR" role="2Oq$k0">
+                            <node concept="3A2sRY" id="2Qsys8b5p0J" role="2Oq$k0">
+                              <ref role="3A2yKK" node="7LI_gNMXDUV" resolve="empd" />
+                            </node>
+                            <node concept="3TrEf2" id="2Qsys8b5pwL" role="2OqNvi">
+                              <ref role="3Tt5mk" to="wq2x:5itBwM6zLOl" resolve="init" />
+                            </node>
+                          </node>
+                          <node concept="3x8VRR" id="2Qsys8b5pNG" role="2OqNvi" />
+                        </node>
+                      </node>
+                      <node concept="3Aqczg" id="2Qsys8b5pRg" role="3cqZAp">
+                        <node concept="3Aqt3T" id="2Qsys8b5pRe" role="3Aqpz8">
+                          <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                          <node concept="37jhX" id="2Qsys8b5pRC" role="3AunhB">
+                            <node concept="3A2sRY" id="2Qsys8b5pRA" role="37jj2">
+                              <ref role="3A2yKK" node="7LI_gNMXDUV" resolve="empd" />
+                            </node>
+                          </node>
+                          <node concept="a7P8L" id="2Qsys8b5pRS" role="3AunhB">
+                            <ref role="a7OzE" node="7LI_gNMXEMP" resolve="Type" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="7LI_gNMXDUU" role="1nLNMg">
+        <ref role="2t_S0q" to="wq2x:5itBwM6wvc4" resolve="ExpandMacroParameterDeclaration" />
+        <node concept="3A20r5" id="7LI_gNMXDUV" role="2t_VXX">
+          <property role="TrG5h" value="empd" />
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="7LI_gNMXD3q" role="1nK1Vg">
       <property role="TrG5h" value="expandMacroParameterRef" />
       <node concept="3clFbS" id="7LI_gNMXD3r" role="1nLNMH">
@@ -743,156 +1270,9 @@
         </node>
       </node>
     </node>
-    <node concept="1nLNMY" id="7LI_gNMXDD5" role="1nK1Vg">
-      <property role="TrG5h" value="expandMacroParameterDecl" />
-      <node concept="3clFbS" id="7LI_gNMXDD6" role="1nLNMH">
-        <node concept="1nLNNL" id="7LI_gNMXEMC" role="3cqZAp">
-          <node concept="1nLNMm" id="7LI_gNMXEMD" role="1nLNNK">
-            <node concept="3Aq93q" id="7LI_gNMXEME" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="7LI_gNMXEMF" role="3Ip0Jz">
-                <node concept="3I6s7M" id="7LI_gNMXEMG" role="3I6sU7">
-                  <node concept="3Aqt3T" id="7LI_gNMXEMH" role="3I6s78">
-                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
-                    <node concept="37jhX" id="7LI_gNMXEMI" role="3AunhB">
-                      <node concept="2OqwBi" id="7LI_gNMXEMJ" role="37jj2">
-                        <node concept="3A2sRY" id="7LI_gNMXEMK" role="2Oq$k0">
-                          <ref role="3A2yKK" node="7LI_gNMXDUV" resolve="empd" />
-                        </node>
-                        <node concept="3TrEf2" id="7LI_gNMXEML" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:5itBwM6zLOl" resolve="init" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="a7P8L" id="7LI_gNMXEMM" role="3AunhB">
-                      <ref role="a7OzE" node="7LI_gNMXEMO" resolve="InitType" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3NuqgR" id="7LI_gNMXEMN" role="0Rg$4">
-              <node concept="aZer4" id="7LI_gNMXEMO" role="3XD1gS">
-                <property role="TrG5h" value="InitType" />
-              </node>
-              <node concept="aZer4" id="7LI_gNMXEMP" role="3XD1gS">
-                <property role="TrG5h" value="Type" />
-              </node>
-              <node concept="32pEOW" id="7LI_gNMXEMQ" role="3vLBG7" />
-            </node>
-            <node concept="3xSepi" id="7LI_gNMXEMR" role="3xSepv">
-              <node concept="3Aq9E8" id="7LI_gNMXEMS" role="3xSepj">
-                <node concept="3I6sU6" id="7LI_gNMXEMT" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="7LI_gNMXEMU" role="3I6sU7">
-                    <node concept="3jbYBd" id="7LI_gNMXEMV" role="3I6s78">
-                      <ref role="3jbY9l" to="kqnc:5itBwMau8m1" resolve="lift" />
-                      <node concept="2OqwBi" id="7LI_gNMXEMW" role="3jbY8P">
-                        <node concept="3A2sRY" id="7LI_gNMXEMX" role="2Oq$k0">
-                          <ref role="3A2yKK" node="7LI_gNMXDUV" resolve="empd" />
-                        </node>
-                        <node concept="3TrEf2" id="7LI_gNMXEMY" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:5itBwM6wB6D" resolve="type" />
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="7LI_gNMXEMZ" role="3jbY8V">
-                        <ref role="a7OzE" node="7LI_gNMXEMP" resolve="Type" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3Aq9E8" id="7LI_gNMXEN0" role="3xSepj">
-                <node concept="3I6sU6" id="7LI_gNMXEN1" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="7LI_gNMXEN2" role="3I6sU7">
-                    <node concept="3Aqt3T" id="7LI_gNMXEN3" role="3I6s78">
-                      <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="convertsTo" />
-                      <node concept="a7P8L" id="7LI_gNMXEN4" role="3AunhB">
-                        <ref role="a7OzE" node="7LI_gNMXEMO" resolve="InitType" />
-                      </node>
-                      <node concept="a7P8L" id="7LI_gNMXEN5" role="3AunhB">
-                        <ref role="a7OzE" node="7LI_gNMXEMP" resolve="Type" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="7LI_gNMXF53" role="3cqZAp" />
-        <node concept="1nLNNL" id="7LI_gNMXDV4" role="3cqZAp">
-          <node concept="1nLNMm" id="7LI_gNMXDV5" role="1nLNNK">
-            <node concept="3Aq93q" id="7LI_gNMXDV8" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="7LI_gNMXDV9" role="3Ip0Jz">
-                <node concept="3I6s7M" id="7LI_gNMXEWL" role="3I6sU7">
-                  <node concept="3Aqt3T" id="7LI_gNMXEWK" role="3I6s78">
-                    <ref role="3AqCNq" to="kqnc:34$A1MfabR$" resolve="checkAll" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3NuqgR" id="7LI_gNMXDVd" role="0Rg$4">
-              <node concept="aZer4" id="7LI_gNMXDVe" role="3XD1gS">
-                <property role="TrG5h" value="InitType" />
-              </node>
-              <node concept="aZer4" id="7LI_gNMXEm9" role="3XD1gS">
-                <property role="TrG5h" value="Type" />
-              </node>
-              <node concept="32pEOW" id="7LI_gNMXDVq" role="3vLBG7" />
-            </node>
-            <node concept="3xSepi" id="7LI_gNMXEm3" role="3xSepv">
-              <node concept="3Aq9E8" id="7LI_gNMXEm4" role="3xSepj">
-                <node concept="3I6sU6" id="7LI_gNMXEm5" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="7LI_gNMXEmP" role="3I6sU7">
-                    <node concept="3jbYBd" id="7LI_gNMXEmM" role="3I6s78">
-                      <ref role="3jbY9l" to="kqnc:5itBwMau8m1" resolve="lift" />
-                      <node concept="2OqwBi" id="7LI_gNMXEwW" role="3jbY8P">
-                        <node concept="3A2sRY" id="7LI_gNMXEn2" role="2Oq$k0">
-                          <ref role="3A2yKK" node="7LI_gNMXDUV" resolve="empd" />
-                        </node>
-                        <node concept="3TrEf2" id="7LI_gNMXEKb" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:5itBwM6wB6D" resolve="type" />
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="7LI_gNMXEmV" role="3jbY8V">
-                        <ref role="a7OzE" node="7LI_gNMXEm9" resolve="Type" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3Aq9E8" id="7LI_gNMXEKl" role="3xSepj">
-                <node concept="3I6sU6" id="7LI_gNMXEKm" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="7LI_gNMXELx" role="3I6sU7">
-                    <node concept="3Aqt3T" id="7LI_gNMXELv" role="3I6s78">
-                      <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
-                      <node concept="37jhX" id="7LI_gNMXELG" role="3AunhB">
-                        <node concept="3A2sRY" id="7LI_gNMXELE" role="37jj2">
-                          <ref role="3A2yKK" node="7LI_gNMXDUV" resolve="empd" />
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="7LI_gNMXELW" role="3AunhB">
-                        <ref role="a7OzE" node="7LI_gNMXEm9" resolve="Type" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2t___k" id="7LI_gNMXDUU" role="1nLNMg">
-        <ref role="2t_S0q" to="wq2x:5itBwM6wvc4" resolve="ExpandMacroParameterDeclaration" />
-        <node concept="3A20r5" id="7LI_gNMXDUV" role="2t_VXX">
-          <property role="TrG5h" value="empd" />
-        </node>
-      </node>
-    </node>
-    <node concept="1nLNMY" id="7LI_gNMXFci" role="1nK1Vg">
-      <property role="TrG5h" value="callMacroParameterRef" />
-      <node concept="3clFbS" id="7LI_gNMXFcj" role="1nLNMH">
+    <node concept="1nLNMY" id="51ek2rSbFml" role="1nK1Vg">
+      <property role="TrG5h" value="callMacroParameterDeclaration" />
+      <node concept="3clFbS" id="51ek2rSbFmm" role="1nLNMH">
         <node concept="1nLNNL" id="7LI_gNMXFsP" role="3cqZAp">
           <node concept="1nLNMm" id="7LI_gNMXFsQ" role="1nLNNK">
             <node concept="3Aq93q" id="7LI_gNMXFsT" role="1nLNMb">
@@ -912,13 +1292,8 @@
                     <node concept="3jbYBd" id="7LI_gNMXFu5" role="3I6s78">
                       <ref role="3jbY9l" to="kqnc:5itBwMau8m1" resolve="lift" />
                       <node concept="2OqwBi" id="7LI_gNMXFVi" role="3jbY8P">
-                        <node concept="2OqwBi" id="7LI_gNMXFAU" role="2Oq$k0">
-                          <node concept="3A2sRY" id="7LI_gNMXFuq" role="2Oq$k0">
-                            <ref role="3A2yKK" node="7LI_gNMXFsG" resolve="cmpr" />
-                          </node>
-                          <node concept="3TrEf2" id="7LI_gNMXFL0" role="2OqNvi">
-                            <ref role="3Tt5mk" to="wq2x:5itBwM5mdnH" resolve="declaration" />
-                          </node>
+                        <node concept="3A2sRY" id="51ek2rSbF_Y" role="2Oq$k0">
+                          <ref role="3A2yKK" node="51ek2rSbFmo" resolve="cmpd" />
                         </node>
                         <node concept="3TrEf2" id="7LI_gNMXGc3" role="2OqNvi">
                           <ref role="3Tt5mk" to="wq2x:5itBwM5ifE5" resolve="type" />
@@ -937,8 +1312,8 @@
                     <node concept="3Aqt3T" id="7LI_gNMXFtA" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
                       <node concept="37jhX" id="7LI_gNMXFtI" role="3AunhB">
-                        <node concept="3A2sRY" id="7LI_gNMXFtG" role="37jj2">
-                          <ref role="3A2yKK" node="7LI_gNMXFsG" resolve="cmpr" />
+                        <node concept="3A2sRY" id="51ek2rSbFCw" role="37jj2">
+                          <ref role="3A2yKK" node="51ek2rSbFmo" resolve="cmpd" />
                         </node>
                       </node>
                       <node concept="a7P8L" id="7LI_gNMXGfm" role="3AunhB">
@@ -958,6 +1333,69 @@
           </node>
         </node>
       </node>
+      <node concept="2t___k" id="51ek2rSbFmn" role="1nLNMg">
+        <ref role="2t_S0q" to="wq2x:5itBwM5i6X6" resolve="CallMacroParameterDeclaration" />
+        <node concept="3A20r5" id="51ek2rSbFmo" role="2t_VXX">
+          <property role="TrG5h" value="cmpd" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="7LI_gNMXFci" role="1nK1Vg">
+      <property role="TrG5h" value="callMacroParameterRef" />
+      <node concept="3clFbS" id="7LI_gNMXFcj" role="1nLNMH">
+        <node concept="1nLNNL" id="51ek2rSbFCN" role="3cqZAp">
+          <node concept="1nLNMm" id="51ek2rSbFCO" role="1nLNNK">
+            <node concept="3Aq93q" id="51ek2rSbFCR" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="51ek2rSbFCS" role="3Ip0Jz">
+                <node concept="3I6s7M" id="51ek2rSbFDy" role="3I6sU7">
+                  <node concept="3Aqt3T" id="51ek2rSbFDx" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                    <node concept="37jhX" id="51ek2rSbFDD" role="3AunhB">
+                      <node concept="2OqwBi" id="51ek2rSbFOj" role="37jj2">
+                        <node concept="3A2sRY" id="51ek2rSbFDB" role="2Oq$k0">
+                          <ref role="3A2yKK" node="7LI_gNMXFsG" resolve="cmpr" />
+                        </node>
+                        <node concept="3TrEf2" id="51ek2rSbG0T" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:5itBwM5mdnH" resolve="declaration" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="51ek2rSbG3k" role="3AunhB">
+                      <ref role="a7OzE" node="51ek2rSbFCX" resolve="Type" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="51ek2rSbFCW" role="0Rg$4">
+              <node concept="aZer4" id="51ek2rSbFCX" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="32pEOW" id="51ek2rSbFD9" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="51ek2rSbGna" role="3xSepv">
+              <node concept="3Aq9E8" id="51ek2rSbGnb" role="3xSepj">
+                <node concept="3I6sU6" id="51ek2rSbGnc" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="51ek2rSbGnh" role="3I6sU7">
+                    <node concept="3Aqt3T" id="51ek2rSbGng" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                      <node concept="37jhX" id="51ek2rSbGno" role="3AunhB">
+                        <node concept="3A2sRY" id="51ek2rSbGnm" role="37jj2">
+                          <ref role="3A2yKK" node="7LI_gNMXFsG" resolve="cmpr" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="51ek2rSbGnC" role="3AunhB">
+                        <ref role="a7OzE" node="51ek2rSbFCX" resolve="Type" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="2t___k" id="7LI_gNMXFsF" role="1nLNMg">
         <ref role="2t_S0q" to="wq2x:5itBwM5kgmv" resolve="CallMacroParameterReference" />
         <node concept="3A20r5" id="7LI_gNMXFsG" role="2t_VXX">
@@ -965,9 +1403,9 @@
         </node>
       </node>
     </node>
-    <node concept="1nLNMY" id="7LI_gNMXGji" role="1nK1Vg">
+    <node concept="1nLNMY" id="2Qsys8b2g6G" role="1nK1Vg">
       <property role="TrG5h" value="expandMacroInputDeclaration" />
-      <node concept="3clFbS" id="7LI_gNMXGjj" role="1nLNMH">
+      <node concept="3clFbS" id="2Qsys8b2g6H" role="1nLNMH">
         <node concept="1nLNNL" id="7LI_gNMXGjk" role="3cqZAp">
           <node concept="1nLNMm" id="7LI_gNMXGjl" role="1nLNNK">
             <node concept="3Aq93q" id="7LI_gNMXGjm" role="1nLNMb">
@@ -987,30 +1425,33 @@
                     <node concept="3Aqt3T" id="7LI_gNMXGju" role="3I6s78">
                       <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
                       <node concept="37jhX" id="7LI_gNMXGjv" role="3AunhB">
-                        <node concept="3A2sRY" id="7LI_gNMXGjw" role="37jj2">
-                          <ref role="3A2yKK" node="7LI_gNMXGjF" resolve="emri" />
+                        <node concept="3A2sRY" id="2Qsys8b2h7M" role="37jj2">
+                          <ref role="3A2yKK" node="2Qsys8b2gn5" resolve="emid" />
                         </node>
                       </node>
                       <node concept="ns1u0" id="7LI_gNMXGjx" role="3AunhB">
-                        <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
+                        <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="7LI_gNMXGjy" role="ns1xD">
-                          <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                          <node concept="2OqwBi" id="7LI_gNMXGjz" role="nsMwV">
-                            <node concept="1PxgMI" id="7LI_gNMXGj$" role="2Oq$k0">
-                              <property role="1BlNFB" value="true" />
-                              <node concept="chp4Y" id="7LI_gNMXHia" role="3oSUPX">
-                                <ref role="cht4Q" to="wq2x:5itBwM66cNU" resolve="ExpandMacroInputSpecification" />
-                              </node>
-                              <node concept="2OqwBi" id="7LI_gNMXGjA" role="1m5AlR">
-                                <node concept="3A2sRY" id="7LI_gNMXGjB" role="2Oq$k0">
-                                  <ref role="3A2yKK" node="7LI_gNMXGjF" resolve="emri" />
+                          <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
+                          <node concept="2OqwBi" id="3bgqfmmKN9N" role="nsMwV">
+                            <node concept="2OqwBi" id="7LI_gNMXGjz" role="2Oq$k0">
+                              <node concept="1PxgMI" id="7LI_gNMXGj$" role="2Oq$k0">
+                                <property role="1BlNFB" value="true" />
+                                <node concept="chp4Y" id="7LI_gNMXHia" role="3oSUPX">
+                                  <ref role="cht4Q" to="wq2x:5itBwM66cNU" resolve="ExpandMacroInputSpecification" />
                                 </node>
-                                <node concept="1mfA1w" id="7LI_gNMXGjC" role="2OqNvi" />
+                                <node concept="2OqwBi" id="7LI_gNMXGjA" role="1m5AlR">
+                                  <node concept="3A2sRY" id="2Qsys8b2h8j" role="2Oq$k0">
+                                    <ref role="3A2yKK" node="2Qsys8b2gn5" resolve="emid" />
+                                  </node>
+                                  <node concept="1mfA1w" id="7LI_gNMXGjC" role="2OqNvi" />
+                                </node>
+                              </node>
+                              <node concept="3TrEf2" id="3bgqfmmKMV1" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:5itBwM66ULm" resolve="applicableConcept" />
                               </node>
                             </node>
-                            <node concept="2qgKlT" id="7LI_gNMXHNt" role="2OqNvi">
-                              <ref role="37wK5l" to="x5bw:7LI_gNMXH_G" resolve="getApplicableConcept" />
-                            </node>
+                            <node concept="iZEcu" id="3bgqfmmKNs_" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
@@ -1022,6 +1463,69 @@
           </node>
         </node>
       </node>
+      <node concept="2t___k" id="2Qsys8b2gn4" role="1nLNMg">
+        <ref role="2t_S0q" to="wq2x:5itBwM66Jqx" resolve="ExpandMacroInputDeclaration" />
+        <node concept="3A20r5" id="2Qsys8b2gn5" role="2t_VXX">
+          <property role="TrG5h" value="emid" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="7LI_gNMXGji" role="1nK1Vg">
+      <property role="TrG5h" value="expandMacroInputReference" />
+      <node concept="3clFbS" id="7LI_gNMXGjj" role="1nLNMH">
+        <node concept="1nLNNL" id="2Qsys8b2hjH" role="3cqZAp">
+          <node concept="1nLNMm" id="2Qsys8b2hjI" role="1nLNNK">
+            <node concept="3Aq93q" id="2Qsys8b2hjL" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="2Qsys8b2hjM" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Qsys8b2hjU" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2Qsys8b2hjT" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                    <node concept="37jhX" id="2Qsys8b2hkw" role="3AunhB">
+                      <node concept="2OqwBi" id="2Qsys8b2hst" role="37jj2">
+                        <node concept="3A2sRY" id="2Qsys8b2hku" role="2Oq$k0">
+                          <ref role="3A2yKK" node="7LI_gNMXGjF" resolve="emri" />
+                        </node>
+                        <node concept="3TrEf2" id="2Qsys8b2hDo" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:5itBwM7J4Oi" resolve="declaration" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="2Qsys8b2hFF" role="3AunhB">
+                      <ref role="a7OzE" node="2Qsys8b2hk1" resolve="Type" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="2Qsys8b2hk0" role="0Rg$4">
+              <node concept="aZer4" id="2Qsys8b2hk1" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="32pEOW" id="2Qsys8b2hkd" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="2Qsys8b2hGk" role="3xSepv">
+              <node concept="3Aq9E8" id="2Qsys8b2hGl" role="3xSepj">
+                <node concept="3I6sU6" id="2Qsys8b2hGm" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="2Qsys8b2hGr" role="3I6sU7">
+                    <node concept="3Aqt3T" id="2Qsys8b2hGq" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                      <node concept="37jhX" id="2Qsys8b2hGy" role="3AunhB">
+                        <node concept="3A2sRY" id="2Qsys8b2hGw" role="37jj2">
+                          <ref role="3A2yKK" node="7LI_gNMXGjF" resolve="emri" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="2Qsys8b2hGU" role="3AunhB">
+                        <ref role="a7OzE" node="2Qsys8b2hk1" resolve="Type" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="2t___k" id="7LI_gNMXGjE" role="1nLNMg">
         <ref role="2t_S0q" to="wq2x:5itBwM7J4Oh" resolve="ExpandMacroInputReference" />
         <node concept="3A20r5" id="7LI_gNMXGjF" role="2t_VXX">
@@ -1029,6 +1533,227 @@
         </node>
       </node>
     </node>
+    <node concept="1nLNMY" id="51ek2rSd6bg" role="1nK1Vg">
+      <property role="TrG5h" value="expandMacroConstraint" />
+      <node concept="3clFbS" id="51ek2rSd6bh" role="1nLNMH">
+        <node concept="1mebxG" id="51ek2rSd6uL" role="3cqZAp">
+          <node concept="2OqwBi" id="51ek2rSd6DK" role="1mebXD">
+            <node concept="3A2sRY" id="51ek2rSd6uU" role="2Oq$k0">
+              <ref role="3A2yKK" node="51ek2rSd6bj" resolve="emc" />
+            </node>
+            <node concept="3TrEf2" id="51ek2rSd6Nr" role="2OqNvi">
+              <ref role="3Tt5mk" to="wq2x:5itBwM7GBLp" resolve="template" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="61G6TdBHAkj" role="3cqZAp">
+          <node concept="3clFbS" id="61G6TdBHAkl" role="3clFbx">
+            <node concept="3clFbF" id="kJ7gN7eRyJ" role="3cqZAp">
+              <node concept="2OqwBi" id="61G6TdBmiL8" role="3clFbG">
+                <node concept="3A2sRY" id="kJ7gN7eRyH" role="2Oq$k0">
+                  <ref role="3A2yKK" node="51ek2rSd6bj" resolve="emc" />
+                </node>
+                <node concept="26X5F$" id="61G6TdBmiY4" role="2OqNvi">
+                  <property role="26X25f" value="4jcOV4hu0n_/ERROR" />
+                  <node concept="Xl_RD" id="61G6TdBmiYb" role="26X25d">
+                    <property role="Xl_RC" value="incorrect number of logical variables" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="61G6TdBIkPY" role="3clFbw">
+            <node concept="2OqwBi" id="61G6TdBHVaM" role="3uHU7B">
+              <node concept="2OqwBi" id="61G6TdBHT1j" role="2Oq$k0">
+                <node concept="3A2sRY" id="61G6TdBHSQQ" role="2Oq$k0">
+                  <ref role="3A2yKK" node="51ek2rSd6bj" resolve="emc" />
+                </node>
+                <node concept="3Tsc0h" id="61G6TdBHTj4" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:5itBwM7GBKR" resolve="logical" />
+                </node>
+              </node>
+              <node concept="34oBXx" id="61G6TdBHWYt" role="2OqNvi" />
+            </node>
+            <node concept="2OqwBi" id="61G6TdBIpvK" role="3uHU7w">
+              <node concept="2OqwBi" id="61G6TdBIlww" role="2Oq$k0">
+                <node concept="2OqwBi" id="61G6TdBIkfz" role="2Oq$k0">
+                  <node concept="3A2sRY" id="61G6TdBIjOX" role="2Oq$k0">
+                    <ref role="3A2yKK" node="51ek2rSd6bj" resolve="emc" />
+                  </node>
+                  <node concept="3TrEf2" id="61G6TdBIkv$" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:5itBwM7GBLp" resolve="template" />
+                  </node>
+                </node>
+                <node concept="3Tsc0h" id="61G6TdBIlKj" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:5itBwM6iJYb" resolve="logical" />
+                </node>
+              </node>
+              <node concept="34oBXx" id="61G6TdBIs2q" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="1nLNNL" id="61G6TdBIx98" role="3cqZAp">
+          <node concept="1nLNMm" id="61G6TdBIx9a" role="1nLNNK">
+            <node concept="3Aq93q" id="61G6TdBIx9g" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="61G6TdBIx9h" role="3Ip0Jz">
+                <node concept="3I6s7M" id="61G6TdBIx9l" role="3I6sU7">
+                  <node concept="3Aqt3T" id="61G6TdBIx9k" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                    <node concept="37jhX" id="61G6TdBIxa2" role="3AunhB">
+                      <node concept="2OqwBi" id="61G6TdBIxZz" role="37jj2">
+                        <node concept="3A2sRY" id="61G6TdBIxa0" role="2Oq$k0">
+                          <ref role="3A2yKK" node="51ek2rSd6bj" resolve="emc" />
+                        </node>
+                        <node concept="3TrEf2" id="61G6TdBIybT" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:5itBwM7GBKT" resolve="input" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="61G6TdBIz7h" role="3AunhB">
+                      <ref role="a7OzE" node="61G6TdBIx9q" resolve="InputType" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="61G6TdBIx9p" role="0Rg$4">
+              <node concept="aZer4" id="61G6TdBIx9q" role="3XD1gS">
+                <property role="TrG5h" value="InputType" />
+              </node>
+              <node concept="32pEOW" id="61G6TdBIx9A" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="61G6TdBIz7s" role="3xSepv">
+              <node concept="3Aq9E8" id="61G6TdBIz7t" role="3xSepj">
+                <node concept="3I6sU6" id="61G6TdBIz7u" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="61G6TdBIz7z" role="3I6sU7">
+                    <node concept="3Aqt3T" id="61G6TdBIz7y" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="defaultConvertsTo" />
+                      <node concept="a7P8L" id="61G6TdBIz7K" role="3AunhB">
+                        <ref role="a7OzE" node="61G6TdBIx9q" resolve="InputType" />
+                      </node>
+                      <node concept="ns1u0" id="61G6TdBIz7U" role="3AunhB">
+                        <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
+                        <node concept="nsMwS" id="61G6TdBIz7X" role="ns1xD">
+                          <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
+                          <node concept="2OqwBi" id="61G6TdBI_1L" role="nsMwV">
+                            <node concept="2OqwBi" id="61G6TdBI$iz" role="2Oq$k0">
+                              <node concept="2OqwBi" id="61G6TdBIzVt" role="2Oq$k0">
+                                <node concept="3A2sRY" id="61G6TdBIzSj" role="2Oq$k0">
+                                  <ref role="3A2yKK" node="51ek2rSd6bj" resolve="emc" />
+                                </node>
+                                <node concept="3TrEf2" id="61G6TdBI$8l" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:5itBwM7GBLp" resolve="template" />
+                                </node>
+                              </node>
+                              <node concept="3TrEf2" id="61G6TdBI$zP" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:5itBwM6dfdw" resolve="applicableConcept" />
+                              </node>
+                            </node>
+                            <node concept="iZEcu" id="61G6TdBI_S8" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="51ek2rSd6bi" role="1nLNMg">
+        <ref role="2t_S0q" to="wq2x:5itBwM7GBv1" resolve="ExpandMacroConstraint" />
+        <node concept="3A20r5" id="51ek2rSd6bj" role="2t_VXX">
+          <property role="TrG5h" value="emc" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="51ek2rSd73p" role="1nK1Vg">
+      <property role="TrG5h" value="expandMacroTemplate" />
+      <node concept="3clFbS" id="51ek2rSd73q" role="1nLNMH">
+        <node concept="1mebxG" id="51ek2rSdfRQ" role="3cqZAp">
+          <node concept="2OqwBi" id="51ek2rSdlbh" role="1mebXD">
+            <node concept="3A2sRY" id="51ek2rSdkYP" role="2Oq$k0">
+              <ref role="3A2yKK" node="51ek2rSd73s" resolve="emt" />
+            </node>
+            <node concept="3TrEf2" id="51ek2rSdlvh" role="2OqNvi">
+              <ref role="3Tt5mk" to="wq2x:5itBwM6dfdw" resolve="applicableConcept" />
+            </node>
+          </node>
+        </node>
+        <node concept="Oftf1" id="51ek2rSdfS3" role="3cqZAp">
+          <node concept="2OqwBi" id="51ek2rSdilu" role="Oftjs">
+            <node concept="2OqwBi" id="51ek2rSdg4z" role="2Oq$k0">
+              <node concept="3A2sRY" id="51ek2rSdfSu" role="2Oq$k0">
+                <ref role="3A2yKK" node="51ek2rSd73s" resolve="emt" />
+              </node>
+              <node concept="3Tsc0h" id="51ek2rSdghl" role="2OqNvi">
+                <ref role="3TtcxE" to="wq2x:5itBwM6iJYb" resolve="logical" />
+              </node>
+            </node>
+            <node concept="3$u5V9" id="51ek2rSdknK" role="2OqNvi">
+              <node concept="1bVj0M" id="51ek2rSdknM" role="23t8la">
+                <node concept="3clFbS" id="51ek2rSdknN" role="1bW5cS">
+                  <node concept="3clFbF" id="51ek2rSdkrO" role="3cqZAp">
+                    <node concept="2OqwBi" id="51ek2rSdkBj" role="3clFbG">
+                      <node concept="37vLTw" id="51ek2rSdkrN" role="2Oq$k0">
+                        <ref role="3cqZAo" node="51ek2rSdknO" resolve="it" />
+                      </node>
+                      <node concept="3TrEf2" id="51ek2rSdkPH" role="2OqNvi">
+                        <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="51ek2rSdknO" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="51ek2rSdknP" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="Oftf1" id="51ek2rSdlXd" role="3cqZAp">
+          <node concept="2OqwBi" id="51ek2rSdoBd" role="Oftjs">
+            <node concept="2OqwBi" id="51ek2rSdm9_" role="2Oq$k0">
+              <node concept="3A2sRY" id="51ek2rSdlY0" role="2Oq$k0">
+                <ref role="3A2yKK" node="51ek2rSd73s" resolve="emt" />
+              </node>
+              <node concept="3Tsc0h" id="51ek2rSdmm9" role="2OqNvi">
+                <ref role="3TtcxE" to="wq2x:5itBwM6wU6s" resolve="parameter" />
+              </node>
+            </node>
+            <node concept="3$u5V9" id="51ek2rSdqH0" role="2OqNvi">
+              <node concept="1bVj0M" id="51ek2rSdqH2" role="23t8la">
+                <node concept="3clFbS" id="51ek2rSdqH3" role="1bW5cS">
+                  <node concept="3clFbF" id="51ek2rSdqLh" role="3cqZAp">
+                    <node concept="2OqwBi" id="51ek2rSdqXp" role="3clFbG">
+                      <node concept="37vLTw" id="51ek2rSdqLg" role="2Oq$k0">
+                        <ref role="3cqZAo" node="51ek2rSdqH4" resolve="it" />
+                      </node>
+                      <node concept="3TrEf2" id="51ek2rSdrfb" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:5itBwM6wB6D" resolve="type" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="51ek2rSdqH4" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="51ek2rSdqH5" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="51ek2rSd73r" role="1nLNMg">
+        <ref role="2t_S0q" to="wq2x:5itBwM6cWQh" resolve="ExpandMacroPrototype" />
+        <node concept="3A20r5" id="51ek2rSd73s" role="2t_VXX">
+          <property role="TrG5h" value="emt" />
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="7LI_gNMXHTb" role="1nK1Vg">
       <property role="TrG5h" value="lateExpressionItem" />
       <node concept="3clFbS" id="7LI_gNMXHTc" role="1nLNMH">
@@ -1103,224 +1828,241 @@
     <node concept="1nLNMY" id="7LI_gNMXJnT" role="1nK1Vg">
       <property role="TrG5h" value="userConstraint" />
       <node concept="3clFbS" id="7LI_gNMXJnU" role="1nLNMH">
-        <node concept="3SKdUt" id="7LI_gNN9mgp" role="3cqZAp">
-          <node concept="1PaTwC" id="7LI_gNN9mgq" role="1aUNEU">
-            <node concept="3oM_SD" id="7LI_gNN9mgs" role="1PaTwD">
-              <property role="3oM_SC" value="FIXME" />
+        <node concept="3clFbJ" id="61G6TdBJpEg" role="3cqZAp">
+          <node concept="3clFbS" id="61G6TdBJpEi" role="3clFbx">
+            <node concept="3clFbF" id="61G6TdBJxmX" role="3cqZAp">
+              <node concept="2OqwBi" id="61G6TdBJxna" role="3clFbG">
+                <node concept="3A2sRY" id="61G6TdBJxmV" role="2Oq$k0">
+                  <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
+                </node>
+                <node concept="26X5F$" id="61G6TdBJxv9" role="2OqNvi">
+                  <property role="26X25f" value="4jcOV4hu0n_/ERROR" />
+                  <node concept="Xl_RD" id="61G6TdBJxvs" role="26X25d">
+                    <property role="Xl_RC" value="constraint arity does not match declaration" />
+                  </node>
+                </node>
+              </node>
             </node>
-            <node concept="3oM_SD" id="7LI_gNN9mhM" role="1PaTwD">
-              <property role="3oM_SC" value="ensure" />
+            <node concept="3clFbH" id="61G6TdBJyc7" role="3cqZAp" />
+          </node>
+          <node concept="3y3z36" id="61G6TdBJuJZ" role="3clFbw">
+            <node concept="2OqwBi" id="61G6TdBJwXB" role="3uHU7w">
+              <node concept="2OqwBi" id="61G6TdBJvCa" role="2Oq$k0">
+                <node concept="3A2sRY" id="61G6TdBJvln" role="2Oq$k0">
+                  <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
+                </node>
+                <node concept="3TrEf2" id="61G6TdBJwot" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:6p0DfM0aywA" resolve="template" />
+                </node>
+              </node>
+              <node concept="3TrcHB" id="61G6TdBJxfO" role="2OqNvi">
+                <ref role="3TsBF5" to="wq2x:6p0DfM0azKj" resolve="arity" />
+              </node>
             </node>
-            <node concept="3oM_SD" id="7LI_gNN9mhP" role="1PaTwD">
-              <property role="3oM_SC" value="the" />
-            </node>
-            <node concept="3oM_SD" id="7LI_gNN9mhT" role="1PaTwD">
-              <property role="3oM_SC" value="number" />
-            </node>
-            <node concept="3oM_SD" id="7LI_gNN9miA" role="1PaTwD">
-              <property role="3oM_SC" value="of" />
-            </node>
-            <node concept="3oM_SD" id="7LI_gNN9miL" role="1PaTwD">
-              <property role="3oM_SC" value="actual" />
-            </node>
-            <node concept="3oM_SD" id="7LI_gNN9miX" role="1PaTwD">
-              <property role="3oM_SC" value="args" />
-            </node>
-            <node concept="3oM_SD" id="7LI_gNN9mjj" role="1PaTwD">
-              <property role="3oM_SC" value="matches" />
-            </node>
-            <node concept="3oM_SD" id="7LI_gNN9mjs" role="1PaTwD">
-              <property role="3oM_SC" value="arity" />
+            <node concept="2OqwBi" id="61G6TdBJrPo" role="3uHU7B">
+              <node concept="2OqwBi" id="61G6TdBJpPB" role="2Oq$k0">
+                <node concept="3A2sRY" id="61G6TdBJpFW" role="2Oq$k0">
+                  <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
+                </node>
+                <node concept="3Tsc0h" id="61G6TdBJqfb" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:6p0DfM0et2r" resolve="argument" />
+                </node>
+              </node>
+              <node concept="34oBXx" id="61G6TdBJt__" role="2OqNvi" />
             </node>
           </node>
-        </node>
-        <node concept="1nLNNL" id="7LI_gNMXJHo" role="3cqZAp">
-          <node concept="1nLNMm" id="7LI_gNMXJHp" role="1nLNNK">
-            <node concept="3Aq93q" id="7LI_gNMXMG9" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="7LI_gNMXMGa" role="3Ip0Jz">
-                <node concept="3IrJb3" id="7LI_gNMXMGh" role="3I6sU7">
-                  <node concept="3clFbS" id="7LI_gNMXMGi" role="3IrJb0">
-                    <node concept="1Dw8fO" id="7LI_gNMXMGl" role="3cqZAp">
-                      <node concept="3cpWsn" id="7LI_gNMXMGm" role="1Duv9x">
-                        <property role="TrG5h" value="i" />
-                        <node concept="10Oyi0" id="7LI_gNMXMGu" role="1tU5fm" />
-                        <node concept="3cmrfG" id="7LI_gNMXNhN" role="33vP2m">
-                          <property role="3cmrfH" value="0" />
-                        </node>
-                      </node>
-                      <node concept="3clFbS" id="7LI_gNMXMGn" role="2LFqv$">
-                        <node concept="3Aqczg" id="7LI_gNMXSYB" role="3cqZAp">
-                          <node concept="3Aqt3T" id="7LI_gNMXSYA" role="3Aqpz8">
-                            <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
-                            <node concept="37jhX" id="7LI_gNMXSYI" role="3AunhB">
-                              <node concept="1y4W85" id="7LI_gNMXUC9" role="37jj2">
-                                <node concept="37vLTw" id="7LI_gNMXUEt" role="1y58nS">
-                                  <ref role="3cqZAo" node="7LI_gNMXMGm" resolve="i" />
-                                </node>
-                                <node concept="2OqwBi" id="7LI_gNMXT6F" role="1y566C">
-                                  <node concept="3A2sRY" id="7LI_gNMXSYG" role="2Oq$k0">
-                                    <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
+          <node concept="9aQIb" id="61G6TdBJxvI" role="9aQIa">
+            <node concept="3clFbS" id="61G6TdBJxvJ" role="9aQI4">
+              <node concept="1nLNNL" id="7LI_gNMXJHo" role="3cqZAp">
+                <node concept="1nLNMm" id="7LI_gNMXJHp" role="1nLNNK">
+                  <node concept="3Aq93q" id="7LI_gNMXMG9" role="1nLNMb">
+                    <property role="3ArMco" value="true" />
+                    <node concept="3I6sU6" id="7LI_gNMXMGa" role="3Ip0Jz">
+                      <node concept="3IrJb3" id="7LI_gNMXMGh" role="3I6sU7">
+                        <node concept="3clFbS" id="7LI_gNMXMGi" role="3IrJb0">
+                          <node concept="1Dw8fO" id="7LI_gNMXMGl" role="3cqZAp">
+                            <node concept="3cpWsn" id="7LI_gNMXMGm" role="1Duv9x">
+                              <property role="TrG5h" value="i" />
+                              <node concept="10Oyi0" id="7LI_gNMXMGu" role="1tU5fm" />
+                              <node concept="3cmrfG" id="7LI_gNMXNhN" role="33vP2m">
+                                <property role="3cmrfH" value="0" />
+                              </node>
+                            </node>
+                            <node concept="3clFbS" id="7LI_gNMXMGn" role="2LFqv$">
+                              <node concept="3Aqczg" id="7LI_gNMXSYB" role="3cqZAp">
+                                <node concept="3Aqt3T" id="7LI_gNMXSYA" role="3Aqpz8">
+                                  <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                                  <node concept="37jhX" id="7LI_gNMXSYI" role="3AunhB">
+                                    <node concept="1y4W85" id="7LI_gNMXUC9" role="37jj2">
+                                      <node concept="37vLTw" id="7LI_gNMXUEt" role="1y58nS">
+                                        <ref role="3cqZAo" node="7LI_gNMXMGm" resolve="i" />
+                                      </node>
+                                      <node concept="2OqwBi" id="7LI_gNMXT6F" role="1y566C">
+                                        <node concept="3A2sRY" id="7LI_gNMXSYG" role="2Oq$k0">
+                                          <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
+                                        </node>
+                                        <node concept="3Tsc0h" id="7LI_gNMXTiu" role="2OqNvi">
+                                          <ref role="3TtcxE" to="wq2x:6p0DfM0et2r" resolve="argument" />
+                                        </node>
+                                      </node>
+                                    </node>
                                   </node>
-                                  <node concept="3Tsc0h" id="7LI_gNMXTiu" role="2OqNvi">
-                                    <ref role="3TtcxE" to="wq2x:6p0DfM0et2r" resolve="argument" />
+                                  <node concept="a7P8L" id="7LI_gNMXULj" role="3AunhB">
+                                    <ref role="a7OzE" node="7LI_gNMXUFa" resolve="Type" />
+                                    <node concept="37vLTw" id="7LI_gNMXULC" role="3gCZO6">
+                                      <ref role="3cqZAo" node="7LI_gNMXMGm" resolve="i" />
+                                    </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="a7P8L" id="7LI_gNMXULj" role="3AunhB">
-                              <ref role="a7OzE" node="7LI_gNMXUFa" resolve="Type" />
-                              <node concept="37vLTw" id="7LI_gNMXULC" role="3gCZO6">
+                            <node concept="3eOVzh" id="7LI_gNMXOpI" role="1Dwp0S">
+                              <node concept="2OqwBi" id="7LI_gNMXR8H" role="3uHU7w">
+                                <node concept="2OqwBi" id="7LI_gNMXOM3" role="2Oq$k0">
+                                  <node concept="3A2sRY" id="7LI_gNMXOpZ" role="2Oq$k0">
+                                    <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
+                                  </node>
+                                  <node concept="3Tsc0h" id="7LI_gNMXOUR" role="2OqNvi">
+                                    <ref role="3TtcxE" to="wq2x:6p0DfM0et2r" resolve="argument" />
+                                  </node>
+                                </node>
+                                <node concept="34oBXx" id="7LI_gNMXSIo" role="2OqNvi" />
+                              </node>
+                              <node concept="37vLTw" id="7LI_gNMXNhW" role="3uHU7B">
+                                <ref role="3cqZAo" node="7LI_gNMXMGm" resolve="i" />
+                              </node>
+                            </node>
+                            <node concept="3uNrnE" id="7LI_gNMXSX4" role="1Dwrff">
+                              <node concept="37vLTw" id="7LI_gNMXSX6" role="2$L3a6">
                                 <ref role="3cqZAo" node="7LI_gNMXMGm" resolve="i" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="3eOVzh" id="7LI_gNMXOpI" role="1Dwp0S">
-                        <node concept="2OqwBi" id="7LI_gNMXR8H" role="3uHU7w">
-                          <node concept="2OqwBi" id="7LI_gNMXOM3" role="2Oq$k0">
-                            <node concept="3A2sRY" id="7LI_gNMXOpZ" role="2Oq$k0">
-                              <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
-                            </node>
-                            <node concept="3Tsc0h" id="7LI_gNMXOUR" role="2OqNvi">
-                              <ref role="3TtcxE" to="wq2x:6p0DfM0et2r" resolve="argument" />
-                            </node>
+                    </node>
+                  </node>
+                  <node concept="3NuqgR" id="7LI_gNMXUF9" role="0Rg$4">
+                    <node concept="aZer4" id="7LI_gNMXUFa" role="3XD1gS">
+                      <property role="TrG5h" value="Type" />
+                      <node concept="2OqwBi" id="7LI_gNMXUFL" role="3gj$pD">
+                        <node concept="2OqwBi" id="7LI_gNMXUFM" role="2Oq$k0">
+                          <node concept="3A2sRY" id="7LI_gNMXUFN" role="2Oq$k0">
+                            <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
                           </node>
-                          <node concept="34oBXx" id="7LI_gNMXSIo" role="2OqNvi" />
-                        </node>
-                        <node concept="37vLTw" id="7LI_gNMXNhW" role="3uHU7B">
-                          <ref role="3cqZAo" node="7LI_gNMXMGm" resolve="i" />
-                        </node>
-                      </node>
-                      <node concept="3uNrnE" id="7LI_gNMXSX4" role="1Dwrff">
-                        <node concept="37vLTw" id="7LI_gNMXSX6" role="2$L3a6">
-                          <ref role="3cqZAo" node="7LI_gNMXMGm" resolve="i" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3NuqgR" id="7LI_gNMXUF9" role="0Rg$4">
-              <node concept="aZer4" id="7LI_gNMXUFa" role="3XD1gS">
-                <property role="TrG5h" value="Type" />
-                <node concept="2OqwBi" id="7LI_gNMXUFL" role="3gj$pD">
-                  <node concept="2OqwBi" id="7LI_gNMXUFM" role="2Oq$k0">
-                    <node concept="3A2sRY" id="7LI_gNMXUFN" role="2Oq$k0">
-                      <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
-                    </node>
-                    <node concept="3Tsc0h" id="7LI_gNMXUFO" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:6p0DfM0et2r" resolve="argument" />
-                    </node>
-                  </node>
-                  <node concept="34oBXx" id="7LI_gNMXUFP" role="2OqNvi" />
-                </node>
-              </node>
-              <node concept="aZer4" id="7LI_gNMXV3g" role="3XD1gS">
-                <property role="TrG5h" value="DataType" />
-                <node concept="2OqwBi" id="7LI_gNMXV3h" role="3gj$pD">
-                  <node concept="2OqwBi" id="7LI_gNMXV3i" role="2Oq$k0">
-                    <node concept="3A2sRY" id="7LI_gNMXV3j" role="2Oq$k0">
-                      <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
-                    </node>
-                    <node concept="3Tsc0h" id="7LI_gNMXV3k" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:6p0DfM0et2r" resolve="argument" />
-                    </node>
-                  </node>
-                  <node concept="34oBXx" id="7LI_gNMXV3l" role="2OqNvi" />
-                </node>
-              </node>
-              <node concept="32pEOW" id="7LI_gNMXUFm" role="3vLBG7" />
-            </node>
-            <node concept="3xSepi" id="7LI_gNMXURe" role="3xSepv">
-              <node concept="3Aq9E8" id="7LI_gNMXURf" role="3xSepj">
-                <node concept="3I6sU6" id="7LI_gNMXURg" role="3Ip0Jz">
-                  <node concept="3IrJb3" id="7LI_gNMXURk" role="3I6sU7">
-                    <node concept="3clFbS" id="7LI_gNMXURl" role="3IrJb0">
-                      <node concept="1Dw8fO" id="7LI_gNMXURo" role="3cqZAp">
-                        <node concept="3cpWsn" id="7LI_gNMXURp" role="1Duv9x">
-                          <property role="TrG5h" value="i" />
-                          <node concept="10Oyi0" id="7LI_gNMXURq" role="1tU5fm" />
-                          <node concept="3cmrfG" id="7LI_gNMXURr" role="33vP2m">
-                            <property role="3cmrfH" value="0" />
+                          <node concept="3Tsc0h" id="7LI_gNMXUFO" role="2OqNvi">
+                            <ref role="3TtcxE" to="wq2x:6p0DfM0et2r" resolve="argument" />
                           </node>
                         </node>
-                        <node concept="3clFbS" id="7LI_gNMXURs" role="2LFqv$">
-                          <node concept="3Aqczg" id="7LI_gNMXV79" role="3cqZAp">
-                            <node concept="3jbYBd" id="7LI_gNMXV76" role="3Aqpz8">
-                              <ref role="3jbY9l" to="kqnc:5itBwMau8m1" resolve="lift" />
-                              <node concept="a7P8L" id="7LI_gNMXV7p" role="3jbY8V">
-                                <ref role="a7OzE" node="7LI_gNMXV3g" resolve="DataType" />
-                                <node concept="37vLTw" id="7LI_gNMXV7N" role="3gCZO6">
-                                  <ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
+                        <node concept="34oBXx" id="7LI_gNMXUFP" role="2OqNvi" />
+                      </node>
+                    </node>
+                    <node concept="aZer4" id="7LI_gNMXV3g" role="3XD1gS">
+                      <property role="TrG5h" value="DataType" />
+                      <node concept="2OqwBi" id="7LI_gNMXV3h" role="3gj$pD">
+                        <node concept="2OqwBi" id="7LI_gNMXV3i" role="2Oq$k0">
+                          <node concept="3A2sRY" id="7LI_gNMXV3j" role="2Oq$k0">
+                            <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
+                          </node>
+                          <node concept="3Tsc0h" id="7LI_gNMXV3k" role="2OqNvi">
+                            <ref role="3TtcxE" to="wq2x:6p0DfM0et2r" resolve="argument" />
+                          </node>
+                        </node>
+                        <node concept="34oBXx" id="7LI_gNMXV3l" role="2OqNvi" />
+                      </node>
+                    </node>
+                    <node concept="32pEOW" id="7LI_gNMXUFm" role="3vLBG7" />
+                  </node>
+                  <node concept="3xSepi" id="7LI_gNMXURe" role="3xSepv">
+                    <node concept="3Aq9E8" id="7LI_gNMXURf" role="3xSepj">
+                      <node concept="3I6sU6" id="7LI_gNMXURg" role="3Ip0Jz">
+                        <node concept="3IrJb3" id="7LI_gNMXURk" role="3I6sU7">
+                          <node concept="3clFbS" id="7LI_gNMXURl" role="3IrJb0">
+                            <node concept="1Dw8fO" id="7LI_gNMXURo" role="3cqZAp">
+                              <node concept="3cpWsn" id="7LI_gNMXURp" role="1Duv9x">
+                                <property role="TrG5h" value="i" />
+                                <node concept="10Oyi0" id="7LI_gNMXURq" role="1tU5fm" />
+                                <node concept="3cmrfG" id="7LI_gNMXURr" role="33vP2m">
+                                  <property role="3cmrfH" value="0" />
                                 </node>
                               </node>
-                              <node concept="2OqwBi" id="3Xe1abZYB0Z" role="3jbY8P">
-                                <node concept="1y4W85" id="7LI_gNMXXLN" role="2Oq$k0">
-                                  <node concept="37vLTw" id="7LI_gNMXXSH" role="1y58nS">
-                                    <ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
-                                  </node>
-                                  <node concept="2OqwBi" id="7LI_gNMXVET" role="1y566C">
-                                    <node concept="2OqwBi" id="7LI_gNMXVhK" role="2Oq$k0">
-                                      <node concept="3A2sRY" id="7LI_gNMXV88" role="2Oq$k0">
-                                        <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
-                                      </node>
-                                      <node concept="3TrEf2" id="7LI_gNMXVxZ" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="wq2x:6p0DfM0aywA" resolve="template" />
+                              <node concept="3clFbS" id="7LI_gNMXURs" role="2LFqv$">
+                                <node concept="3Aqczg" id="7LI_gNMXV79" role="3cqZAp">
+                                  <node concept="3jbYBd" id="7LI_gNMXV76" role="3Aqpz8">
+                                    <ref role="3jbY9l" to="kqnc:5itBwMau8m1" resolve="lift" />
+                                    <node concept="a7P8L" id="7LI_gNMXV7p" role="3jbY8V">
+                                      <ref role="a7OzE" node="7LI_gNMXV3g" resolve="DataType" />
+                                      <node concept="37vLTw" id="7LI_gNMXV7N" role="3gCZO6">
+                                        <ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
                                       </node>
                                     </node>
-                                    <node concept="3Tsc0h" id="7LI_gNMXVWv" role="2OqNvi">
-                                      <ref role="3TtcxE" to="wq2x:1CgWc1TyPxy" resolve="parameters" />
+                                    <node concept="2OqwBi" id="3Xe1abZYB0Z" role="3jbY8P">
+                                      <node concept="1y4W85" id="7LI_gNMXXLN" role="2Oq$k0">
+                                        <node concept="37vLTw" id="7LI_gNMXXSH" role="1y58nS">
+                                          <ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
+                                        </node>
+                                        <node concept="2OqwBi" id="7LI_gNMXVET" role="1y566C">
+                                          <node concept="2OqwBi" id="7LI_gNMXVhK" role="2Oq$k0">
+                                            <node concept="3A2sRY" id="7LI_gNMXV88" role="2Oq$k0">
+                                              <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
+                                            </node>
+                                            <node concept="3TrEf2" id="7LI_gNMXVxZ" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="wq2x:6p0DfM0aywA" resolve="template" />
+                                            </node>
+                                          </node>
+                                          <node concept="3Tsc0h" id="7LI_gNMXVWv" role="2OqNvi">
+                                            <ref role="3TtcxE" to="wq2x:1CgWc1TyPxy" resolve="parameters" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="3TrEf2" id="3Xe1abZYBqD" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:5f6wxQ38Bap" resolve="dataType" />
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="3TrEf2" id="3Xe1abZYBqD" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:5f6wxQ38Bap" resolve="dataType" />
+                                <node concept="3Aqczg" id="7LI_gNMXXZg" role="3cqZAp">
+                                  <node concept="3Aqt3T" id="7LI_gNMXXZe" role="3Aqpz8">
+                                    <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="defaultConvertsTo" />
+                                    <node concept="a7P8L" id="7LI_gNMXXZw" role="3AunhB">
+                                      <ref role="a7OzE" node="7LI_gNMXUFa" resolve="Type" />
+                                      <node concept="37vLTw" id="7LI_gNMXXZJ" role="3gCZO6">
+                                        <ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
+                                      </node>
+                                    </node>
+                                    <node concept="a7P8L" id="7LI_gNMXY0n" role="3AunhB">
+                                      <ref role="a7OzE" node="7LI_gNMXV3g" resolve="DataType" />
+                                      <node concept="37vLTw" id="7LI_gNMXY0W" role="3gCZO6">
+                                        <ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
+                                      </node>
+                                    </node>
+                                  </node>
                                 </node>
                               </node>
-                            </node>
-                          </node>
-                          <node concept="3Aqczg" id="7LI_gNMXXZg" role="3cqZAp">
-                            <node concept="3Aqt3T" id="7LI_gNMXXZe" role="3Aqpz8">
-                              <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="convertsTo" />
-                              <node concept="a7P8L" id="7LI_gNMXXZw" role="3AunhB">
-                                <ref role="a7OzE" node="7LI_gNMXUFa" resolve="Type" />
-                                <node concept="37vLTw" id="7LI_gNMXXZJ" role="3gCZO6">
+                              <node concept="3eOVzh" id="7LI_gNMXURB" role="1Dwp0S">
+                                <node concept="2OqwBi" id="7LI_gNMXURC" role="3uHU7w">
+                                  <node concept="2OqwBi" id="7LI_gNMXURD" role="2Oq$k0">
+                                    <node concept="3A2sRY" id="7LI_gNMXURE" role="2Oq$k0">
+                                      <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
+                                    </node>
+                                    <node concept="3Tsc0h" id="7LI_gNMXURF" role="2OqNvi">
+                                      <ref role="3TtcxE" to="wq2x:6p0DfM0et2r" resolve="argument" />
+                                    </node>
+                                  </node>
+                                  <node concept="34oBXx" id="7LI_gNMXURG" role="2OqNvi" />
+                                </node>
+                                <node concept="37vLTw" id="7LI_gNMXURH" role="3uHU7B">
                                   <ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
                                 </node>
                               </node>
-                              <node concept="a7P8L" id="7LI_gNMXY0n" role="3AunhB">
-                                <ref role="a7OzE" node="7LI_gNMXV3g" resolve="DataType" />
-                                <node concept="37vLTw" id="7LI_gNMXY0W" role="3gCZO6">
+                              <node concept="3uNrnE" id="7LI_gNMXURI" role="1Dwrff">
+                                <node concept="37vLTw" id="7LI_gNMXURJ" role="2$L3a6">
                                   <ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="3eOVzh" id="7LI_gNMXURB" role="1Dwp0S">
-                          <node concept="2OqwBi" id="7LI_gNMXURC" role="3uHU7w">
-                            <node concept="2OqwBi" id="7LI_gNMXURD" role="2Oq$k0">
-                              <node concept="3A2sRY" id="7LI_gNMXURE" role="2Oq$k0">
-                                <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
-                              </node>
-                              <node concept="3Tsc0h" id="7LI_gNMXURF" role="2OqNvi">
-                                <ref role="3TtcxE" to="wq2x:6p0DfM0et2r" resolve="argument" />
-                              </node>
-                            </node>
-                            <node concept="34oBXx" id="7LI_gNMXURG" role="2OqNvi" />
-                          </node>
-                          <node concept="37vLTw" id="7LI_gNMXURH" role="3uHU7B">
-                            <ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
-                          </node>
-                        </node>
-                        <node concept="3uNrnE" id="7LI_gNMXURI" role="1Dwrff">
-                          <node concept="37vLTw" id="7LI_gNMXURJ" role="2$L3a6">
-                            <ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
-                          </node>
-                        </node>
                       </node>
                     </node>
                   </node>
@@ -1337,16 +2079,129 @@
         </node>
       </node>
     </node>
-  </node>
-  <node concept="ns1xd" id="7LI_gNMXjAr">
-    <property role="TrG5h" value="CollectionsTerms" />
-    <ref role="2efqH6" to="kqnc:JOGAOsVt29" resolve="Terms" />
-    <node concept="ns1x$" id="7LI_gNMXjAs" role="ns1xc">
-      <property role="TrG5h" value="sequence" />
-      <ref role="ns1xW" to="kqnc:4lCLOtwq2MF" resolve="type" />
-      <node concept="nspSf" id="7LI_gNMXjAt" role="ns1xx">
-        <node concept="nstbe" id="7LI_gNMXjAH" role="nspSe">
-          <property role="TrG5h" value="parameter" />
+    <node concept="1nLNMY" id="51ek2rScf4w" role="1nK1Vg">
+      <property role="TrG5h" value="termConstructor" />
+      <node concept="3clFbS" id="51ek2rScf4x" role="1nLNMH">
+        <node concept="1nLNNL" id="51ek2rScfeI" role="3cqZAp">
+          <node concept="1nLNMm" id="51ek2rScfeJ" role="1nLNNK">
+            <node concept="3Aq93q" id="51ek2rScfeM" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="51ek2rScfeN" role="3Ip0Jz">
+                <node concept="3I6s7M" id="51ek2rScfeR" role="3I6sU7">
+                  <node concept="3Aqt3T" id="51ek2rScfeQ" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:34$A1MfabR$" resolve="checkAll" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3xSepi" id="51ek2rScfeU" role="3xSepv">
+              <node concept="3Aq9E8" id="51ek2rScfeV" role="3xSepj">
+                <node concept="3I6sU6" id="51ek2rScfeW" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="51ek2rScff1" role="3I6sU7">
+                    <node concept="3Aqt3T" id="51ek2rScff0" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                      <node concept="37jhX" id="51ek2rScff8" role="3AunhB">
+                        <node concept="3A2sRY" id="51ek2rScff6" role="37jj2">
+                          <ref role="3A2yKK" node="51ek2rScf4z" resolve="tc" />
+                        </node>
+                      </node>
+                      <node concept="ns1u0" id="51ek2rScffo" role="3AunhB">
+                        <ref role="ns1xF" node="7LI_gNNfeK7" resolve="term" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="51ek2rScf4y" role="1nLNMg">
+        <ref role="2t_S0q" to="wq2x:JOGAOsxanH" resolve="TermConstructor" />
+        <node concept="3A20r5" id="51ek2rScf4z" role="2t_VXX">
+          <property role="TrG5h" value="tc" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="51ek2rScyRK" role="1nK1Vg">
+      <property role="TrG5h" value="unifiesConstraint" />
+      <node concept="3clFbS" id="51ek2rScyRL" role="1nLNMH">
+        <node concept="1nLNNL" id="51ek2rScA2g" role="3cqZAp">
+          <node concept="1nLNMm" id="51ek2rScA2h" role="1nLNNK">
+            <node concept="3Aq93q" id="51ek2rScA3w" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="51ek2rScA3x" role="3Ip0Jz">
+                <node concept="3I6s7M" id="51ek2rScA3_" role="3I6sU7">
+                  <node concept="3Aqt3T" id="51ek2rScA3$" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                    <node concept="37jhX" id="51ek2rScA3G" role="3AunhB">
+                      <node concept="2OqwBi" id="51ek2rScAdr" role="37jj2">
+                        <node concept="3A2sRY" id="51ek2rScA3E" role="2Oq$k0">
+                          <ref role="3A2yKK" node="51ek2rScyRN" resolve="uc" />
+                        </node>
+                        <node concept="3TrEf2" id="51ek2rScAlC" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:6p0DfM0oEeG" resolve="assignee" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="51ek2rScAnU" role="3AunhB">
+                      <ref role="a7OzE" node="51ek2rScA2m" resolve="LType" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="51ek2rScAoM" role="3I6sU7">
+                  <node concept="3Aqt3T" id="51ek2rScAoK" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                    <node concept="37jhX" id="51ek2rScAp0" role="3AunhB">
+                      <node concept="2OqwBi" id="51ek2rScApj" role="37jj2">
+                        <node concept="3A2sRY" id="51ek2rScAoY" role="2Oq$k0">
+                          <ref role="3A2yKK" node="51ek2rScyRN" resolve="uc" />
+                        </node>
+                        <node concept="3TrEf2" id="51ek2rScAqa" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:6p0DfM0oEna" resolve="value" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="51ek2rScAqx" role="3AunhB">
+                      <ref role="a7OzE" node="51ek2rScA2N" resolve="RType" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="51ek2rScA2l" role="0Rg$4">
+              <node concept="aZer4" id="51ek2rScA2m" role="3XD1gS">
+                <property role="TrG5h" value="LType" />
+              </node>
+              <node concept="aZer4" id="51ek2rScA2N" role="3XD1gS">
+                <property role="TrG5h" value="RType" />
+              </node>
+              <node concept="32pEOW" id="51ek2rScA2y" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="51ek2rScAqG" role="3xSepv">
+              <node concept="3Aq9E8" id="51ek2rScAqH" role="3xSepj">
+                <node concept="3I6sU6" id="51ek2rScAqI" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="51ek2rScVED" role="3I6sU7">
+                    <node concept="3Aqt3T" id="51ek2rScVEC" role="3I6s78">
+                      <ref role="3AqCNq" node="51ek2rScAY6" resolve="unifiable" />
+                      <node concept="a7P8L" id="51ek2rScVEK" role="3AunhB">
+                        <ref role="a7OzE" node="51ek2rScA2m" resolve="LType" />
+                      </node>
+                      <node concept="a7P8L" id="51ek2rScVGO" role="3AunhB">
+                        <ref role="a7OzE" node="51ek2rScA2N" resolve="RType" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="51ek2rScyRM" role="1nLNMg">
+        <ref role="2t_S0q" to="wq2x:6p0DfM0oBcI" resolve="UnifiesConstraint" />
+        <node concept="3A20r5" id="51ek2rScyRN" role="2t_VXX">
+          <property role="TrG5h" value="uc" />
         </node>
       </node>
     </node>
@@ -1363,7 +2218,7 @@
               <node concept="3I6sU6" id="7LI_gNNfeIL" role="3Ip0Jz">
                 <node concept="3I6s7M" id="7LI_gNNfeIP" role="3I6sU7">
                   <node concept="3Aqt3T" id="7LI_gNNfeIO" role="3I6s78">
-                    <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsToAlt" />
+                    <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
                     <node concept="1HFMs5" id="7LI_gNNfeJD" role="3AunhB">
                       <node concept="a7P8L" id="7LI_gNNfeJx" role="1uarlU">
                         <ref role="a7OzE" node="7LI_gNNfeIX" resolve="TermType" />
@@ -1372,24 +2227,16 @@
                         <ref role="ns1xF" node="7LI_gNNfeK7" resolve="term" />
                       </node>
                     </node>
-                    <node concept="1HFMs5" id="7LI_gNNfeLf" role="3AunhB">
-                      <node concept="a7P8L" id="7LI_gNNfeL2" role="1uarlU">
+                    <node concept="1HFMs5" id="61G6TdCWQS5" role="3AunhB">
+                      <node concept="a7P8L" id="61G6TdCWQRi" role="1uarlU">
                         <ref role="a7OzE" node="7LI_gNNfeKu" resolve="ClsType" />
                       </node>
-                      <node concept="ns1u0" id="7LI_gNNfeLB" role="1uarlW">
+                      <node concept="ns1u0" id="61G6TdCWQSw" role="1uarlW">
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="7LI_gNNfeLL" role="ns1xD">
-                          <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2tJFMh" id="7LI_gNNfeLX" role="nsMwV">
-                            <node concept="ZC_QK" id="7LI_gNNfeN5" role="2tJFKM">
-                              <ref role="2aWVGs" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-                            </node>
-                          </node>
-                        </node>
                       </node>
                     </node>
-                    <node concept="a7P8L" id="4s_lMmH6Cty" role="3AunhB">
-                      <ref role="a7OzE" node="4s_lMmH6Ctw" resolve="Options" />
+                    <node concept="a7P8L" id="3OUB6BCUAvP" role="3AunhB">
+                      <ref role="a7OzE" node="3OUB6BCUAvN" resolve="Options" />
                     </node>
                   </node>
                 </node>
@@ -1404,11 +2251,39 @@
               </node>
               <node concept="32pEOW" id="7LI_gNNfeJ9" role="3vLBG7" />
             </node>
-            <node concept="3NuqgR" id="4s_lMmH6Ctu" role="0Rg$4">
-              <node concept="3uibUv" id="4s_lMmH6Ctv" role="3vLBG7">
+            <node concept="3xSepi" id="61G6TdCWQQ4" role="3xSepv">
+              <node concept="3Aq9E8" id="61G6TdCWQQ5" role="3xSepj">
+                <node concept="3I6sU6" id="61G6TdCWQQ6" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="61G6TdCWQQb" role="3I6sU7">
+                    <node concept="3Aqt3T" id="61G6TdCWQQa" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
+                      <node concept="ns1u0" id="61G6TdCWQQg" role="3AunhB">
+                        <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
+                        <node concept="nsMwS" id="61G6TdCWQQm" role="ns1xD">
+                          <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
+                          <node concept="2tJFMh" id="61G6TdCWQQn" role="nsMwV">
+                            <node concept="ZC_QK" id="61G6TdCWQQo" role="2tJFKM">
+                              <ref role="2aWVGs" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="61G6TdCWQQO" role="3AunhB">
+                        <ref role="a7OzE" node="7LI_gNNfeKu" resolve="ClsType" />
+                      </node>
+                      <node concept="a7P8L" id="3OUB6BCUAvQ" role="3AunhB">
+                        <ref role="a7OzE" node="3OUB6BCUAvN" resolve="Options" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="3OUB6BCUAvL" role="0Rg$4">
+              <node concept="3uibUv" id="3OUB6BCUAvM" role="3vLBG7">
                 <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="ConvertsContext.Options" />
               </node>
-              <node concept="aZer4" id="4s_lMmH6Ctw" role="3XD1gS">
+              <node concept="aZer4" id="3OUB6BCUAvN" role="3XD1gS">
                 <property role="TrG5h" value="Options" />
               </node>
             </node>
@@ -1425,7 +2300,7 @@
               <node concept="3I6sU6" id="7LI_gNNfeNg" role="3Ip0Jz">
                 <node concept="3I6s7M" id="7LI_gNNfeNh" role="3I6sU7">
                   <node concept="3Aqt3T" id="7LI_gNNfeNi" role="3I6s78">
-                    <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsToAlt" />
+                    <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
                     <node concept="1HFMs5" id="7LI_gNNfeNj" role="3AunhB">
                       <node concept="a7P8L" id="7LI_gNNfeNk" role="1uarlU">
                         <ref role="a7OzE" node="7LI_gNNfeNx" resolve="TermType" />
@@ -1438,20 +2313,12 @@
                       <node concept="a7P8L" id="7LI_gNNfeNp" role="1uarlU">
                         <ref role="a7OzE" node="7LI_gNNfeNy" resolve="ClsType" />
                       </node>
-                      <node concept="ns1u0" id="7LI_gNNfeNs" role="1uarlW">
+                      <node concept="ns1u0" id="61G6TdCWQS$" role="1uarlW">
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
-                        <node concept="nsMwS" id="7LI_gNNfeNt" role="ns1xD">
-                          <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2tJFMh" id="7LI_gNNfeNu" role="nsMwV">
-                            <node concept="ZC_QK" id="7LI_gNNfeQN" role="2tJFKM">
-                              <ref role="2aWVGs" to="6exd:3OPtF03lco4" resolve="ListNode" />
-                            </node>
-                          </node>
-                        </node>
                       </node>
                     </node>
-                    <node concept="a7P8L" id="4s_lMmH6CtE" role="3AunhB">
-                      <ref role="a7OzE" node="4s_lMmH6CtC" resolve="Options" />
+                    <node concept="a7P8L" id="3OUB6BCUAvY" role="3AunhB">
+                      <ref role="a7OzE" node="3OUB6BCUAvW" resolve="Options" />
                     </node>
                   </node>
                 </node>
@@ -1466,11 +2333,39 @@
               </node>
               <node concept="32pEOW" id="7LI_gNNfeNz" role="3vLBG7" />
             </node>
-            <node concept="3NuqgR" id="4s_lMmH6CtA" role="0Rg$4">
-              <node concept="3uibUv" id="4s_lMmH6CtB" role="3vLBG7">
+            <node concept="3xSepi" id="61G6TdCWQRs" role="3xSepv">
+              <node concept="3Aq9E8" id="61G6TdCWQRt" role="3xSepj">
+                <node concept="3I6sU6" id="61G6TdCWQRu" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="61G6TdCWQRz" role="3I6sU7">
+                    <node concept="3Aqt3T" id="61G6TdCWQRy" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
+                      <node concept="ns1u0" id="61G6TdCWQRC" role="3AunhB">
+                        <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
+                        <node concept="nsMwS" id="61G6TdCWQRD" role="ns1xD">
+                          <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
+                          <node concept="2tJFMh" id="61G6TdCWQRE" role="nsMwV">
+                            <node concept="ZC_QK" id="61G6TdCWQRF" role="2tJFKM">
+                              <ref role="2aWVGs" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="61G6TdCWQRT" role="3AunhB">
+                        <ref role="a7OzE" node="7LI_gNNfeNy" resolve="ClsType" />
+                      </node>
+                      <node concept="a7P8L" id="3OUB6BCUAvZ" role="3AunhB">
+                        <ref role="a7OzE" node="3OUB6BCUAvW" resolve="Options" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="3OUB6BCUAvU" role="0Rg$4">
+              <node concept="3uibUv" id="3OUB6BCUAvV" role="3vLBG7">
                 <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="ConvertsContext.Options" />
               </node>
-              <node concept="aZer4" id="4s_lMmH6CtC" role="3XD1gS">
+              <node concept="aZer4" id="3OUB6BCUAvW" role="3XD1gS">
                 <property role="TrG5h" value="Options" />
               </node>
             </node>
@@ -1493,17 +2388,838 @@
       <node concept="nspSf" id="7LI_gNNfeOU" role="ns1xx" />
     </node>
   </node>
-  <node concept="ns1xd" id="7LI_gNMWw2z">
-    <property role="TrG5h" value="SmodelTerms" />
-    <ref role="2efqH6" to="kqnc:JOGAOsVt29" resolve="Terms" />
-    <node concept="ns1x$" id="7LI_gNMWw2A" role="ns1xc">
-      <property role="TrG5h" value="node" />
-      <ref role="ns1xW" to="kqnc:4lCLOtwq2MF" resolve="type" />
-      <node concept="nspSf" id="7LI_gNMWw2B" role="ns1xx">
-        <node concept="nssqF" id="7LI_gNMWxb4" role="nspSe">
-          <property role="TrG5h" value="concept" />
+  <node concept="0oKg$" id="2Qsys8b1DLQ">
+    <property role="TrG5h" value="Types" />
+    <ref role="3tg4Y$" to="kqnc:E1U1n2RerB" resolve="Types" />
+    <node concept="3iyZe8" id="2Qsys8b1E5P" role="0oKgB">
+      <ref role="3iRiWT" to="kqnc:5itBwMau8m1" resolve="lift" />
+      <node concept="3clFbS" id="2Qsys8b1E5Q" role="3iwQuN">
+        <node concept="3Aqczg" id="2Qsys8b1Erv" role="3cqZAp">
+          <node concept="3A8Hvi" id="2Qsys8b1Erp" role="3Aqpz8">
+            <node concept="a7P8L" id="2Qsys8b1ErE" role="3A8wtg">
+              <ref role="a7OzE" node="2Qsys8b1E5T" resolve="Type" />
+            </node>
+            <node concept="ns1u0" id="2Qsys8b1ErL" role="3A8w4Q">
+              <ref role="ns1xF" node="7LI_gNNfeK7" resolve="term" />
+            </node>
+          </node>
         </node>
       </node>
+      <node concept="3uniRu" id="2Qsys8b1E5R" role="3tb1AD">
+        <node concept="32pEOW" id="2Qsys8b1E5S" role="3vLBG7" />
+        <node concept="aZer4" id="2Qsys8b1E5T" role="3XD1gS">
+          <property role="TrG5h" value="Type" />
+        </node>
+      </node>
+      <node concept="3ixlbQ" id="2Qsys8b1E5U" role="3iweTQ">
+        <ref role="3ixz9q" to="wq2x:24ciDNzqIuw" resolve="TermType" />
+        <node concept="3ixQyH" id="2Qsys8b1E5V" role="3ix8rx">
+          <property role="TrG5h" value="tt" />
+        </node>
+      </node>
+      <node concept="3uniRu" id="2Qsys8b1E6k" role="3iJhzY">
+        <node concept="aZer4" id="2Qsys8b1E6l" role="3XD1gS">
+          <property role="TrG5h" value="DType" />
+        </node>
+        <node concept="32pEOW" id="2Qsys8b1E6x" role="3vLBG7" />
+      </node>
+    </node>
+    <node concept="3iyZe8" id="51ek2rSc603" role="0oKgB">
+      <ref role="3iRiWT" to="kqnc:5itBwMau8m1" resolve="lift" />
+      <node concept="3clFbS" id="51ek2rSc604" role="3iwQuN">
+        <node concept="3Aqczg" id="51ek2rSc605" role="3cqZAp">
+          <node concept="3A8Hvi" id="51ek2rSc606" role="3Aqpz8">
+            <node concept="a7P8L" id="51ek2rSc607" role="3A8wtg">
+              <ref role="a7OzE" node="51ek2rSc60b" resolve="Type" />
+            </node>
+            <node concept="ns1u0" id="51ek2rSc610" role="3A8w4Q">
+              <ref role="ns1xF" node="7LI_gNNfeOT" resolve="termList" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uniRu" id="51ek2rSc609" role="3tb1AD">
+        <node concept="32pEOW" id="51ek2rSc60a" role="3vLBG7" />
+        <node concept="aZer4" id="51ek2rSc60b" role="3XD1gS">
+          <property role="TrG5h" value="Type" />
+        </node>
+      </node>
+      <node concept="3ixlbQ" id="51ek2rSc60c" role="3iweTQ">
+        <ref role="3ixz9q" to="wq2x:4nUKN9YPlxw" resolve="TermListType" />
+        <node concept="3ixQyH" id="51ek2rSc60d" role="3ix8rx">
+          <property role="TrG5h" value="tt" />
+        </node>
+      </node>
+      <node concept="3uniRu" id="51ek2rSc60e" role="3iJhzY">
+        <node concept="aZer4" id="51ek2rSc60f" role="3XD1gS">
+          <property role="TrG5h" value="DType" />
+        </node>
+        <node concept="32pEOW" id="51ek2rSc60g" role="3vLBG7" />
+      </node>
+    </node>
+  </node>
+  <node concept="AVZre" id="2Qsys8b1S90">
+    <property role="TrG5h" value="Recover" />
+    <ref role="2YbDB9" to="kqnc:6Qzc0KyJGzD" resolve="Recover" />
+    <node concept="1nLNMY" id="2Qsys8b1XuT" role="1nK1Vg">
+      <property role="TrG5h" value="recover_TermType" />
+      <node concept="3clFbS" id="2Qsys8b1XuU" role="1nLNMH">
+        <node concept="1nLNNL" id="2Qsys8b1XA5" role="3cqZAp">
+          <node concept="1nLNMm" id="2Qsys8b1XA7" role="1nLNNK">
+            <node concept="3Aq93q" id="2Qsys8b1XAw" role="1nLNMb">
+              <node concept="3I6sU6" id="2Qsys8b1XAx" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Qsys8b1XA_" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2Qsys8b1XA$" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:6Qzc0KyJGJT" resolve="recover" />
+                    <node concept="a7P8L" id="2Qsys8b1XIF" role="3AunhB">
+                      <ref role="a7OzE" node="2Qsys8b1XAd" resolve="Node" />
+                    </node>
+                    <node concept="1HFMs5" id="2Qsys8b1XKJ" role="3AunhB">
+                      <node concept="a7P8L" id="2Qsys8b1XKH" role="1uarlU">
+                        <ref role="a7OzE" node="2Qsys8b1XI7" resolve="Type" />
+                      </node>
+                      <node concept="ns1u0" id="2Qsys8b1XLd" role="1uarlW">
+                        <ref role="ns1xF" node="7LI_gNNfeK7" resolve="term" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="2Qsys8b1XI6" role="0Rg$4">
+              <node concept="aZer4" id="2Qsys8b1XI7" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="32pEOW" id="2Qsys8b1XIm" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="2Qsys8b1XAc" role="0Rg$4">
+              <node concept="aZer4" id="2Qsys8b1XAd" role="3XD1gS">
+                <property role="TrG5h" value="Node" />
+              </node>
+              <node concept="3Tqbb2" id="2Qsys8b1XHz" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="2Qsys8b1XOa" role="3xSepv">
+              <node concept="3Aq9E8" id="2Qsys8b1XOb" role="3xSepj">
+                <node concept="3I6sU6" id="2Qsys8b1XOc" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="2Qsys8b1XPf" role="3I6sU7">
+                    <node concept="3A8Hvi" id="2Qsys8b1XPl" role="3I6s78">
+                      <node concept="HKQnh" id="2Qsys8b1XPT" role="3A8w4Q">
+                        <node concept="2c44tf" id="2Qsys8b1XPY" role="HKQng">
+                          <node concept="32pEOW" id="2Qsys8b1XRe" role="2c44tc" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="2Qsys8b1XP4" role="3A8wtg">
+                        <ref role="a7OzE" node="2Qsys8b1XAd" resolve="Node" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="51ek2rScnLM" role="1nK1Vg">
+      <property role="TrG5h" value="recover_TermListType" />
+      <node concept="3clFbS" id="51ek2rScnLN" role="1nLNMH">
+        <node concept="1nLNNL" id="51ek2rScnLO" role="3cqZAp">
+          <node concept="1nLNMm" id="51ek2rScnLP" role="1nLNNK">
+            <node concept="3Aq93q" id="51ek2rScnLQ" role="1nLNMb">
+              <node concept="3I6sU6" id="51ek2rScnLR" role="3Ip0Jz">
+                <node concept="3I6s7M" id="51ek2rScnLS" role="3I6sU7">
+                  <node concept="3Aqt3T" id="51ek2rScnLT" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:6Qzc0KyJGJT" resolve="recover" />
+                    <node concept="a7P8L" id="51ek2rScnLU" role="3AunhB">
+                      <ref role="a7OzE" node="51ek2rScnM2" resolve="Node" />
+                    </node>
+                    <node concept="1HFMs5" id="51ek2rScnLV" role="3AunhB">
+                      <node concept="a7P8L" id="51ek2rScnLW" role="1uarlU">
+                        <ref role="a7OzE" node="51ek2rScnLZ" resolve="Type" />
+                      </node>
+                      <node concept="ns1u0" id="51ek2rScnNN" role="1uarlW">
+                        <ref role="ns1xF" node="7LI_gNNfeOT" resolve="termList" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="51ek2rScnLY" role="0Rg$4">
+              <node concept="aZer4" id="51ek2rScnLZ" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="32pEOW" id="51ek2rScnM0" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="51ek2rScnM1" role="0Rg$4">
+              <node concept="aZer4" id="51ek2rScnM2" role="3XD1gS">
+                <property role="TrG5h" value="Node" />
+              </node>
+              <node concept="3Tqbb2" id="51ek2rScnM3" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="51ek2rScnM4" role="3xSepv">
+              <node concept="3Aq9E8" id="51ek2rScnM5" role="3xSepj">
+                <node concept="3I6sU6" id="51ek2rScnM6" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="51ek2rScnM7" role="3I6sU7">
+                    <node concept="3A8Hvi" id="51ek2rScnM8" role="3I6s78">
+                      <node concept="HKQnh" id="51ek2rScnM9" role="3A8w4Q">
+                        <node concept="2c44tf" id="51ek2rScnMa" role="HKQng">
+                          <node concept="VbTHi" id="51ek2rScnPG" role="2c44tc" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="51ek2rScnMc" role="3A8wtg">
+                        <ref role="a7OzE" node="51ek2rScnM2" resolve="Node" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="AVZre" id="2Qsys8b6lU3">
+    <property role="TrG5h" value="ExpectType" />
+    <ref role="2YbDB9" to="kqnc:2J$kxDHIJYU" resolve="ExpectType" />
+    <node concept="1nLNMY" id="51ek2rSbOY0" role="1nK1Vg">
+      <property role="TrG5h" value="expect_typeOf_CallMacroParameterDeclaration" />
+      <node concept="3clFbS" id="51ek2rSbOY1" role="1nLNMH">
+        <node concept="1nLNNL" id="12QmIo_7sf0" role="3cqZAp">
+          <node concept="1nLNMm" id="12QmIo_7sf1" role="1nLNNK">
+            <node concept="3Aq93q" id="20Zoq4kTODB" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="4nIWweBEY4u" role="3Ip0Jz">
+                <node concept="3I6s7M" id="4nIWweBEY4v" role="3I6sU7">
+                  <node concept="3Aqt3T" id="20Zoq4kTOWU" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:20Zoq4kTOFb" resolve="recoverAll" />
+                    <node concept="a7P8L" id="5fMWD6H$68P" role="3AunhB">
+                      <ref role="a7OzE" node="5fMWD6H$66C" resolve="TypesUpdate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="5fMWD6H$66B" role="0Rg$4">
+              <node concept="aZer4" id="5fMWD6H$66C" role="3XD1gS">
+                <property role="TrG5h" value="TypesUpdate" />
+              </node>
+              <node concept="3uibUv" id="5fMWD6HQXZl" role="3vLBG7">
+                <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                <node concept="2sp9CU" id="5fMWD6HQXZm" role="11_B2D" />
+                <node concept="3Tqbb2" id="5fMWD6HQXZn" role="11_B2D" />
+              </node>
+            </node>
+            <node concept="3NuqgR" id="20Zoq4kTODF" role="0Rg$4">
+              <node concept="aZer4" id="20Zoq4kTODG" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="32pEOW" id="24ciDNzxNHm" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="6E2cNicdilW" role="3xSepv">
+              <node concept="3Aq9E8" id="20Zoq4kTOEi" role="3xSepj">
+                <node concept="3I6sU6" id="4nIWweBEY51" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="4nIWweBEY52" role="3I6sU7">
+                    <node concept="3Aqt3T" id="20Zoq4kTOEw" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:35YJGAJTRng" resolve="expectType" />
+                      <node concept="37jhX" id="1TH_SRmhruv" role="3AunhB">
+                        <node concept="3A2sRY" id="51ek2rSbP6Y" role="37jj2">
+                          <ref role="3A2yKK" node="51ek2rSbOY3" resolve="cmpd" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="6QbNnfq3aV8" role="3AunhB">
+                        <ref role="a7OzE" node="5fMWD6H$66C" resolve="TypesUpdate" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="51ek2rSbOY2" role="1nLNMg">
+        <ref role="2t_S0q" to="wq2x:5itBwM5i6X6" resolve="CallMacroParameterDeclaration" />
+        <node concept="3A20r5" id="51ek2rSbOY3" role="2t_VXX">
+          <property role="TrG5h" value="cmpd" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="51ek2rSbOTG" role="1nK1Vg">
+      <property role="TrG5h" value="expect_typeOf_ExpandMacroInputDeclaration" />
+      <node concept="3clFbS" id="51ek2rSbOTH" role="1nLNMH">
+        <node concept="1nLNNL" id="51ek2rSbOTI" role="3cqZAp">
+          <node concept="1nLNMm" id="51ek2rSbOTJ" role="1nLNNK">
+            <node concept="3Aq93q" id="51ek2rSbOTK" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="51ek2rSbOTL" role="3Ip0Jz">
+                <node concept="3I6s7M" id="51ek2rSbOTM" role="3I6sU7">
+                  <node concept="3Aqt3T" id="51ek2rSbOTN" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:20Zoq4kTOFb" resolve="recoverAll" />
+                    <node concept="a7P8L" id="51ek2rSbOTO" role="3AunhB">
+                      <ref role="a7OzE" node="51ek2rSbOTQ" resolve="TypesUpdate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="51ek2rSbOTP" role="0Rg$4">
+              <node concept="aZer4" id="51ek2rSbOTQ" role="3XD1gS">
+                <property role="TrG5h" value="TypesUpdate" />
+              </node>
+              <node concept="3uibUv" id="51ek2rSbOTR" role="3vLBG7">
+                <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                <node concept="2sp9CU" id="51ek2rSbOTS" role="11_B2D" />
+                <node concept="3Tqbb2" id="51ek2rSbOTT" role="11_B2D" />
+              </node>
+            </node>
+            <node concept="3NuqgR" id="51ek2rSbOTU" role="0Rg$4">
+              <node concept="aZer4" id="51ek2rSbOTV" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="32pEOW" id="51ek2rSbOTW" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="51ek2rSbOTX" role="3xSepv">
+              <node concept="3Aq9E8" id="51ek2rSbOTY" role="3xSepj">
+                <node concept="3I6sU6" id="51ek2rSbOTZ" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="51ek2rSbOU0" role="3I6sU7">
+                    <node concept="3Aqt3T" id="51ek2rSbOU1" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:35YJGAJTRng" resolve="expectType" />
+                      <node concept="37jhX" id="51ek2rSbOU2" role="3AunhB">
+                        <node concept="3A2sRY" id="51ek2rSbOU3" role="37jj2">
+                          <ref role="3A2yKK" node="51ek2rSbOU6" resolve="emid" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="51ek2rSbOU4" role="3AunhB">
+                        <ref role="a7OzE" node="51ek2rSbOTQ" resolve="TypesUpdate" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="51ek2rSbOU5" role="1nLNMg">
+        <ref role="2t_S0q" to="wq2x:5itBwM66Jqx" resolve="ExpandMacroInputDeclaration" />
+        <node concept="3A20r5" id="51ek2rSbOU6" role="2t_VXX">
+          <property role="TrG5h" value="emid" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="51ek2rSbWAp" role="1nK1Vg">
+      <property role="TrG5h" value="typeOf_CallMacroParameterDeclaration" />
+      <node concept="3clFbS" id="51ek2rSbWAq" role="1nLNMH">
+        <node concept="1nLNNL" id="14oWJ2Nxubl" role="3cqZAp">
+          <node concept="1nLNMm" id="14oWJ2Nxubm" role="1nLNNK">
+            <node concept="3Aq93q" id="14oWJ2Nxubn" role="1nLNMb">
+              <property role="3ArMco" value="false" />
+              <node concept="3I6sU6" id="14oWJ2Nxubo" role="3Ip0Jz">
+                <node concept="3I6s7M" id="14oWJ2Nxubp" role="3I6sU7">
+                  <node concept="3Aqt3T" id="14oWJ2Nxubq" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:35YJGAJTRng" resolve="expectType" />
+                    <node concept="37jhX" id="14oWJ2Nxubr" role="3AunhB">
+                      <node concept="3A2sRY" id="51ek2rSbX0Q" role="37jj2">
+                        <ref role="3A2yKK" node="51ek2rSbWAN" resolve="cmpd" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="14oWJ2Nxubt" role="3AunhB">
+                      <ref role="a7OzE" node="14oWJ2NxubA" resolve="TypesUpdate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq93q" id="14oWJ2Nxubu" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="14oWJ2Nxubv" role="3Ip0Jz">
+                <node concept="3I6s7M" id="14oWJ2Nxubw" role="3I6sU7">
+                  <node concept="3Aqt3T" id="14oWJ2Nxubx" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                    <node concept="37jhX" id="14oWJ2Nxuby" role="3AunhB">
+                      <node concept="3A2sRY" id="51ek2rSbX3T" role="37jj2">
+                        <ref role="3A2yKK" node="51ek2rSbWAN" resolve="cmpd" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="14oWJ2Nxub$" role="3AunhB">
+                      <ref role="a7OzE" node="14oWJ2NxubI" resolve="Type" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="14oWJ2Nxub_" role="0Rg$4">
+              <node concept="aZer4" id="14oWJ2NxubA" role="3XD1gS">
+                <property role="TrG5h" value="TypesUpdate" />
+              </node>
+              <node concept="3uibUv" id="14oWJ2NxubB" role="3vLBG7">
+                <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                <node concept="2sp9CU" id="14oWJ2NxubC" role="11_B2D" />
+                <node concept="3Tqbb2" id="Q_4x90cBck" role="11_B2D" />
+              </node>
+            </node>
+            <node concept="3NuqgR" id="14oWJ2NxubE" role="0Rg$4">
+              <node concept="aZer4" id="14oWJ2NxubF" role="3XD1gS">
+                <property role="TrG5h" value="Node" />
+              </node>
+              <node concept="3Tqbb2" id="14oWJ2NxubG" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="14oWJ2NxubH" role="0Rg$4">
+              <node concept="aZer4" id="14oWJ2NxubI" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="32pEOW" id="14oWJ2NxubJ" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="14oWJ2NxubK" role="3xSepv">
+              <node concept="3Aq9E8" id="14oWJ2NxubL" role="3xSepj">
+                <node concept="3I6sU6" id="14oWJ2NxubM" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="14oWJ2NxubN" role="3I6sU7">
+                    <node concept="3Aqt3T" id="14oWJ2NxubO" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:6Qzc0KyJGJT" resolve="recover" />
+                      <node concept="a7P8L" id="14oWJ2NxubP" role="3AunhB">
+                        <ref role="a7OzE" node="14oWJ2NxubF" resolve="Node" />
+                      </node>
+                      <node concept="a7P8L" id="14oWJ2NxubQ" role="3AunhB">
+                        <ref role="a7OzE" node="14oWJ2NxubI" resolve="Type" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="14oWJ2NxubR" role="3I6sU7">
+                    <node concept="3wWvb2" id="14oWJ2NxubS" role="3I6s78">
+                      <node concept="2OqwBi" id="14oWJ2NxubT" role="3wWo3s">
+                        <node concept="liA8E" id="14oWJ2NxubU" role="2OqNvi">
+                          <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
+                          <node concept="2OqwBi" id="14oWJ2NxubV" role="37wK5m">
+                            <node concept="3A2sRY" id="51ek2rSbX77" role="2Oq$k0">
+                              <ref role="3A2yKK" node="51ek2rSbWAN" resolve="cmpd" />
+                            </node>
+                            <node concept="iZEcu" id="14oWJ2NxubX" role="2OqNvi" />
+                          </node>
+                          <node concept="1Ft4W6" id="14oWJ2NxubY" role="37wK5m">
+                            <node concept="a7P8L" id="14oWJ2NxubZ" role="1FtiSR">
+                              <ref role="a7OzE" node="14oWJ2NxubF" resolve="Node" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="1Ft4W6" id="14oWJ2Nxuc0" role="2Oq$k0">
+                          <node concept="a7P8L" id="14oWJ2Nxuc1" role="1FtiSR">
+                            <ref role="a7OzE" node="14oWJ2NxubA" resolve="TypesUpdate" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="51ek2rSbWAM" role="1nLNMg">
+        <ref role="2t_S0q" to="wq2x:5itBwM5i6X6" resolve="CallMacroParameterDeclaration" />
+        <node concept="3A20r5" id="51ek2rSbWAN" role="2t_VXX">
+          <property role="TrG5h" value="cmpd" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="51ek2rSbW_Y" role="1nK1Vg">
+      <property role="TrG5h" value="typeOf_ExpandMacroInputDeclaration" />
+      <node concept="3clFbS" id="51ek2rSbW_Z" role="1nLNMH">
+        <node concept="1nLNNL" id="51ek2rSbXfc" role="3cqZAp">
+          <node concept="1nLNMm" id="51ek2rSbXfd" role="1nLNNK">
+            <node concept="3Aq93q" id="51ek2rSbXfe" role="1nLNMb">
+              <property role="3ArMco" value="false" />
+              <node concept="3I6sU6" id="51ek2rSbXff" role="3Ip0Jz">
+                <node concept="3I6s7M" id="51ek2rSbXfg" role="3I6sU7">
+                  <node concept="3Aqt3T" id="51ek2rSbXfh" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:35YJGAJTRng" resolve="expectType" />
+                    <node concept="37jhX" id="51ek2rSbXfi" role="3AunhB">
+                      <node concept="3A2sRY" id="51ek2rSbXw6" role="37jj2">
+                        <ref role="3A2yKK" node="51ek2rSbWAo" resolve="emid" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="51ek2rSbXfk" role="3AunhB">
+                      <ref role="a7OzE" node="51ek2rSbXft" resolve="TypesUpdate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq93q" id="51ek2rSbXfl" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="51ek2rSbXfm" role="3Ip0Jz">
+                <node concept="3I6s7M" id="51ek2rSbXfn" role="3I6sU7">
+                  <node concept="3Aqt3T" id="51ek2rSbXfo" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                    <node concept="37jhX" id="51ek2rSbXfp" role="3AunhB">
+                      <node concept="3A2sRY" id="51ek2rSbXF6" role="37jj2">
+                        <ref role="3A2yKK" node="51ek2rSbWAo" resolve="emid" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="51ek2rSbXfr" role="3AunhB">
+                      <ref role="a7OzE" node="51ek2rSbXf_" resolve="Type" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="51ek2rSbXfs" role="0Rg$4">
+              <node concept="aZer4" id="51ek2rSbXft" role="3XD1gS">
+                <property role="TrG5h" value="TypesUpdate" />
+              </node>
+              <node concept="3uibUv" id="51ek2rSbXfu" role="3vLBG7">
+                <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                <node concept="2sp9CU" id="51ek2rSbXfv" role="11_B2D" />
+                <node concept="3Tqbb2" id="51ek2rSbXfw" role="11_B2D" />
+              </node>
+            </node>
+            <node concept="3NuqgR" id="51ek2rSbXfx" role="0Rg$4">
+              <node concept="aZer4" id="51ek2rSbXfy" role="3XD1gS">
+                <property role="TrG5h" value="Node" />
+              </node>
+              <node concept="3Tqbb2" id="51ek2rSbXfz" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="51ek2rSbXf$" role="0Rg$4">
+              <node concept="aZer4" id="51ek2rSbXf_" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="32pEOW" id="51ek2rSbXfA" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="51ek2rSbXfB" role="3xSepv">
+              <node concept="3Aq9E8" id="51ek2rSbXfC" role="3xSepj">
+                <node concept="3I6sU6" id="51ek2rSbXfD" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="51ek2rSbXfE" role="3I6sU7">
+                    <node concept="3Aqt3T" id="51ek2rSbXfF" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:6Qzc0KyJGJT" resolve="recover" />
+                      <node concept="a7P8L" id="51ek2rSbXfG" role="3AunhB">
+                        <ref role="a7OzE" node="51ek2rSbXfy" resolve="Node" />
+                      </node>
+                      <node concept="a7P8L" id="51ek2rSbXfH" role="3AunhB">
+                        <ref role="a7OzE" node="51ek2rSbXf_" resolve="Type" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="51ek2rSbXfI" role="3I6sU7">
+                    <node concept="3wWvb2" id="51ek2rSbXfJ" role="3I6s78">
+                      <node concept="2OqwBi" id="51ek2rSbXfK" role="3wWo3s">
+                        <node concept="liA8E" id="51ek2rSbXfL" role="2OqNvi">
+                          <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
+                          <node concept="2OqwBi" id="51ek2rSbXfM" role="37wK5m">
+                            <node concept="3A2sRY" id="51ek2rSbXIc" role="2Oq$k0">
+                              <ref role="3A2yKK" node="51ek2rSbWAo" resolve="emid" />
+                            </node>
+                            <node concept="iZEcu" id="51ek2rSbXfO" role="2OqNvi" />
+                          </node>
+                          <node concept="1Ft4W6" id="51ek2rSbXfP" role="37wK5m">
+                            <node concept="a7P8L" id="51ek2rSbXfQ" role="1FtiSR">
+                              <ref role="a7OzE" node="51ek2rSbXfy" resolve="Node" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="1Ft4W6" id="51ek2rSbXfR" role="2Oq$k0">
+                          <node concept="a7P8L" id="51ek2rSbXfS" role="1FtiSR">
+                            <ref role="a7OzE" node="51ek2rSbXft" resolve="TypesUpdate" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="51ek2rSbWAn" role="1nLNMg">
+        <ref role="2t_S0q" to="wq2x:5itBwM66Jqx" resolve="ExpandMacroInputDeclaration" />
+        <node concept="3A20r5" id="51ek2rSbWAo" role="2t_VXX">
+          <property role="TrG5h" value="emid" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="AVZre" id="51ek2rScAqM">
+    <property role="TrG5h" value="Unifiable" />
+    <ref role="2YbDB9" to="kqnc:24Vro6cM_J$" resolve="ConversionMain" />
+    <node concept="1nLNMY" id="51ek2rScAYq" role="1nK1Vg">
+      <property role="TrG5h" value="unifiable_solve" />
+      <node concept="3clFbS" id="51ek2rScAYr" role="1nLNMH">
+        <node concept="1nLNNL" id="51ek2rScAYw" role="3cqZAp">
+          <node concept="1nLNMm" id="51ek2rScAYy" role="1nLNNK">
+            <node concept="3Aq93q" id="51ek2rScAYA" role="1nLNMb">
+              <node concept="3I6sU6" id="51ek2rScAYB" role="3Ip0Jz">
+                <node concept="3I6s7M" id="51ek2rScAYF" role="3I6sU7">
+                  <node concept="3Aqt3T" id="51ek2rScAYE" role="3I6s78">
+                    <ref role="3AqCNq" node="51ek2rScAY6" resolve="unifiable" />
+                    <node concept="1HFMs5" id="51ek2rScB1F" role="3AunhB">
+                      <node concept="a7P8L" id="51ek2rScAZv" role="1uarlU">
+                        <ref role="a7OzE" node="51ek2rScAYL" resolve="S" />
+                      </node>
+                      <node concept="ns1u0" id="51ek2rScB2i" role="1uarlW">
+                        <ref role="ns1xF" node="7LI_gNNfeK7" resolve="term" />
+                      </node>
+                    </node>
+                    <node concept="1HFMs5" id="51ek2rScB2s" role="3AunhB">
+                      <node concept="a7P8L" id="51ek2rScB1b" role="1uarlU">
+                        <ref role="a7OzE" node="51ek2rScAZ7" resolve="T" />
+                      </node>
+                      <node concept="ns1u0" id="51ek2rScB32" role="1uarlW">
+                        <ref role="ns1xF" node="7LI_gNNfeK7" resolve="term" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="51ek2rScAYK" role="0Rg$4">
+              <node concept="aZer4" id="51ek2rScAYL" role="3XD1gS">
+                <property role="TrG5h" value="S" />
+              </node>
+              <node concept="aZer4" id="51ek2rScAZ7" role="3XD1gS">
+                <property role="TrG5h" value="T" />
+              </node>
+              <node concept="32pEOW" id="51ek2rScAYX" role="3vLBG7" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="51ek2rScB36" role="3cqZAp" />
+        <node concept="1nLNNL" id="51ek2rScB3F" role="3cqZAp">
+          <node concept="1nLNMm" id="51ek2rScB3H" role="1nLNNK">
+            <node concept="3Aq93q" id="51ek2rScB42" role="1nLNMb">
+              <node concept="3I6sU6" id="51ek2rScB43" role="3Ip0Jz">
+                <node concept="3I6s7M" id="51ek2rScB4l" role="3I6sU7">
+                  <node concept="3Aqt3T" id="51ek2rScB4k" role="3I6s78">
+                    <ref role="3AqCNq" node="51ek2rScAY6" resolve="unifiable" />
+                    <node concept="1HFMs5" id="51ek2rScB51" role="3AunhB">
+                      <node concept="a7P8L" id="51ek2rScB4Z" role="1uarlU">
+                        <ref role="a7OzE" node="51ek2rScB48" resolve="S" />
+                      </node>
+                      <node concept="a7P8L" id="51ek2rScB8A" role="1uarlW">
+                        <ref role="a7OzE" node="51ek2rScB7P" resolve="DType" />
+                      </node>
+                    </node>
+                    <node concept="1HFMs5" id="51ek2rScB6i" role="3AunhB">
+                      <node concept="a7P8L" id="51ek2rScB6g" role="1uarlU">
+                        <ref role="a7OzE" node="51ek2rScB4z" resolve="T" />
+                      </node>
+                      <node concept="ns1u0" id="51ek2rScB7g" role="1uarlW">
+                        <ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
+                        <node concept="nsMwS" id="51ek2rScB7k" role="ns1xD">
+                          <ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
+                          <node concept="1nq8_$" id="51ek2rScB9a" role="nsMwV">
+                            <node concept="a7P8L" id="51ek2rScB99" role="1nq8_t">
+                              <ref role="a7OzE" node="51ek2rScB7P" resolve="DType" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="51ek2rScB47" role="0Rg$4">
+              <node concept="aZer4" id="51ek2rScB48" role="3XD1gS">
+                <property role="TrG5h" value="S" />
+              </node>
+              <node concept="aZer4" id="51ek2rScB4z" role="3XD1gS">
+                <property role="TrG5h" value="T" />
+              </node>
+              <node concept="aZer4" id="51ek2rScB7P" role="3XD1gS">
+                <property role="TrG5h" value="DType" />
+              </node>
+              <node concept="32pEOW" id="51ek2rScB4p" role="3vLBG7" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="51ek2rScBbK" role="3cqZAp" />
+        <node concept="1nLNNL" id="51ek2rScB9n" role="3cqZAp">
+          <node concept="1nLNMm" id="51ek2rScB9o" role="1nLNNK">
+            <node concept="3Aq93q" id="51ek2rScB9p" role="1nLNMb">
+              <node concept="3I6sU6" id="51ek2rScB9q" role="3Ip0Jz">
+                <node concept="3I6s7M" id="51ek2rScB9r" role="3I6sU7">
+                  <node concept="3Aqt3T" id="51ek2rScB9s" role="3I6s78">
+                    <ref role="3AqCNq" node="51ek2rScAY6" resolve="unifiable" />
+                    <node concept="1HFMs5" id="51ek2rScB9y" role="3AunhB">
+                      <node concept="a7P8L" id="51ek2rScBdO" role="1uarlU">
+                        <ref role="a7OzE" node="51ek2rScB9D" resolve="S" />
+                      </node>
+                      <node concept="ns1u0" id="51ek2rScB9$" role="1uarlW">
+                        <ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
+                        <node concept="nsMwS" id="51ek2rScB9_" role="ns1xD">
+                          <ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
+                          <node concept="1nq8_$" id="51ek2rScB9A" role="nsMwV">
+                            <node concept="a7P8L" id="51ek2rScB9B" role="1nq8_t">
+                              <ref role="a7OzE" node="51ek2rScB9F" resolve="DType" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1HFMs5" id="51ek2rScB9t" role="3AunhB">
+                      <node concept="a7P8L" id="51ek2rScBe4" role="1uarlU">
+                        <ref role="a7OzE" node="51ek2rScB9E" resolve="T" />
+                      </node>
+                      <node concept="a7P8L" id="51ek2rScB9x" role="1uarlW">
+                        <ref role="a7OzE" node="51ek2rScB9F" resolve="DType" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="51ek2rScB9C" role="0Rg$4">
+              <node concept="aZer4" id="51ek2rScB9D" role="3XD1gS">
+                <property role="TrG5h" value="S" />
+              </node>
+              <node concept="aZer4" id="51ek2rScB9E" role="3XD1gS">
+                <property role="TrG5h" value="T" />
+              </node>
+              <node concept="aZer4" id="51ek2rScB9F" role="3XD1gS">
+                <property role="TrG5h" value="DType" />
+              </node>
+              <node concept="32pEOW" id="51ek2rScB9G" role="3vLBG7" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="51ek2rScBh9" role="3cqZAp" />
+        <node concept="1nLNNL" id="51ek2rScBep" role="3cqZAp">
+          <node concept="1nLNMm" id="51ek2rScBeq" role="1nLNNK">
+            <node concept="3Aq93q" id="51ek2rScBer" role="1nLNMb">
+              <node concept="3I6sU6" id="51ek2rScBes" role="3Ip0Jz">
+                <node concept="3I6s7M" id="51ek2rScBet" role="3I6sU7">
+                  <node concept="3Aqt3T" id="51ek2rScBeu" role="3I6s78">
+                    <ref role="3AqCNq" node="51ek2rScAY6" resolve="unifiable" />
+                    <node concept="1HFMs5" id="51ek2rScBev" role="3AunhB">
+                      <node concept="a7P8L" id="51ek2rScBew" role="1uarlU">
+                        <ref role="a7OzE" node="51ek2rScBeF" resolve="S" />
+                      </node>
+                      <node concept="ns1u0" id="51ek2rScBex" role="1uarlW">
+                        <ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
+                        <node concept="nsMwS" id="51ek2rScBey" role="ns1xD">
+                          <ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
+                          <node concept="1nq8_$" id="51ek2rScBez" role="nsMwV">
+                            <node concept="a7P8L" id="51ek2rScBe$" role="1nq8_t">
+                              <ref role="a7OzE" node="51ek2rScBeH" resolve="DType" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1HFMs5" id="51ek2rScBiv" role="3AunhB">
+                      <node concept="a7P8L" id="51ek2rScBiw" role="1uarlU">
+                        <ref role="a7OzE" node="51ek2rScBeG" resolve="T" />
+                      </node>
+                      <node concept="ns1u0" id="51ek2rScBix" role="1uarlW">
+                        <ref role="ns1xF" to="54p4:7LI_gNMkMFB" resolve="logical" />
+                        <node concept="nsMwS" id="51ek2rScBiy" role="ns1xD">
+                          <ref role="nsMwP" to="54p4:7LI_gNMpTBn" resolve="dataType" />
+                          <node concept="1nq8_$" id="51ek2rScBiz" role="nsMwV">
+                            <node concept="a7P8L" id="51ek2rScBi$" role="1nq8_t">
+                              <ref role="a7OzE" node="51ek2rScBeH" resolve="DType" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="51ek2rScBeE" role="0Rg$4">
+              <node concept="aZer4" id="51ek2rScBeF" role="3XD1gS">
+                <property role="TrG5h" value="S" />
+              </node>
+              <node concept="aZer4" id="51ek2rScBeG" role="3XD1gS">
+                <property role="TrG5h" value="T" />
+              </node>
+              <node concept="aZer4" id="51ek2rScBeH" role="3XD1gS">
+                <property role="TrG5h" value="DType" />
+              </node>
+              <node concept="32pEOW" id="51ek2rScBeI" role="3vLBG7" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="51ek2rScKEM" role="3cqZAp" />
+        <node concept="1nLNNL" id="51ek2rScKHz" role="3cqZAp">
+          <node concept="1nLNMm" id="51ek2rScKH$" role="1nLNNK">
+            <node concept="3xSepi" id="51ek2rScKPM" role="3xSepv">
+              <node concept="3Aq9E8" id="51ek2rScKPN" role="3xSepj">
+                <node concept="3I6sU6" id="51ek2rScKPO" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="51ek2rScKPU" role="3I6sU7">
+                    <node concept="1lpGmL" id="51ek2rScKPS" role="3I6s78">
+                      <node concept="3cpWs3" id="51ek2rScLYW" role="1lp$hM">
+                        <node concept="Xl_RD" id="51ek2rScLYZ" role="3uHU7w">
+                          <property role="Xl_RC" value=" are not unifiable" />
+                        </node>
+                        <node concept="3cpWs3" id="51ek2rScLAn" role="3uHU7B">
+                          <node concept="3cpWs3" id="51ek2rScLtV" role="3uHU7B">
+                            <node concept="3cpWs3" id="51ek2rScL7L" role="3uHU7B">
+                              <node concept="Xl_RD" id="51ek2rScKPY" role="3uHU7B">
+                                <property role="Xl_RC" value="types " />
+                              </node>
+                              <node concept="1Ft4W6" id="51ek2rScL7P" role="3uHU7w">
+                                <node concept="a7P8L" id="51ek2rScL7O" role="1FtiSR">
+                                  <ref role="a7OzE" node="51ek2rScKHQ" resolve="S" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="Xl_RD" id="51ek2rScLtY" role="3uHU7w">
+                              <property role="Xl_RC" value=" and " />
+                            </node>
+                          </node>
+                          <node concept="1Ft4W6" id="51ek2rScLAr" role="3uHU7w">
+                            <node concept="a7P8L" id="51ek2rScLAq" role="1FtiSR">
+                              <ref role="a7OzE" node="51ek2rScKHR" resolve="T" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq93q" id="51ek2rScKH_" role="1nLNMb">
+              <node concept="3I6sU6" id="51ek2rScKHA" role="3Ip0Jz">
+                <node concept="3I6s7M" id="51ek2rScKHB" role="3I6sU7">
+                  <node concept="3Aqt3T" id="51ek2rScKHC" role="3I6s78">
+                    <ref role="3AqCNq" node="51ek2rScAY6" resolve="unifiable" />
+                    <node concept="a7P8L" id="51ek2rScKLn" role="3AunhB">
+                      <ref role="a7OzE" node="51ek2rScKHQ" resolve="S" />
+                    </node>
+                    <node concept="a7P8L" id="51ek2rScKPk" role="3AunhB">
+                      <ref role="a7OzE" node="51ek2rScKHR" resolve="T" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="51ek2rScKHP" role="0Rg$4">
+              <node concept="aZer4" id="51ek2rScKHQ" role="3XD1gS">
+                <property role="TrG5h" value="S" />
+              </node>
+              <node concept="aZer4" id="51ek2rScKHR" role="3XD1gS">
+                <property role="TrG5h" value="T" />
+              </node>
+              <node concept="32pEOW" id="51ek2rScKHT" role="3vLBG7" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3AqmO8" id="51ek2rScAY6" role="8PkJo">
+      <property role="TrG5h" value="unifiable" />
+      <node concept="1zAUYm" id="51ek2rScAY8" role="1zAUyy">
+        <property role="TrG5h" value="typea" />
+        <node concept="32pEOW" id="51ek2rScAYh" role="3gTf24" />
+      </node>
+      <node concept="1zAUYm" id="51ek2rScAYd" role="1zAUyy">
+        <property role="TrG5h" value="typeb" />
+        <node concept="32pEOW" id="51ek2rScAYn" role="3gTf24" />
+      </node>
     </node>
   </node>
 </model>
diff --git a/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl b/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl
index 0f0489ac..0e262b5a 100644
--- a/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl
@@ -66,6 +66,7 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)</dependency>
+    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
diff --git a/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps b/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
index 7d40cf8a..e87eeb0b 100644
--- a/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
@@ -18,16 +18,25 @@
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
+    <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
       </concept>
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1068431790189" name="jetbrains.mps.baseLanguage.structure.Type" flags="in" index="33vP2l" />
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
       <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
         <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
@@ -45,8 +54,27 @@
         <child id="1206060619838" name="condition" index="3eO9$A" />
         <child id="1206060644605" name="statementList" index="3eOfB_" />
       </concept>
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
+        <child id="1109201940907" name="parameter" index="11_B2D" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
+    </language>
+    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
+      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ng" index="2c44t0">
+        <child id="1196350785111" name="expression" index="2c44t1" />
+      </concept>
+      <concept id="1196350785112" name="jetbrains.mps.lang.quotation.structure.Antiquotation" flags="ng" index="2c44te" />
+      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
+        <child id="1196350785114" name="quotedNode" index="2c44tc" />
       </concept>
     </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
@@ -58,6 +86,9 @@
       <concept id="8456919074574710634" name="jetbrains.mps.logic.structure.ExpressionItem" flags="ng" index="37jhX">
         <child id="8456919074574710741" name="code" index="37jj2" />
       </concept>
+      <concept id="1564179198502666296" name="jetbrains.mps.logic.structure.LogicalType" flags="ig" index="26uTi9">
+        <child id="6399471711045454762" name="dataType" index="3vMvoR" />
+      </concept>
       <concept id="8169506320648805904" name="jetbrains.mps.logic.structure.LogicalVariableDeclarationContainer" flags="ng" index="29MRiA">
         <child id="6399471711045617306" name="dataType" index="3vLBG7" />
         <child id="3063948360254832884" name="declaration" index="3XD1gS" />
@@ -78,11 +109,16 @@
       <concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalVariableDataForm" flags="ng" index="3wAshV">
         <child id="960803923479549586" name="variable" index="3wAq21" />
       </concept>
+      <concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
+        <child id="8713947027062064784" name="logical" index="1FtiSR" />
+      </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
+      <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
+      <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
@@ -95,9 +131,11 @@
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
+      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="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" />
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
@@ -106,9 +144,19 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
+      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
+        <property id="709746936026609031" name="linkId" index="3V$3ak" />
+        <property id="709746936026609029" name="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="1225711141656" name="jetbrains.mps.baseLanguage.collections.structure.ListElementAccessExpression" flags="nn" index="1y4W85">
@@ -117,6 +165,14 @@
       </concept>
     </language>
     <language id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules">
+      <concept id="1618328391714763069" name="jetbrains.mps.lang.coderules.structure.MacroTable" flags="ng" index="0oKg$">
+        <reference id="6097203247219331496" name="extends" index="3tg4Y$" />
+        <child id="1618328391714763070" name="macro" index="0oKgB" />
+      </concept>
+      <concept id="7326790520856487884" name="jetbrains.mps.lang.coderules.structure.ProvideFeedbackOperation" flags="ng" index="26X5F$">
+        <property id="7326790520856501351" name="severity" index="26X25f" />
+        <child id="7326790520856501349" name="message" index="26X25d" />
+      </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
@@ -145,7 +201,25 @@
         <reference id="3541122455446356437" name="extends" index="2YbDB9" />
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
       </concept>
+      <concept id="6856711987714624232" name="jetbrains.mps.lang.coderules.structure.LateExpressionItem" flags="ng" index="HKQnh">
+        <child id="6856711987714624233" name="code" index="HKQng" />
+      </concept>
       <concept id="2381360340662937504" name="jetbrains.mps.lang.coderules.structure.TermType" flags="ig" index="32pEOW" />
+      <concept id="6097203247156088058" name="jetbrains.mps.lang.coderules.structure.ExpandMacroInputSpecification" flags="ng" index="3ixlbQ">
+        <reference id="6097203247156276310" name="applicableConcept" index="3ixz9q" />
+        <child id="6097203247156107501" name="input" index="3ix8rx" />
+      </concept>
+      <concept id="6097203247156229793" name="jetbrains.mps.lang.coderules.structure.ExpandMacroInputDeclaration" flags="ng" index="3ixQyH" />
+      <concept id="6097203247155932548" name="jetbrains.mps.lang.coderules.structure.ExpandMacroTemplate" flags="ng" index="3iyZe8">
+        <reference id="6097203247158702389" name="prototype" index="3iRiWT" />
+        <child id="6097203247156392058" name="inputSpec" index="3iweTQ" />
+        <child id="6097203247156492735" name="code" index="3iwQuN" />
+        <child id="6097203247156594418" name="variable" index="3iJhzY" />
+        <child id="6097203247216428965" name="logical" index="3tb1AD" />
+      </concept>
+      <concept id="6097203247183580433" name="jetbrains.mps.lang.coderules.structure.ExpandMacroInputReference" flags="ng" index="3j8tct">
+        <reference id="6097203247183580434" name="declaration" index="3j8tcu" />
+      </concept>
       <concept id="6097203247182936001" name="jetbrains.mps.lang.coderules.structure.ExpandMacroConstraint" flags="ng" index="3jbYBd">
         <reference id="6097203247182937177" name="template" index="3jbY9l" />
         <child id="6097203247182937145" name="input" index="3jbY8P" />
@@ -168,6 +242,10 @@
       <concept id="3575255234174969664" name="jetbrains.mps.lang.coderules.structure.ConstraintRuleStatement" flags="ng" index="1nLNNL">
         <child id="3575255234174969665" name="rule" index="1nLNNK" />
       </concept>
+      <concept id="8908809128801951597" name="jetbrains.mps.lang.coderules.structure.MacroBodyLogicalDeclaration" flags="ng" index="3uniRu" />
+      <concept id="5372587443968979218" name="jetbrains.mps.lang.coderules.structure.ExpressionConstraint" flags="ng" index="3wWvb2">
+        <child id="5372587443968983820" name="expression" index="3wWo3s" />
+      </concept>
       <concept id="7674753015762572646" name="jetbrains.mps.lang.coderules.structure.BodyBlock" flags="ng" index="3xSepi">
         <child id="7674753015762572647" name="body" index="3xSepj" />
       </concept>
@@ -175,6 +253,10 @@
       <concept id="7368070394769139970" name="jetbrains.mps.lang.coderules.structure.RuleInputReference" flags="ng" index="3A2sRY">
         <reference id="7368070394769213644" name="declaration" index="3A2yKK" />
       </concept>
+      <concept id="7368070394770780974" name="jetbrains.mps.lang.coderules.structure.UnifiesConstraint" flags="ng" index="3A8Hvi">
+        <child id="7368070394770793930" name="value" index="3A8w4Q" />
+        <child id="7368070394770793388" name="assignee" index="3A8wtg" />
+      </concept>
       <concept id="7368070394766963750" name="jetbrains.mps.lang.coderules.structure.Head" flags="ng" index="3Aq93q">
         <property id="7368070394767443940" name="keep" index="3ArMco" />
       </concept>
@@ -206,7 +288,7 @@
     </language>
   </registry>
   <node concept="AVZre" id="7LI_gNMjLUJ">
-    <property role="TrG5h" value="Check" />
+    <property role="TrG5h" value="CheckLogic" />
     <ref role="2YbDB9" to="kqnc:34$A1Mf51rY" resolve="TypeOf" />
     <node concept="1nLNMY" id="7LI_gNMjO$E" role="1nK1Vg">
       <property role="TrG5h" value="logicalItemExpression" />
@@ -339,19 +421,52 @@
       <node concept="3clFbS" id="7LI_gNMkLWu" role="1nLNMH">
         <node concept="1nLNNL" id="7LI_gNMkLXy" role="3cqZAp">
           <node concept="1nLNMm" id="7LI_gNMkLXz" role="1nLNNK">
-            <node concept="3Aq93q" id="7LI_gNMkLY5" role="1nLNMb">
+            <node concept="3Aq93q" id="5X1yxJH$A3m" role="1nLNMb">
               <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="7LI_gNMkLY6" role="3Ip0Jz">
-                <node concept="3I6s7M" id="7LI_gNMkLYa" role="3I6sU7">
-                  <node concept="3Aqt3T" id="7LI_gNMkLY9" role="3I6s78">
-                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
-                    <node concept="37jhX" id="7LI_gNMkLYh" role="3AunhB">
-                      <node concept="3A2sRY" id="7LI_gNMkLYf" role="37jj2">
-                        <ref role="3A2yKK" node="7LI_gNMkLXm" resolve="lvdecl" />
+              <node concept="3I6sU6" id="5X1yxJH$A3n" role="3Ip0Jz">
+                <node concept="3IrJb3" id="5X1yxJH$Ada" role="3I6sU7">
+                  <node concept="3clFbS" id="5X1yxJH$Adb" role="3IrJb0">
+                    <node concept="3clFbJ" id="5X1yxJH$Ade" role="3cqZAp">
+                      <node concept="2OqwBi" id="5X1yxJH$BjX" role="3clFbw">
+                        <node concept="2OqwBi" id="5X1yxJH$B69" role="2Oq$k0">
+                          <node concept="3A2sRY" id="5X1yxJH$B2m" role="2Oq$k0">
+                            <ref role="3A2yKK" node="7LI_gNMkLXm" resolve="lvdecl" />
+                          </node>
+                          <node concept="3TrEf2" id="5X1yxJH$BaE" role="2OqNvi">
+                            <ref role="3Tt5mk" to="5j4j:5f6wxQ3ychO" resolve="cardinalityExpr" />
+                          </node>
+                        </node>
+                        <node concept="3x8VRR" id="5X1yxJH$Bw2" role="2OqNvi" />
+                      </node>
+                      <node concept="3clFbS" id="5X1yxJH$Adg" role="3clFbx">
+                        <node concept="3Aqczg" id="5X1yxJH$AOW" role="3cqZAp">
+                          <node concept="3Aqt3T" id="5X1yxJH$AOV" role="3Aqpz8">
+                            <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                            <node concept="37jhX" id="5X1yxJH$ASP" role="3AunhB">
+                              <node concept="2OqwBi" id="5X1yxJH$ASQ" role="37jj2">
+                                <node concept="3A2sRY" id="5X1yxJH$ASR" role="2Oq$k0">
+                                  <ref role="3A2yKK" node="7LI_gNMkLXm" resolve="lvdecl" />
+                                </node>
+                                <node concept="3TrEf2" id="6AKaG_lpuEY" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="5j4j:5f6wxQ3ychO" resolve="cardinalityExpr" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="a7P8L" id="5X1yxJH$AST" role="3AunhB">
+                              <ref role="a7OzE" node="7LI_gNMkLXC" resolve="CEType" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="9aQIb" id="5X1yxJH$Byd" role="9aQIa">
+                        <node concept="3clFbS" id="5X1yxJH$Bye" role="9aQI4">
+                          <node concept="3Aqczg" id="5X1yxJH$BBF" role="3cqZAp">
+                            <node concept="3Aqt3T" id="5X1yxJH$BBE" role="3Aqpz8">
+                              <ref role="3AqCNq" to="kqnc:34$A1MfabR$" resolve="checkAll" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
-                    </node>
-                    <node concept="a7P8L" id="7LI_gNMkM6j" role="3AunhB">
-                      <ref role="a7OzE" node="7LI_gNMkLXC" resolve="Type" />
                     </node>
                   </node>
                 </node>
@@ -359,7 +474,7 @@
             </node>
             <node concept="3NuqgR" id="7LI_gNMkLXB" role="0Rg$4">
               <node concept="aZer4" id="7LI_gNMkLXC" role="3XD1gS">
-                <property role="TrG5h" value="Type" />
+                <property role="TrG5h" value="CEType" />
               </node>
               <node concept="aZer4" id="7LI_gNMpTN1" role="3XD1gS">
                 <property role="TrG5h" value="DataType" />
@@ -397,32 +512,32 @@
                         </node>
                       </node>
                       <node concept="3clFbJ" id="7LI_gNMkM6A" role="3cqZAp">
-                        <node concept="2OqwBi" id="7LI_gNMkMuv" role="3clFbw">
-                          <node concept="2OqwBi" id="7LI_gNMkMa_" role="2Oq$k0">
-                            <node concept="3A2sRY" id="7LI_gNMkM6M" role="2Oq$k0">
+                        <node concept="2OqwBi" id="14oWJ2N_QKY" role="3clFbw">
+                          <node concept="2OqwBi" id="14oWJ2N_QKZ" role="2Oq$k0">
+                            <node concept="3A2sRY" id="14oWJ2N_QL0" role="2Oq$k0">
                               <ref role="3A2yKK" node="7LI_gNMkLXm" resolve="lvdecl" />
                             </node>
-                            <node concept="3TrEf2" id="7LI_gNMkMjk" role="2OqNvi">
+                            <node concept="3TrEf2" id="14oWJ2N_QL1" role="2OqNvi">
                               <ref role="3Tt5mk" to="5j4j:5f6wxQ3ychO" resolve="cardinalityExpr" />
                             </node>
                           </node>
-                          <node concept="3w_OXm" id="7LI_gNMkMBw" role="2OqNvi" />
+                          <node concept="3x8VRR" id="14oWJ2N_UZb" role="2OqNvi" />
                         </node>
-                        <node concept="3clFbS" id="7LI_gNMkM6C" role="3clFbx">
-                          <node concept="3Aqczg" id="7LI_gNMkMFb" role="3cqZAp">
-                            <node concept="3Aqt3T" id="7LI_gNMkMF9" role="3Aqpz8">
+                        <node concept="3clFbS" id="7LI_gNMpURT" role="3clFbx">
+                          <node concept="3Aqczg" id="7LI_gNMpUSg" role="3cqZAp">
+                            <node concept="3Aqt3T" id="7LI_gNMpUSh" role="3Aqpz8">
                               <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
-                              <node concept="37jhX" id="7LI_gNMkMFm" role="3AunhB">
-                                <node concept="3A2sRY" id="7LI_gNMkMFk" role="37jj2">
+                              <node concept="37jhX" id="7LI_gNMpUSi" role="3AunhB">
+                                <node concept="3A2sRY" id="7LI_gNMpUSj" role="37jj2">
                                   <ref role="3A2yKK" node="7LI_gNMkLXm" resolve="lvdecl" />
                                 </node>
                               </node>
-                              <node concept="ns1u0" id="7LI_gNMpPwL" role="3AunhB">
-                                <ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
-                                <node concept="nsMwS" id="7LI_gNMpTMt" role="ns1xD">
-                                  <ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
-                                  <node concept="1nq8_$" id="7LI_gNMpUI$" role="nsMwV">
-                                    <node concept="a7P8L" id="7LI_gNMpUIz" role="1nq8_t">
+                              <node concept="ns1u0" id="7LI_gNMpUSk" role="3AunhB">
+                                <ref role="ns1xF" node="7LI_gNMpUS4" resolve="multiLogical" />
+                                <node concept="nsMwS" id="7LI_gNMpUSl" role="ns1xD">
+                                  <ref role="nsMwP" node="7LI_gNMpUS6" resolve="dataType" />
+                                  <node concept="1nq8_$" id="7LI_gNMpUSm" role="nsMwV">
+                                    <node concept="a7P8L" id="7LI_gNMpUSn" role="1nq8_t">
                                       <ref role="a7OzE" node="7LI_gNMpTN1" resolve="DataType" />
                                     </node>
                                   </node>
@@ -430,24 +545,35 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="3clFbH" id="7LI_gNMpUIg" role="3cqZAp" />
+                          <node concept="3clFbH" id="14oWJ2N_Wc9" role="3cqZAp" />
                         </node>
-                        <node concept="9aQIb" id="7LI_gNMpURS" role="9aQIa">
-                          <node concept="3clFbS" id="7LI_gNMpURT" role="9aQI4">
-                            <node concept="3Aqczg" id="7LI_gNMpUSg" role="3cqZAp">
-                              <node concept="3Aqt3T" id="7LI_gNMpUSh" role="3Aqpz8">
+                        <node concept="9aQIb" id="14oWJ2N_QL3" role="9aQIa">
+                          <node concept="3clFbS" id="7LI_gNMkM6C" role="9aQI4">
+                            <node concept="3Aqczg" id="5X1yxJH$C71" role="3cqZAp">
+                              <node concept="3Aqt3T" id="5X1yxJH$C6Z" role="3Aqpz8">
+                                <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="defaultConvertsTo" />
+                                <node concept="a7P8L" id="5X1yxJH$Cb5" role="3AunhB">
+                                  <ref role="a7OzE" node="7LI_gNMkLXC" resolve="CEType" />
+                                </node>
+                                <node concept="ns1u0" id="5X1yxJH$Cf5" role="3AunhB">
+                                  <ref role="ns1xF" to="kqnc:JOGAOsVt2E" resolve="_int_" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3Aqczg" id="7LI_gNMkMFb" role="3cqZAp">
+                              <node concept="3Aqt3T" id="7LI_gNMkMF9" role="3Aqpz8">
                                 <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
-                                <node concept="37jhX" id="7LI_gNMpUSi" role="3AunhB">
-                                  <node concept="3A2sRY" id="7LI_gNMpUSj" role="37jj2">
+                                <node concept="37jhX" id="7LI_gNMkMFm" role="3AunhB">
+                                  <node concept="3A2sRY" id="7LI_gNMkMFk" role="37jj2">
                                     <ref role="3A2yKK" node="7LI_gNMkLXm" resolve="lvdecl" />
                                   </node>
                                 </node>
-                                <node concept="ns1u0" id="7LI_gNMpUSk" role="3AunhB">
-                                  <ref role="ns1xF" node="7LI_gNMpUS4" resolve="multiLogical" />
-                                  <node concept="nsMwS" id="7LI_gNMpUSl" role="ns1xD">
-                                    <ref role="nsMwP" node="7LI_gNMpUS6" resolve="dataType" />
-                                    <node concept="1nq8_$" id="7LI_gNMpUSm" role="nsMwV">
-                                      <node concept="a7P8L" id="7LI_gNMpUSn" role="1nq8_t">
+                                <node concept="ns1u0" id="7LI_gNMpPwL" role="3AunhB">
+                                  <ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
+                                  <node concept="nsMwS" id="7LI_gNMpTMt" role="ns1xD">
+                                    <ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
+                                    <node concept="1nq8_$" id="7LI_gNMpUI$" role="nsMwV">
+                                      <node concept="a7P8L" id="7LI_gNMpUIz" role="1nq8_t">
                                         <ref role="a7OzE" node="7LI_gNMpTN1" resolve="DataType" />
                                       </node>
                                     </node>
@@ -473,6 +599,219 @@
         </node>
       </node>
     </node>
+    <node concept="1nLNMY" id="14oWJ2Ny0qF" role="1nK1Vg">
+      <property role="TrG5h" value="logicalVariable" />
+      <node concept="3clFbS" id="14oWJ2Ny0qG" role="1nLNMH">
+        <node concept="3clFbJ" id="4xczej5cB59" role="3cqZAp">
+          <node concept="3clFbS" id="4xczej5cB5b" role="3clFbx">
+            <node concept="3clFbF" id="4xczej5cUDt" role="3cqZAp">
+              <node concept="2OqwBi" id="4xczej5cVtw" role="3clFbG">
+                <node concept="3A2sRY" id="4xczej5cUDr" role="2Oq$k0">
+                  <ref role="3A2yKK" node="14oWJ2Ny0qI" resolve="lv" />
+                </node>
+                <node concept="26X5F$" id="4xczej5cZK1" role="2OqNvi">
+                  <property role="26X25f" value="4jcOV4hu0n_/ERROR" />
+                  <node concept="Xl_RD" id="4xczej5cZUO" role="26X25d">
+                    <property role="Xl_RC" value="indexed access incompatible with logical declaration" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="4xczej5cSx2" role="3clFbw">
+            <node concept="2OqwBi" id="4xczej5cLNS" role="3uHU7B">
+              <node concept="2OqwBi" id="4xczej5cBYu" role="2Oq$k0">
+                <node concept="3A2sRY" id="4xczej5cBaQ" role="2Oq$k0">
+                  <ref role="3A2yKK" node="14oWJ2Ny0qI" resolve="lv" />
+                </node>
+                <node concept="3TrEf2" id="4xczej5cIFc" role="2OqNvi">
+                  <ref role="3Tt5mk" to="5j4j:5f6wxQ3pnWr" resolve="indexExpr" />
+                </node>
+              </node>
+              <node concept="3w_OXm" id="4xczej5cQSX" role="2OqNvi" />
+            </node>
+            <node concept="2OqwBi" id="4xczej5cTq7" role="3uHU7w">
+              <node concept="2OqwBi" id="4xczej5cTq8" role="2Oq$k0">
+                <node concept="2OqwBi" id="4xczej5cTq9" role="2Oq$k0">
+                  <node concept="3A2sRY" id="4xczej5cTqa" role="2Oq$k0">
+                    <ref role="3A2yKK" node="14oWJ2Ny0qI" resolve="lv" />
+                  </node>
+                  <node concept="3TrEf2" id="4xczej5cTqb" role="2OqNvi">
+                    <ref role="3Tt5mk" to="5j4j:7E86$tK_PaH" resolve="declaration" />
+                  </node>
+                </node>
+                <node concept="3TrEf2" id="4xczej5cTqc" role="2OqNvi">
+                  <ref role="3Tt5mk" to="5j4j:5f6wxQ3ychO" resolve="cardinalityExpr" />
+                </node>
+              </node>
+              <node concept="3w_OXm" id="4xczej5cTqd" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="4xczej5bGlD" role="3cqZAp">
+          <node concept="3clFbS" id="4xczej5bGlF" role="3clFbx">
+            <node concept="1nLNNL" id="4xczej5bVEx" role="3cqZAp">
+              <node concept="1nLNMm" id="4xczej5bVEy" role="1nLNNK">
+                <node concept="3Aq93q" id="4xczej5bVEz" role="1nLNMb">
+                  <property role="3ArMco" value="true" />
+                  <node concept="3I6sU6" id="4xczej5bVE$" role="3Ip0Jz">
+                    <node concept="3I6s7M" id="4xczej5bVE_" role="3I6sU7">
+                      <node concept="3Aqt3T" id="4xczej5bVEA" role="3I6s78">
+                        <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                        <node concept="37jhX" id="4xczej5bVEB" role="3AunhB">
+                          <node concept="2OqwBi" id="4xczej5bVEC" role="37jj2">
+                            <node concept="3A2sRY" id="4xczej5bVED" role="2Oq$k0">
+                              <ref role="3A2yKK" node="14oWJ2Ny0qI" resolve="lv" />
+                            </node>
+                            <node concept="3TrEf2" id="4xczej5bVEE" role="2OqNvi">
+                              <ref role="3Tt5mk" to="5j4j:7E86$tK_PaH" resolve="declaration" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="a7P8L" id="4xczej5bVEF" role="3AunhB">
+                          <ref role="a7OzE" node="4xczej5bVEH" resolve="DeclType" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3I6s7M" id="4xczej5bXjs" role="3I6sU7">
+                      <node concept="3Aqt3T" id="4xczej5bXjq" role="3I6s78">
+                        <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                        <node concept="37jhX" id="4xczej5bXr$" role="3AunhB">
+                          <node concept="2OqwBi" id="4xczej5c1MR" role="37jj2">
+                            <node concept="3A2sRY" id="4xczej5bXry" role="2Oq$k0">
+                              <ref role="3A2yKK" node="14oWJ2Ny0qI" resolve="lv" />
+                            </node>
+                            <node concept="3TrEf2" id="4xczej5caMg" role="2OqNvi">
+                              <ref role="3Tt5mk" to="5j4j:5f6wxQ3pnWr" resolve="indexExpr" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="a7P8L" id="4xczej5cbd6" role="3AunhB">
+                          <ref role="a7OzE" node="4xczej5bX2X" resolve="IndexType" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3NuqgR" id="4xczej5bVEG" role="0Rg$4">
+                  <node concept="aZer4" id="4xczej5bVEH" role="3XD1gS">
+                    <property role="TrG5h" value="DeclType" />
+                  </node>
+                  <node concept="aZer4" id="4xczej5bX2X" role="3XD1gS">
+                    <property role="TrG5h" value="IndexType" />
+                  </node>
+                  <node concept="32pEOW" id="4xczej5bVEI" role="3vLBG7" />
+                </node>
+                <node concept="3xSepi" id="4xczej5bVEJ" role="3xSepv">
+                  <node concept="3Aq9E8" id="4xczej5bVEK" role="3xSepj">
+                    <node concept="3I6sU6" id="4xczej5bVEL" role="3Ip0Jz">
+                      <node concept="3I6s7M" id="4xczej5cblA" role="3I6sU7">
+                        <node concept="3Aqt3T" id="4xczej5cbl$" role="3I6s78">
+                          <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="defaultConvertsTo" />
+                          <node concept="a7P8L" id="4xczej5cbtW" role="3AunhB">
+                            <ref role="a7OzE" node="4xczej5bX2X" resolve="IndexType" />
+                          </node>
+                          <node concept="ns1u0" id="4xczej5cbAq" role="3AunhB">
+                            <ref role="ns1xF" to="kqnc:JOGAOsVt2E" resolve="_int_" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3I6s7M" id="4xczej5bVEM" role="3I6sU7">
+                        <node concept="3Aqt3T" id="4xczej5bVEN" role="3I6s78">
+                          <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                          <node concept="37jhX" id="4xczej5bVEO" role="3AunhB">
+                            <node concept="3A2sRY" id="4xczej5bVEP" role="37jj2">
+                              <ref role="3A2yKK" node="14oWJ2Ny0qI" resolve="lv" />
+                            </node>
+                          </node>
+                          <node concept="a7P8L" id="4xczej5bVEQ" role="3AunhB">
+                            <ref role="a7OzE" node="4xczej5bVEH" resolve="DeclType" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="4xczej5bGlE" role="3cqZAp" />
+          </node>
+          <node concept="2OqwBi" id="4xczej5bPro" role="3clFbw">
+            <node concept="2OqwBi" id="4xczej5bHdP" role="2Oq$k0">
+              <node concept="3A2sRY" id="4xczej5bGpM" role="2Oq$k0">
+                <ref role="3A2yKK" node="14oWJ2Ny0qI" resolve="lv" />
+              </node>
+              <node concept="3TrEf2" id="4xczej5bMka" role="2OqNvi">
+                <ref role="3Tt5mk" to="5j4j:5f6wxQ3pnWr" resolve="indexExpr" />
+              </node>
+            </node>
+            <node concept="3x8VRR" id="4xczej5bTH8" role="2OqNvi" />
+          </node>
+          <node concept="9aQIb" id="4xczej5bUpS" role="9aQIa">
+            <node concept="3clFbS" id="4xczej5bUpT" role="9aQI4">
+              <node concept="1nLNNL" id="14oWJ2Ny0CO" role="3cqZAp">
+                <node concept="1nLNMm" id="14oWJ2Ny0CP" role="1nLNNK">
+                  <node concept="3Aq93q" id="14oWJ2Ny0UE" role="1nLNMb">
+                    <property role="3ArMco" value="true" />
+                    <node concept="3I6sU6" id="14oWJ2Ny0UF" role="3Ip0Jz">
+                      <node concept="3I6s7M" id="14oWJ2Ny13x" role="3I6sU7">
+                        <node concept="3Aqt3T" id="14oWJ2Ny13w" role="3I6s78">
+                          <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                          <node concept="37jhX" id="14oWJ2Ny1lc" role="3AunhB">
+                            <node concept="2OqwBi" id="14oWJ2Ny2i5" role="37jj2">
+                              <node concept="3A2sRY" id="14oWJ2Ny1la" role="2Oq$k0">
+                                <ref role="3A2yKK" node="14oWJ2Ny0qI" resolve="lv" />
+                              </node>
+                              <node concept="3TrEf2" id="14oWJ2Ny6D2" role="2OqNvi">
+                                <ref role="3Tt5mk" to="5j4j:7E86$tK_PaH" resolve="declaration" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="a7P8L" id="14oWJ2Ny7m$" role="3AunhB">
+                            <ref role="a7OzE" node="14oWJ2Ny0LG" resolve="Type" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3NuqgR" id="14oWJ2Ny0LF" role="0Rg$4">
+                    <node concept="aZer4" id="14oWJ2Ny0LG" role="3XD1gS">
+                      <property role="TrG5h" value="Type" />
+                    </node>
+                    <node concept="32pEOW" id="14oWJ2Ny74x" role="3vLBG7" />
+                  </node>
+                  <node concept="3xSepi" id="14oWJ2Ny7vC" role="3xSepv">
+                    <node concept="3Aq9E8" id="14oWJ2Ny7vD" role="3xSepj">
+                      <node concept="3I6sU6" id="14oWJ2Ny7vE" role="3Ip0Jz">
+                        <node concept="3I6s7M" id="14oWJ2Ny7CC" role="3I6sU7">
+                          <node concept="3Aqt3T" id="14oWJ2Ny7CB" role="3I6s78">
+                            <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                            <node concept="37jhX" id="14oWJ2Ny7Ux" role="3AunhB">
+                              <node concept="3A2sRY" id="14oWJ2Ny7Uv" role="37jj2">
+                                <ref role="3A2yKK" node="14oWJ2Ny0qI" resolve="lv" />
+                              </node>
+                            </node>
+                            <node concept="a7P8L" id="14oWJ2Ny83H" role="3AunhB">
+                              <ref role="a7OzE" node="14oWJ2Ny0LG" resolve="Type" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="14oWJ2Ny0qH" role="1nLNMg">
+        <ref role="2t_S0q" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
+        <node concept="3A20r5" id="14oWJ2Ny0qI" role="2t_VXX">
+          <property role="TrG5h" value="lv" />
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="7LI_gNMpTgK" role="1nK1Vg">
       <property role="TrG5h" value="expressionItem" />
       <node concept="3clFbS" id="7LI_gNMpTgL" role="1nLNMH">
@@ -544,38 +883,42 @@
         </node>
       </node>
     </node>
-    <node concept="1nLNMY" id="7LI_gNMpWAS" role="1nK1Vg">
-      <property role="TrG5h" value="logicalItemValueExpression" />
-      <node concept="3clFbS" id="7LI_gNMpWAT" role="1nLNMH">
-        <node concept="1nLNNL" id="7LI_gNMpWDm" role="3cqZAp">
-          <node concept="1nLNMm" id="7LI_gNMpWDo" role="1nLNNK">
-            <node concept="3Aq93q" id="7LI_gNMpWDV" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="7LI_gNMpWDW" role="3Ip0Jz">
-                <node concept="3I6s7M" id="7LI_gNMpWE0" role="3I6sU7">
-                  <node concept="3Aqt3T" id="7LI_gNMpWDZ" role="3I6s78">
-                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
-                    <node concept="37jhX" id="7LI_gNMpWE7" role="3AunhB">
-                      <node concept="2OqwBi" id="7LI_gNMpWM4" role="37jj2">
-                        <node concept="3A2sRY" id="7LI_gNMpWE5" role="2Oq$k0">
-                          <ref role="3A2yKK" node="7LI_gNMpWD8" resolve="live" />
-                        </node>
-                        <node concept="3TrEf2" id="7LI_gNMpWUh" role="2OqNvi">
-                          <ref role="3Tt5mk" to="5j4j:7zIaasjAKqg" resolve="logical" />
+    <node concept="1X3_iC" id="14oWJ2NFfP7" role="lGtFl">
+      <property role="3V$3am" value="template" />
+      <property role="3V$3ak" value="c4803b19-6d89-4a3b-bf82-390769514add/8335224865066015764/3575255234175157601" />
+      <node concept="1nLNMY" id="7LI_gNMpWAS" role="8Wnug">
+        <property role="TrG5h" value="logicalItemValueExpression" />
+        <node concept="3clFbS" id="7LI_gNMpWAT" role="1nLNMH">
+          <node concept="1nLNNL" id="7LI_gNMpWDm" role="3cqZAp">
+            <node concept="1nLNMm" id="7LI_gNMpWDo" role="1nLNNK">
+              <node concept="3Aq93q" id="7LI_gNMpWDV" role="1nLNMb">
+                <property role="3ArMco" value="true" />
+                <node concept="3I6sU6" id="7LI_gNMpWDW" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="7LI_gNMpWE0" role="3I6sU7">
+                    <node concept="3Aqt3T" id="7LI_gNMpWDZ" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                      <node concept="37jhX" id="7LI_gNMpWE7" role="3AunhB">
+                        <node concept="2OqwBi" id="7LI_gNMpWM4" role="37jj2">
+                          <node concept="3A2sRY" id="7LI_gNMpWE5" role="2Oq$k0">
+                            <ref role="3A2yKK" node="7LI_gNMpWD8" resolve="live" />
+                          </node>
+                          <node concept="3TrEf2" id="7LI_gNMpWUh" role="2OqNvi">
+                            <ref role="3Tt5mk" to="5j4j:7zIaasjAKqg" resolve="logical" />
+                          </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="1HFMs5" id="7LI_gNMpWWF" role="3AunhB">
-                      <node concept="a7P8L" id="7LI_gNMpWWv" role="1uarlU">
-                        <ref role="a7OzE" node="7LI_gNMpWDu" resolve="Type" />
-                      </node>
-                      <node concept="ns1u0" id="7LI_gNMpX8P" role="1uarlW">
-                        <ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
-                        <node concept="nsMwS" id="7LI_gNMpX8R" role="ns1xD">
-                          <ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
-                          <node concept="1nq8_$" id="7LI_gNMpX9I" role="nsMwV">
-                            <node concept="a7P8L" id="7LI_gNMpX9H" role="1nq8_t">
-                              <ref role="a7OzE" node="7LI_gNMpX8V" resolve="DataType" />
+                      <node concept="1HFMs5" id="7LI_gNMpWWF" role="3AunhB">
+                        <node concept="a7P8L" id="7LI_gNMpWWv" role="1uarlU">
+                          <ref role="a7OzE" node="7LI_gNMpWDu" resolve="Type" />
+                        </node>
+                        <node concept="ns1u0" id="7LI_gNMpX8P" role="1uarlW">
+                          <ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
+                          <node concept="nsMwS" id="7LI_gNMpX8R" role="ns1xD">
+                            <ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
+                            <node concept="1nq8_$" id="7LI_gNMpX9I" role="nsMwV">
+                              <node concept="a7P8L" id="7LI_gNMpX9H" role="1nq8_t">
+                                <ref role="a7OzE" node="7LI_gNMpX8V" resolve="DataType" />
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -584,29 +927,29 @@
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="3NuqgR" id="7LI_gNMpWDt" role="0Rg$4">
-              <node concept="aZer4" id="7LI_gNMpWDu" role="3XD1gS">
-                <property role="TrG5h" value="Type" />
+              <node concept="3NuqgR" id="7LI_gNMpWDt" role="0Rg$4">
+                <node concept="aZer4" id="7LI_gNMpWDu" role="3XD1gS">
+                  <property role="TrG5h" value="Type" />
+                </node>
+                <node concept="aZer4" id="7LI_gNMpX8V" role="3XD1gS">
+                  <property role="TrG5h" value="DataType" />
+                </node>
+                <node concept="32pEOW" id="7LI_gNMpWDE" role="3vLBG7" />
               </node>
-              <node concept="aZer4" id="7LI_gNMpX8V" role="3XD1gS">
-                <property role="TrG5h" value="DataType" />
-              </node>
-              <node concept="32pEOW" id="7LI_gNMpWDE" role="3vLBG7" />
-            </node>
-            <node concept="3xSepi" id="7LI_gNMpX9V" role="3xSepv">
-              <node concept="3Aq9E8" id="7LI_gNMpX9W" role="3xSepj">
-                <node concept="3I6sU6" id="7LI_gNMpX9X" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="7LI_gNMpXa2" role="3I6sU7">
-                    <node concept="3Aqt3T" id="7LI_gNMpXa1" role="3I6s78">
-                      <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
-                      <node concept="37jhX" id="7LI_gNMpXa9" role="3AunhB">
-                        <node concept="3A2sRY" id="7LI_gNMpXa7" role="37jj2">
-                          <ref role="3A2yKK" node="7LI_gNMpWD8" resolve="live" />
+              <node concept="3xSepi" id="7LI_gNMpX9V" role="3xSepv">
+                <node concept="3Aq9E8" id="7LI_gNMpX9W" role="3xSepj">
+                  <node concept="3I6sU6" id="7LI_gNMpX9X" role="3Ip0Jz">
+                    <node concept="3I6s7M" id="7LI_gNMpXa2" role="3I6sU7">
+                      <node concept="3Aqt3T" id="7LI_gNMpXa1" role="3I6s78">
+                        <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                        <node concept="37jhX" id="7LI_gNMpXa9" role="3AunhB">
+                          <node concept="3A2sRY" id="7LI_gNMpXa7" role="37jj2">
+                            <ref role="3A2yKK" node="7LI_gNMpWD8" resolve="live" />
+                          </node>
+                        </node>
+                        <node concept="a7P8L" id="7LI_gNMpXap" role="3AunhB">
+                          <ref role="a7OzE" node="7LI_gNMpX8V" resolve="DataType" />
                         </node>
-                      </node>
-                      <node concept="a7P8L" id="7LI_gNMpXap" role="3AunhB">
-                        <ref role="a7OzE" node="7LI_gNMpX8V" resolve="DataType" />
                       </node>
                     </node>
                   </node>
@@ -615,11 +958,11 @@
             </node>
           </node>
         </node>
-      </node>
-      <node concept="2t___k" id="7LI_gNMpWD7" role="1nLNMg">
-        <ref role="2t_S0q" to="5j4j:7zIaasjAAux" resolve="LogicalItemValueExpression" />
-        <node concept="3A20r5" id="7LI_gNMpWD8" role="2t_VXX">
-          <property role="TrG5h" value="live" />
+        <node concept="2t___k" id="7LI_gNMpWD7" role="1nLNMg">
+          <ref role="2t_S0q" to="5j4j:7zIaasjAAux" resolve="LogicalItemValueExpression" />
+          <node concept="3A20r5" id="7LI_gNMpWD8" role="2t_VXX">
+            <property role="TrG5h" value="live" />
+          </node>
         </node>
       </node>
     </node>
@@ -928,7 +1271,7 @@
                   </node>
                   <node concept="3I6s7M" id="7LI_gNMBfh3" role="3I6sU7">
                     <node concept="3Aqt3T" id="7LI_gNMBfh2" role="3I6s78">
-                      <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="convertsTo" />
+                      <ref role="3AqCNq" to="kqnc:3Qp4N06bUPu" resolve="defaultConvertsTo" />
                       <node concept="a7P8L" id="7LI_gNMBfhb" role="3AunhB">
                         <ref role="a7OzE" node="7LI_gNMBbBf" resolve="Type" />
                       </node>
@@ -965,7 +1308,7 @@
     <property role="TrG5h" value="Converts" />
     <ref role="2YbDB9" to="kqnc:24Vro6cM_J$" resolve="ConversionMain" />
     <node concept="1nLNMY" id="7LI_gNMpXVh" role="1nK1Vg">
-      <property role="TrG5h" value="convertsClassifier2Logical" />
+      <property role="TrG5h" value="classifier_convertsTo_logical" />
       <node concept="3clFbS" id="7LI_gNMpXVi" role="1nLNMH">
         <node concept="1nLNNL" id="7LI_gNMpXVl" role="3cqZAp">
           <node concept="1nLNMm" id="7LI_gNMpXVm" role="1nLNNK">
@@ -973,7 +1316,7 @@
               <node concept="3I6sU6" id="7LI_gNMpXVC" role="3Ip0Jz">
                 <node concept="3I6s7M" id="7LI_gNMpXVG" role="3I6sU7">
                   <node concept="3Aqt3T" id="7LI_gNMpXVF" role="3I6s78">
-                    <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsToAlt" />
+                    <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
                     <node concept="1HFMs5" id="7LI_gNMpYpE" role="3AunhB">
                       <node concept="a7P8L" id="7LI_gNMpYpC" role="1uarlU">
                         <ref role="a7OzE" node="7LI_gNMpXVr" resolve="Type" />
@@ -993,8 +1336,8 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="a7P8L" id="4s_lMmH6CtM" role="3AunhB">
-                      <ref role="a7OzE" node="4s_lMmH6CtK" resolve="Options" />
+                    <node concept="a7P8L" id="3OUB6BCUA$X" role="3AunhB">
+                      <ref role="a7OzE" node="3OUB6BCUA$V" resolve="Options" />
                     </node>
                   </node>
                 </node>
@@ -1014,7 +1357,7 @@
                 <node concept="3I6sU6" id="7LI_gNMpYoZ" role="3Ip0Jz">
                   <node concept="3I6s7M" id="7LI_gNMpYp8" role="3I6sU7">
                     <node concept="3Aqt3T" id="7LI_gNMpYp7" role="3I6s78">
-                      <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsToAlt" />
+                      <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
                       <node concept="a7P8L" id="7LI_gNMpYwI" role="3AunhB">
                         <ref role="a7OzE" node="7LI_gNMpXVr" resolve="Type" />
                       </node>
@@ -1041,19 +1384,19 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="a7P8L" id="4s_lMmH6CtN" role="3AunhB">
-                        <ref role="a7OzE" node="4s_lMmH6CtK" resolve="Options" />
+                      <node concept="a7P8L" id="3OUB6BCUA$Y" role="3AunhB">
+                        <ref role="a7OzE" node="3OUB6BCUA$V" resolve="Options" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3NuqgR" id="4s_lMmH6CtI" role="0Rg$4">
-              <node concept="3uibUv" id="4s_lMmH6CtJ" role="3vLBG7">
+            <node concept="3NuqgR" id="3OUB6BCUA$T" role="0Rg$4">
+              <node concept="3uibUv" id="3OUB6BCUA$U" role="3vLBG7">
                 <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="ConvertsContext.Options" />
               </node>
-              <node concept="aZer4" id="4s_lMmH6CtK" role="3XD1gS">
+              <node concept="aZer4" id="3OUB6BCUA$V" role="3XD1gS">
                 <property role="TrG5h" value="Options" />
               </node>
             </node>
@@ -1062,7 +1405,7 @@
       </node>
     </node>
     <node concept="1nLNMY" id="7LI_gNMpYxf" role="1nK1Vg">
-      <property role="TrG5h" value="convertsMultiLogical2Classifier" />
+      <property role="TrG5h" value="multiLogical_convertsTo_classifier" />
       <node concept="3clFbS" id="7LI_gNMpYxg" role="1nLNMH">
         <node concept="1nLNNL" id="7LI_gNMpYxG" role="3cqZAp">
           <node concept="1nLNMm" id="7LI_gNMpYxH" role="1nLNNK">
@@ -1070,7 +1413,7 @@
               <node concept="3I6sU6" id="7LI_gNMpYxL" role="3Ip0Jz">
                 <node concept="3I6s7M" id="7LI_gNMpYxP" role="3I6sU7">
                   <node concept="3Aqt3T" id="7LI_gNMpYxO" role="3I6s78">
-                    <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsToAlt" />
+                    <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
                     <node concept="ns1u0" id="7LI_gNMpYxU" role="3AunhB">
                       <ref role="ns1xF" node="7LI_gNMpUS4" resolve="multiLogical" />
                     </node>
@@ -1085,18 +1428,98 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="a7P8L" id="4s_lMmH6CtV" role="3AunhB">
-                      <ref role="a7OzE" node="4s_lMmH6CtT" resolve="Options" />
+                    <node concept="a7P8L" id="3OUB6BCUA_6" role="3AunhB">
+                      <ref role="a7OzE" node="3OUB6BCUA_4" resolve="Options" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3NuqgR" id="4s_lMmH6CtR" role="0Rg$4">
-              <node concept="3uibUv" id="4s_lMmH6CtS" role="3vLBG7">
+            <node concept="3NuqgR" id="3OUB6BCUA_2" role="0Rg$4">
+              <node concept="3uibUv" id="3OUB6BCUA_3" role="3vLBG7">
                 <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="ConvertsContext.Options" />
               </node>
-              <node concept="aZer4" id="4s_lMmH6CtT" role="3XD1gS">
+              <node concept="aZer4" id="3OUB6BCUA_4" role="3XD1gS">
+                <property role="TrG5h" value="Options" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="14oWJ2N_n59" role="1nK1Vg">
+      <property role="TrG5h" value="logical_convertsTo_dataType" />
+      <node concept="3clFbS" id="14oWJ2N_n5a" role="1nLNMH">
+        <node concept="1nLNNL" id="14oWJ2N_oEm" role="3cqZAp">
+          <node concept="1nLNMm" id="14oWJ2N_oEn" role="1nLNNK">
+            <node concept="3Aq93q" id="14oWJ2N_oL_" role="1nLNMb">
+              <node concept="3I6sU6" id="14oWJ2N_oLA" role="3Ip0Jz">
+                <node concept="3I6s7M" id="14oWJ2N_oSP" role="3I6sU7">
+                  <node concept="3Aqt3T" id="14oWJ2N_oSO" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
+                    <node concept="1HFMs5" id="14oWJ2N_qBl" role="3AunhB">
+                      <node concept="a7P8L" id="14oWJ2N_qvS" role="1uarlU">
+                        <ref role="a7OzE" node="14oWJ2N_peu" resolve="LogicalType" />
+                      </node>
+                      <node concept="ns1u0" id="14oWJ2N_qIX" role="1uarlW">
+                        <ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
+                        <node concept="nsMwS" id="14oWJ2N_qQk" role="ns1xD">
+                          <ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
+                          <node concept="1nq8_$" id="14oWJ2N_qXI" role="nsMwV">
+                            <node concept="a7P8L" id="14oWJ2N_qXH" role="1nq8_t">
+                              <ref role="a7OzE" node="14oWJ2N_ptc" resolve="DType" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="14oWJ2N_rkr" role="3AunhB">
+                      <ref role="a7OzE" node="14oWJ2N_pUI" resolve="SType" />
+                    </node>
+                    <node concept="a7P8L" id="3OUB6BCUA_e" role="3AunhB">
+                      <ref role="a7OzE" node="3OUB6BCUA_c" resolve="Options" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="14oWJ2N_pet" role="0Rg$4">
+              <node concept="aZer4" id="14oWJ2N_peu" role="3XD1gS">
+                <property role="TrG5h" value="LogicalType" />
+              </node>
+              <node concept="aZer4" id="14oWJ2N_ptc" role="3XD1gS">
+                <property role="TrG5h" value="DType" />
+              </node>
+              <node concept="aZer4" id="14oWJ2N_pUI" role="3XD1gS">
+                <property role="TrG5h" value="SType" />
+              </node>
+              <node concept="32pEOW" id="14oWJ2N_plP" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="14oWJ2N_rs7" role="3xSepv">
+              <node concept="3Aq9E8" id="14oWJ2N_rs8" role="3xSepj">
+                <node concept="3I6sU6" id="14oWJ2N_rs9" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="14oWJ2N_rzH" role="3I6sU7">
+                    <node concept="3Aqt3T" id="14oWJ2N_rzG" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
+                      <node concept="a7P8L" id="14oWJ2N_rMK" role="3AunhB">
+                        <ref role="a7OzE" node="14oWJ2N_ptc" resolve="DType" />
+                      </node>
+                      <node concept="a7P8L" id="14oWJ2N_rUt" role="3AunhB">
+                        <ref role="a7OzE" node="14oWJ2N_pUI" resolve="SType" />
+                      </node>
+                      <node concept="a7P8L" id="3OUB6BCUA_f" role="3AunhB">
+                        <ref role="a7OzE" node="3OUB6BCUA_c" resolve="Options" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="3OUB6BCUA_a" role="0Rg$4">
+              <node concept="3uibUv" id="3OUB6BCUA_b" role="3vLBG7">
+                <ref role="3uigEE" to="kqnc:3vTJNooZBhQ" resolve="ConvertsContext.Options" />
+              </node>
+              <node concept="aZer4" id="3OUB6BCUA_c" role="3XD1gS">
                 <property role="TrG5h" value="Options" />
               </node>
             </node>
@@ -1127,5 +1550,704 @@
       </node>
     </node>
   </node>
+  <node concept="0oKg$" id="6Dg__VJVHUt">
+    <property role="TrG5h" value="Types" />
+    <ref role="3tg4Y$" to="kqnc:E1U1n2RerB" resolve="Types" />
+    <node concept="3iyZe8" id="6Dg__VJVIOl" role="0oKgB">
+      <ref role="3iRiWT" to="kqnc:5itBwMau8m1" resolve="lift" />
+      <node concept="3clFbS" id="6Dg__VJVIOm" role="3iwQuN">
+        <node concept="3Aqczg" id="6Dg__VK8zac" role="3cqZAp">
+          <node concept="3jbYBd" id="6Dg__VK8za9" role="3Aqpz8">
+            <ref role="3jbY9l" to="kqnc:5itBwMau8m1" resolve="lift" />
+            <node concept="2OqwBi" id="6Dg__VK8zzx" role="3jbY8P">
+              <node concept="3j8tct" id="6Dg__VK8zqm" role="2Oq$k0">
+                <ref role="3j8tcu" node="6Dg__VJVIOr" resolve="lt" />
+              </node>
+              <node concept="3TrEf2" id="6Dg__VK8GuM" role="2OqNvi">
+                <ref role="3Tt5mk" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
+              </node>
+            </node>
+            <node concept="a7P8L" id="6Dg__VK8zqf" role="3jbY8V">
+              <ref role="a7OzE" node="6Dg__VK8zef" resolve="DType" />
+            </node>
+          </node>
+        </node>
+        <node concept="3Aqczg" id="6Dg__VK8zR5" role="3cqZAp">
+          <node concept="3A8Hvi" id="6Dg__VK8zQZ" role="3Aqpz8">
+            <node concept="a7P8L" id="6Dg__VK8zTf" role="3A8wtg">
+              <ref role="a7OzE" node="6Dg__VJVIOp" resolve="Type" />
+            </node>
+            <node concept="ns1u0" id="6Dg__VK8zXc" role="3A8w4Q">
+              <ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
+              <node concept="nsMwS" id="6Dg__VK8zZ9" role="ns1xD">
+                <ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
+                <node concept="1nq8_$" id="6Dg__VK8$34" role="nsMwV">
+                  <node concept="a7P8L" id="6Dg__VK8$33" role="1nq8_t">
+                    <ref role="a7OzE" node="6Dg__VK8zef" resolve="DType" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uniRu" id="6Dg__VJVIOn" role="3tb1AD">
+        <node concept="32pEOW" id="6Dg__VJVIOo" role="3vLBG7" />
+        <node concept="aZer4" id="6Dg__VJVIOp" role="3XD1gS">
+          <property role="TrG5h" value="Type" />
+        </node>
+      </node>
+      <node concept="3ixlbQ" id="6Dg__VJVIOq" role="3iweTQ">
+        <ref role="3ixz9q" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
+        <node concept="3ixQyH" id="6Dg__VJVIOr" role="3ix8rx">
+          <property role="TrG5h" value="lt" />
+        </node>
+      </node>
+      <node concept="3uniRu" id="6Dg__VK8zee" role="3iJhzY">
+        <node concept="aZer4" id="6Dg__VK8zef" role="3XD1gS">
+          <property role="TrG5h" value="DType" />
+        </node>
+        <node concept="32pEOW" id="6Dg__VK8zgm" role="3vLBG7" />
+      </node>
+    </node>
+  </node>
+  <node concept="AVZre" id="6Dg__VK8GGD">
+    <property role="TrG5h" value="Recover" />
+    <ref role="2YbDB9" to="kqnc:6Qzc0KyJGzD" resolve="Recover" />
+    <node concept="1nLNMY" id="6Dg__VK8GSe" role="1nK1Vg">
+      <property role="TrG5h" value="recover_logical" />
+      <node concept="3clFbS" id="6Dg__VK8GSf" role="1nLNMH">
+        <node concept="1nLNNL" id="6Dg__VK8H1T" role="3cqZAp">
+          <node concept="1nLNMm" id="6Dg__VK8H1U" role="1nLNNK">
+            <node concept="3Aq93q" id="6Dg__VK8H1X" role="1nLNMb">
+              <node concept="3I6sU6" id="6Dg__VK8H1Y" role="3Ip0Jz">
+                <node concept="3I6s7M" id="6Dg__VK8H3X" role="3I6sU7">
+                  <node concept="3Aqt3T" id="6Dg__VK8H3W" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:6Qzc0KyJGJT" resolve="recover" />
+                    <node concept="a7P8L" id="6Dg__VK8Lpr" role="3AunhB">
+                      <ref role="a7OzE" node="6Dg__VK8LcO" resolve="Node" />
+                    </node>
+                    <node concept="1HFMs5" id="6Dg__VK8Lv2" role="3AunhB">
+                      <node concept="a7P8L" id="6Dg__VK8Lv0" role="1uarlU">
+                        <ref role="a7OzE" node="6Dg__VK8Lj3" resolve="Type" />
+                      </node>
+                      <node concept="ns1u0" id="6Dg__VK8Lzm" role="1uarlW">
+                        <ref role="ns1xF" node="7LI_gNMkMFB" resolve="logical" />
+                        <node concept="nsMwS" id="6Dg__VK8LWX" role="ns1xD">
+                          <ref role="nsMwP" node="7LI_gNMpTBn" resolve="dataType" />
+                          <node concept="1nq8_$" id="6Dg__VK8Mbd" role="nsMwV">
+                            <node concept="a7P8L" id="6Dg__VK8Mbc" role="1nq8_t">
+                              <ref role="a7OzE" node="6Dg__VK8M2M" resolve="DType" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="6Dg__VK8LcN" role="0Rg$4">
+              <node concept="aZer4" id="6Dg__VK8LcO" role="3XD1gS">
+                <property role="TrG5h" value="Node" />
+              </node>
+              <node concept="aZer4" id="6Dg__VK8Mla" role="3XD1gS">
+                <property role="TrG5h" value="DNode" />
+              </node>
+              <node concept="3Tqbb2" id="6Dg__VK8LgQ" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6Dg__VK8Lj2" role="0Rg$4">
+              <node concept="aZer4" id="6Dg__VK8Lj3" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="aZer4" id="6Dg__VK8M2M" role="3XD1gS">
+                <property role="TrG5h" value="DType" />
+              </node>
+              <node concept="32pEOW" id="6Dg__VK8Lld" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="6Dg__VK8LB_" role="3xSepv">
+              <node concept="3Aq9E8" id="6Dg__VK8LBA" role="3xSepj">
+                <node concept="3I6sU6" id="6Dg__VK8LBB" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="6Dg__VK8Mwj" role="3I6sU7">
+                    <node concept="3Aqt3T" id="6Dg__VK8Mwh" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:6Qzc0KyJGJT" resolve="recover" />
+                      <node concept="a7P8L" id="6Dg__VK8Myv" role="3AunhB">
+                        <ref role="a7OzE" node="6Dg__VK8Mla" resolve="DNode" />
+                      </node>
+                      <node concept="a7P8L" id="6Dg__VK8M$B" role="3AunhB">
+                        <ref role="a7OzE" node="6Dg__VK8M2M" resolve="DType" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="6Dg__VK8MXc" role="3I6sU7">
+                    <node concept="3A8Hvi" id="6Dg__VK8MXi" role="3I6s78">
+                      <node concept="HKQnh" id="6Dg__VK8N2I" role="3A8w4Q">
+                        <node concept="2c44tf" id="6Dg__VK8N6G" role="HKQng">
+                          <node concept="26uTi9" id="6Dg__VK8NaQ" role="2c44tc">
+                            <node concept="33vP2l" id="6Dg__VK8Nd2" role="3vMvoR">
+                              <node concept="2c44te" id="6Dg__VK8Nfd" role="lGtFl">
+                                <node concept="1Ft4W6" id="6Dg__VK8Nhj" role="2c44t1">
+                                  <node concept="a7P8L" id="6Dg__VK8S4S" role="1FtiSR">
+                                    <ref role="a7OzE" node="6Dg__VK8Mla" resolve="DNode" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="6Dg__VK8MUV" role="3A8wtg">
+                        <ref role="a7OzE" node="6Dg__VK8LcO" resolve="Node" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6Dg__VK8MMt" role="3cqZAp" />
+      </node>
+    </node>
+  </node>
+  <node concept="AVZre" id="5X1yxJH_zpX">
+    <property role="TrG5h" value="ExpectType" />
+    <ref role="2YbDB9" to="kqnc:2J$kxDHIJYU" resolve="ExpectType" />
+    <node concept="1nLNMY" id="12QmIo_7seY" role="1nK1Vg">
+      <property role="TrG5h" value="expect_typeOf_logicalItem" />
+      <node concept="3clFbS" id="12QmIo_7seZ" role="1nLNMH">
+        <node concept="1nLNNL" id="12QmIo_7sf0" role="3cqZAp">
+          <node concept="1nLNMm" id="12QmIo_7sf1" role="1nLNNK">
+            <node concept="3Aq93q" id="20Zoq4kTODB" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="4nIWweBEY4u" role="3Ip0Jz">
+                <node concept="3I6s7M" id="4nIWweBEY4v" role="3I6sU7">
+                  <node concept="3Aqt3T" id="20Zoq4kTOWU" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:20Zoq4kTOFb" resolve="recoverAll" />
+                    <node concept="a7P8L" id="5fMWD6H$68P" role="3AunhB">
+                      <ref role="a7OzE" node="5fMWD6H$66C" resolve="TypesUpdate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="5fMWD6H$66B" role="0Rg$4">
+              <node concept="aZer4" id="5fMWD6H$66C" role="3XD1gS">
+                <property role="TrG5h" value="TypesUpdate" />
+              </node>
+              <node concept="3uibUv" id="5fMWD6HQXZl" role="3vLBG7">
+                <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                <node concept="2sp9CU" id="5fMWD6HQXZm" role="11_B2D" />
+                <node concept="3Tqbb2" id="5fMWD6HQXZn" role="11_B2D" />
+              </node>
+            </node>
+            <node concept="3NuqgR" id="20Zoq4kTODF" role="0Rg$4">
+              <node concept="aZer4" id="20Zoq4kTODG" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="32pEOW" id="24ciDNzxNHm" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="6E2cNicdilW" role="3xSepv">
+              <node concept="3Aq9E8" id="20Zoq4kTOEi" role="3xSepj">
+                <node concept="3I6sU6" id="4nIWweBEY51" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="4nIWweBEY52" role="3I6sU7">
+                    <node concept="3Aqt3T" id="20Zoq4kTOEw" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:35YJGAJTRng" resolve="expectType" />
+                      <node concept="37jhX" id="1TH_SRmhruv" role="3AunhB">
+                        <node concept="3A2sRY" id="35YJGAJTTpz" role="37jj2">
+                          <ref role="3A2yKK" node="20Zoq4kTOD0" resolve="lit" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="6QbNnfq3aV8" role="3AunhB">
+                        <ref role="a7OzE" node="5fMWD6H$66C" resolve="TypesUpdate" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="20Zoq4kTOCM" role="1nLNMg">
+        <ref role="2t_S0q" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
+        <node concept="3A20r5" id="20Zoq4kTOD0" role="2t_VXX">
+          <property role="TrG5h" value="lit" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="5X1yxJH__SD" role="1nK1Vg">
+      <property role="TrG5h" value="expect_typeOf_logicalVarDecl" />
+      <node concept="3clFbS" id="5X1yxJH__SE" role="1nLNMH">
+        <node concept="1nLNNL" id="5X1yxJH__SF" role="3cqZAp">
+          <node concept="1nLNMm" id="5X1yxJH__SG" role="1nLNNK">
+            <node concept="3Aq93q" id="5X1yxJH__SH" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="5X1yxJH__SI" role="3Ip0Jz">
+                <node concept="3I6s7M" id="5X1yxJH__SJ" role="3I6sU7">
+                  <node concept="3Aqt3T" id="5X1yxJH__SK" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:20Zoq4kTOFb" resolve="recoverAll" />
+                    <node concept="a7P8L" id="5X1yxJH__SL" role="3AunhB">
+                      <ref role="a7OzE" node="5X1yxJH__SN" resolve="TypesUpdate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="5X1yxJH__SM" role="0Rg$4">
+              <node concept="aZer4" id="5X1yxJH__SN" role="3XD1gS">
+                <property role="TrG5h" value="TypesUpdate" />
+              </node>
+              <node concept="3uibUv" id="5X1yxJH__SO" role="3vLBG7">
+                <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                <node concept="2sp9CU" id="5X1yxJH__SP" role="11_B2D" />
+                <node concept="3Tqbb2" id="5X1yxJH__SQ" role="11_B2D" />
+              </node>
+            </node>
+            <node concept="3NuqgR" id="5X1yxJH__SR" role="0Rg$4">
+              <node concept="aZer4" id="5X1yxJH__SS" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="32pEOW" id="5X1yxJH__ST" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="5X1yxJH__SU" role="3xSepv">
+              <node concept="3Aq9E8" id="5X1yxJH__SV" role="3xSepj">
+                <node concept="3I6sU6" id="5X1yxJH__SW" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="5X1yxJH__SX" role="3I6sU7">
+                    <node concept="3Aqt3T" id="5X1yxJH__SY" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:35YJGAJTRng" resolve="expectType" />
+                      <node concept="37jhX" id="5X1yxJH__SZ" role="3AunhB">
+                        <node concept="3A2sRY" id="5X1yxJH__T0" role="37jj2">
+                          <ref role="3A2yKK" node="5X1yxJH__T3" resolve="lvd" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="5X1yxJH__T1" role="3AunhB">
+                        <ref role="a7OzE" node="5X1yxJH__SN" resolve="TypesUpdate" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="5X1yxJH__T2" role="1nLNMg">
+        <ref role="2t_S0q" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+        <node concept="3A20r5" id="5X1yxJH__T3" role="2t_VXX">
+          <property role="TrG5h" value="lvd" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="5X1yxJH_Ayi" role="1nK1Vg">
+      <property role="TrG5h" value="expect_typeOf_logicalVar" />
+      <node concept="3clFbS" id="5X1yxJH_Ayj" role="1nLNMH">
+        <node concept="1nLNNL" id="5X1yxJH_Ayk" role="3cqZAp">
+          <node concept="1nLNMm" id="5X1yxJH_Ayl" role="1nLNNK">
+            <node concept="3Aq93q" id="5X1yxJH_Aym" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="5X1yxJH_Ayn" role="3Ip0Jz">
+                <node concept="3I6s7M" id="5X1yxJH_Ayo" role="3I6sU7">
+                  <node concept="3Aqt3T" id="5X1yxJH_Ayp" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:20Zoq4kTOFb" resolve="recoverAll" />
+                    <node concept="a7P8L" id="5X1yxJH_Ayq" role="3AunhB">
+                      <ref role="a7OzE" node="5X1yxJH_Ays" resolve="TypesUpdate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="5X1yxJH_Ayr" role="0Rg$4">
+              <node concept="aZer4" id="5X1yxJH_Ays" role="3XD1gS">
+                <property role="TrG5h" value="TypesUpdate" />
+              </node>
+              <node concept="3uibUv" id="5X1yxJH_Ayt" role="3vLBG7">
+                <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                <node concept="2sp9CU" id="5X1yxJH_Ayu" role="11_B2D" />
+                <node concept="3Tqbb2" id="q1hCiyb545" role="11_B2D" />
+              </node>
+            </node>
+            <node concept="3NuqgR" id="5X1yxJH_Ayw" role="0Rg$4">
+              <node concept="aZer4" id="5X1yxJH_Ayx" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="32pEOW" id="5X1yxJH_Ayy" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="5X1yxJH_Ayz" role="3xSepv">
+              <node concept="3Aq9E8" id="5X1yxJH_Ay$" role="3xSepj">
+                <node concept="3I6sU6" id="5X1yxJH_Ay_" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="5X1yxJH_AyA" role="3I6sU7">
+                    <node concept="3Aqt3T" id="5X1yxJH_AyB" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:35YJGAJTRng" resolve="expectType" />
+                      <node concept="37jhX" id="5X1yxJH_AyC" role="3AunhB">
+                        <node concept="3A2sRY" id="5X1yxJH_AyD" role="37jj2">
+                          <ref role="3A2yKK" node="5X1yxJH_AyG" resolve="lv" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="5X1yxJH_AyE" role="3AunhB">
+                        <ref role="a7OzE" node="5X1yxJH_Ays" resolve="TypesUpdate" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="5X1yxJH_AyF" role="1nLNMg">
+        <ref role="2t_S0q" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
+        <node concept="3A20r5" id="5X1yxJH_AyG" role="2t_VXX">
+          <property role="TrG5h" value="lv" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="35YJGAJTRFo" role="1nK1Vg">
+      <property role="TrG5h" value="typeOf_logicalItem" />
+      <node concept="3clFbS" id="35YJGAJTRFp" role="1nLNMH">
+        <node concept="1nLNNL" id="35YJGAJTRFq" role="3cqZAp">
+          <node concept="1nLNMm" id="35YJGAJTRFr" role="1nLNNK">
+            <node concept="3Aq93q" id="35YJGAJTRFy" role="1nLNMb">
+              <property role="3ArMco" value="false" />
+              <node concept="3I6sU6" id="35YJGAJTRFz" role="3Ip0Jz">
+                <node concept="3I6s7M" id="35YJGAJTRF$" role="3I6sU7">
+                  <node concept="3Aqt3T" id="35YJGAJTRTn" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:35YJGAJTRng" resolve="expectType" />
+                    <node concept="37jhX" id="1TH_SRmhruz" role="3AunhB">
+                      <node concept="3A2sRY" id="35YJGAJTUjl" role="37jj2">
+                        <ref role="3A2yKK" node="35YJGAJTRFW" resolve="lit" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="6QbNnfq3d6Z" role="3AunhB">
+                      <ref role="a7OzE" node="6QbNnfq3aCy" resolve="TypesUpdate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq93q" id="35YJGAJTRTq" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="35YJGAJTRTr" role="3Ip0Jz">
+                <node concept="3I6s7M" id="35YJGAJTRFA" role="3I6sU7">
+                  <node concept="3Aqt3T" id="35YJGAJTRFB" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                    <node concept="37jhX" id="1TH_SRmhru$" role="3AunhB">
+                      <node concept="3A2sRY" id="35YJGAJTRFD" role="37jj2">
+                        <ref role="3A2yKK" node="35YJGAJTRFW" resolve="lit" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="35YJGAJTRFE" role="3AunhB">
+                      <ref role="a7OzE" node="35YJGAJTRFx" resolve="Type" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="6QbNnfq3aCx" role="0Rg$4">
+              <node concept="aZer4" id="6QbNnfq3aCy" role="3XD1gS">
+                <property role="TrG5h" value="TypesUpdate" />
+              </node>
+              <node concept="3uibUv" id="6QbNnfq3aCz" role="3vLBG7">
+                <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                <node concept="2sp9CU" id="6QbNnfq3aC$" role="11_B2D" />
+                <node concept="3Tqbb2" id="q1hCixQWcd" role="11_B2D" />
+              </node>
+            </node>
+            <node concept="3NuqgR" id="35YJGAJTRFt" role="0Rg$4">
+              <node concept="aZer4" id="35YJGAJTRFu" role="3XD1gS">
+                <property role="TrG5h" value="Node" />
+              </node>
+              <node concept="3Tqbb2" id="35YJGAJTRFv" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="35YJGAJTRFw" role="0Rg$4">
+              <node concept="aZer4" id="35YJGAJTRFx" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="32pEOW" id="24ciDNzxNHq" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="6E2cNicdim0" role="3xSepv">
+              <node concept="3Aq9E8" id="35YJGAJTRFF" role="3xSepj">
+                <node concept="3I6sU6" id="35YJGAJTRFG" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="35YJGAJTRFH" role="3I6sU7">
+                    <node concept="3Aqt3T" id="35YJGAJTRFI" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:6Qzc0KyJGJT" resolve="recover" />
+                      <node concept="a7P8L" id="35YJGAJTRFJ" role="3AunhB">
+                        <ref role="a7OzE" node="35YJGAJTRFu" resolve="Node" />
+                      </node>
+                      <node concept="a7P8L" id="35YJGAJTRFK" role="3AunhB">
+                        <ref role="a7OzE" node="35YJGAJTRFx" resolve="Type" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="6QbNnfq3bZU" role="3I6sU7">
+                    <node concept="3wWvb2" id="5fMWD6H$6lB" role="3I6s78">
+                      <node concept="2OqwBi" id="5fMWD6Im8AZ" role="3wWo3s">
+                        <node concept="liA8E" id="5fMWD6Im8XT" role="2OqNvi">
+                          <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
+                          <node concept="2OqwBi" id="5fMWD6Im95t" role="37wK5m">
+                            <node concept="3A2sRY" id="5fMWD6Im95u" role="2Oq$k0">
+                              <ref role="3A2yKK" node="35YJGAJTRFW" resolve="lit" />
+                            </node>
+                            <node concept="iZEcu" id="5fMWD6Im95v" role="2OqNvi" />
+                          </node>
+                          <node concept="1Ft4W6" id="7zIaaskbYIx" role="37wK5m">
+                            <node concept="a7P8L" id="5fMWD6Im9qi" role="1FtiSR">
+                              <ref role="a7OzE" node="35YJGAJTRFu" resolve="Node" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYIw" role="2Oq$k0">
+                          <node concept="a7P8L" id="14oWJ2NKUXo" role="1FtiSR">
+                            <ref role="a7OzE" node="6QbNnfq3aCy" resolve="TypesUpdate" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="14oWJ2N$ypW" role="3cqZAp" />
+      </node>
+      <node concept="2t___k" id="35YJGAJTRFV" role="1nLNMg">
+        <ref role="2t_S0q" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
+        <node concept="3A20r5" id="35YJGAJTRFW" role="2t_VXX">
+          <property role="TrG5h" value="lit" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="14oWJ2Nxubj" role="1nK1Vg">
+      <property role="TrG5h" value="typeOf_logicalVarDecl" />
+      <node concept="3clFbS" id="14oWJ2Nxubk" role="1nLNMH">
+        <node concept="1nLNNL" id="14oWJ2Nxubl" role="3cqZAp">
+          <node concept="1nLNMm" id="14oWJ2Nxubm" role="1nLNNK">
+            <node concept="3Aq93q" id="14oWJ2Nxubn" role="1nLNMb">
+              <property role="3ArMco" value="false" />
+              <node concept="3I6sU6" id="14oWJ2Nxubo" role="3Ip0Jz">
+                <node concept="3I6s7M" id="14oWJ2Nxubp" role="3I6sU7">
+                  <node concept="3Aqt3T" id="14oWJ2Nxubq" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:35YJGAJTRng" resolve="expectType" />
+                    <node concept="37jhX" id="14oWJ2Nxubr" role="3AunhB">
+                      <node concept="3A2sRY" id="14oWJ2Nxubs" role="37jj2">
+                        <ref role="3A2yKK" node="14oWJ2Nxuc3" resolve="lvd" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="14oWJ2Nxubt" role="3AunhB">
+                      <ref role="a7OzE" node="14oWJ2NxubA" resolve="TypesUpdate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq93q" id="14oWJ2Nxubu" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="14oWJ2Nxubv" role="3Ip0Jz">
+                <node concept="3I6s7M" id="14oWJ2Nxubw" role="3I6sU7">
+                  <node concept="3Aqt3T" id="14oWJ2Nxubx" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                    <node concept="37jhX" id="14oWJ2Nxuby" role="3AunhB">
+                      <node concept="3A2sRY" id="14oWJ2Nxubz" role="37jj2">
+                        <ref role="3A2yKK" node="14oWJ2Nxuc3" resolve="lvd" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="14oWJ2Nxub$" role="3AunhB">
+                      <ref role="a7OzE" node="14oWJ2NxubI" resolve="Type" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="14oWJ2Nxub_" role="0Rg$4">
+              <node concept="aZer4" id="14oWJ2NxubA" role="3XD1gS">
+                <property role="TrG5h" value="TypesUpdate" />
+              </node>
+              <node concept="3uibUv" id="14oWJ2NxubB" role="3vLBG7">
+                <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                <node concept="2sp9CU" id="14oWJ2NxubC" role="11_B2D" />
+                <node concept="3Tqbb2" id="Q_4x90cBck" role="11_B2D" />
+              </node>
+            </node>
+            <node concept="3NuqgR" id="14oWJ2NxubE" role="0Rg$4">
+              <node concept="aZer4" id="14oWJ2NxubF" role="3XD1gS">
+                <property role="TrG5h" value="Node" />
+              </node>
+              <node concept="3Tqbb2" id="14oWJ2NxubG" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="14oWJ2NxubH" role="0Rg$4">
+              <node concept="aZer4" id="14oWJ2NxubI" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="32pEOW" id="14oWJ2NxubJ" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="14oWJ2NxubK" role="3xSepv">
+              <node concept="3Aq9E8" id="14oWJ2NxubL" role="3xSepj">
+                <node concept="3I6sU6" id="14oWJ2NxubM" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="14oWJ2NxubN" role="3I6sU7">
+                    <node concept="3Aqt3T" id="14oWJ2NxubO" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:6Qzc0KyJGJT" resolve="recover" />
+                      <node concept="a7P8L" id="14oWJ2NxubP" role="3AunhB">
+                        <ref role="a7OzE" node="14oWJ2NxubF" resolve="Node" />
+                      </node>
+                      <node concept="a7P8L" id="14oWJ2NxubQ" role="3AunhB">
+                        <ref role="a7OzE" node="14oWJ2NxubI" resolve="Type" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="14oWJ2NxubR" role="3I6sU7">
+                    <node concept="3wWvb2" id="14oWJ2NxubS" role="3I6s78">
+                      <node concept="2OqwBi" id="14oWJ2NxubT" role="3wWo3s">
+                        <node concept="liA8E" id="14oWJ2NxubU" role="2OqNvi">
+                          <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
+                          <node concept="2OqwBi" id="14oWJ2NxubV" role="37wK5m">
+                            <node concept="3A2sRY" id="14oWJ2NxubW" role="2Oq$k0">
+                              <ref role="3A2yKK" node="14oWJ2Nxuc3" resolve="lvd" />
+                            </node>
+                            <node concept="iZEcu" id="14oWJ2NxubX" role="2OqNvi" />
+                          </node>
+                          <node concept="1Ft4W6" id="14oWJ2NxubY" role="37wK5m">
+                            <node concept="a7P8L" id="14oWJ2NxubZ" role="1FtiSR">
+                              <ref role="a7OzE" node="14oWJ2NxubF" resolve="Node" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="1Ft4W6" id="14oWJ2Nxuc0" role="2Oq$k0">
+                          <node concept="a7P8L" id="14oWJ2Nxuc1" role="1FtiSR">
+                            <ref role="a7OzE" node="14oWJ2NxubA" resolve="TypesUpdate" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="14oWJ2Nxuc2" role="1nLNMg">
+        <ref role="2t_S0q" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+        <node concept="3A20r5" id="14oWJ2Nxuc3" role="2t_VXX">
+          <property role="TrG5h" value="lvd" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="14oWJ2NxwyB" role="1nK1Vg">
+      <property role="TrG5h" value="typeOf_logicalVar" />
+      <node concept="3clFbS" id="14oWJ2NxwyC" role="1nLNMH">
+        <node concept="1nLNNL" id="14oWJ2NxwyD" role="3cqZAp">
+          <node concept="1nLNMm" id="14oWJ2NxwyE" role="1nLNNK">
+            <node concept="3Aq93q" id="14oWJ2NxwyF" role="1nLNMb">
+              <property role="3ArMco" value="false" />
+              <node concept="3I6sU6" id="14oWJ2NxwyG" role="3Ip0Jz">
+                <node concept="3I6s7M" id="14oWJ2NxwyH" role="3I6sU7">
+                  <node concept="3Aqt3T" id="14oWJ2NxwyI" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:35YJGAJTRng" resolve="expectType" />
+                    <node concept="37jhX" id="14oWJ2NxwyJ" role="3AunhB">
+                      <node concept="3A2sRY" id="14oWJ2NxwyK" role="37jj2">
+                        <ref role="3A2yKK" node="14oWJ2Nxwzn" resolve="lvd" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="14oWJ2NxwyL" role="3AunhB">
+                      <ref role="a7OzE" node="14oWJ2NxwyU" resolve="TypesUpdate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq93q" id="14oWJ2NxwyM" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="14oWJ2NxwyN" role="3Ip0Jz">
+                <node concept="3I6s7M" id="14oWJ2NxwyO" role="3I6sU7">
+                  <node concept="3Aqt3T" id="14oWJ2NxwyP" role="3I6s78">
+                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                    <node concept="37jhX" id="14oWJ2NxwyQ" role="3AunhB">
+                      <node concept="3A2sRY" id="14oWJ2NxwyR" role="37jj2">
+                        <ref role="3A2yKK" node="14oWJ2Nxwzn" resolve="lvd" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="14oWJ2NxwyS" role="3AunhB">
+                      <ref role="a7OzE" node="14oWJ2Nxwz2" resolve="Type" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="14oWJ2NxwyT" role="0Rg$4">
+              <node concept="aZer4" id="14oWJ2NxwyU" role="3XD1gS">
+                <property role="TrG5h" value="TypesUpdate" />
+              </node>
+              <node concept="3uibUv" id="14oWJ2NxwyV" role="3vLBG7">
+                <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                <node concept="2sp9CU" id="14oWJ2NxwyW" role="11_B2D" />
+                <node concept="3Tqbb2" id="14oWJ2NxwyX" role="11_B2D" />
+              </node>
+            </node>
+            <node concept="3NuqgR" id="14oWJ2NxwyY" role="0Rg$4">
+              <node concept="aZer4" id="14oWJ2NxwyZ" role="3XD1gS">
+                <property role="TrG5h" value="Node" />
+              </node>
+              <node concept="3Tqbb2" id="14oWJ2Nxwz0" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="14oWJ2Nxwz1" role="0Rg$4">
+              <node concept="aZer4" id="14oWJ2Nxwz2" role="3XD1gS">
+                <property role="TrG5h" value="Type" />
+              </node>
+              <node concept="32pEOW" id="14oWJ2Nxwz3" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="14oWJ2Nxwz4" role="3xSepv">
+              <node concept="3Aq9E8" id="14oWJ2Nxwz5" role="3xSepj">
+                <node concept="3I6sU6" id="14oWJ2Nxwz6" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="14oWJ2Nxwz7" role="3I6sU7">
+                    <node concept="3Aqt3T" id="14oWJ2Nxwz8" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:6Qzc0KyJGJT" resolve="recover" />
+                      <node concept="a7P8L" id="14oWJ2Nxwz9" role="3AunhB">
+                        <ref role="a7OzE" node="14oWJ2NxwyZ" resolve="Node" />
+                      </node>
+                      <node concept="a7P8L" id="14oWJ2Nxwza" role="3AunhB">
+                        <ref role="a7OzE" node="14oWJ2Nxwz2" resolve="Type" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="14oWJ2Nxwzb" role="3I6sU7">
+                    <node concept="3wWvb2" id="14oWJ2Nxwzc" role="3I6s78">
+                      <node concept="2OqwBi" id="14oWJ2Nxwzd" role="3wWo3s">
+                        <node concept="liA8E" id="14oWJ2Nxwze" role="2OqNvi">
+                          <ref role="37wK5l" to="82uw:~BiConsumer.accept(java.lang.Object,java.lang.Object)" resolve="accept" />
+                          <node concept="2OqwBi" id="14oWJ2Nxwzf" role="37wK5m">
+                            <node concept="3A2sRY" id="14oWJ2Nxwzg" role="2Oq$k0">
+                              <ref role="3A2yKK" node="14oWJ2Nxwzn" resolve="lvd" />
+                            </node>
+                            <node concept="iZEcu" id="14oWJ2Nxwzh" role="2OqNvi" />
+                          </node>
+                          <node concept="1Ft4W6" id="14oWJ2Nxwzi" role="37wK5m">
+                            <node concept="a7P8L" id="14oWJ2Nxwzj" role="1FtiSR">
+                              <ref role="a7OzE" node="14oWJ2NxwyZ" resolve="Node" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="1Ft4W6" id="14oWJ2Nxwzk" role="2Oq$k0">
+                          <node concept="a7P8L" id="14oWJ2Nxwzl" role="1FtiSR">
+                            <ref role="a7OzE" node="14oWJ2NxwyU" resolve="TypesUpdate" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="14oWJ2Nxwzm" role="1nLNMg">
+        <ref role="2t_S0q" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
+        <node concept="3A20r5" id="14oWJ2Nxwzn" role="2t_VXX">
+          <property role="TrG5h" value="lvd" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>