From a1c98b5bf0d8ad76936a479ba0ec04eb4be42eba Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Mon, 13 Apr 2020 12:54:58 +0200
Subject: [PATCH] Apply all outstanding migrations.

---
 .../generator/template/main@generator.mps     |   2 +-
 .../jetbrains.mps.lang.coderules.mpl          |   4 +-
 .../languageModels/typesystem.mps             |   2 +-
 .../jetbrains.mps.lang.coderules.runtime.msd  |   2 +-
 .../jetbrains.mps.lang.coderules.eval.mps     |   2 +-
 .../jetbrains.mps.lang.coderules.program.mps  |   2 +-
 .../generator/template/main@generator.mps     |   2 +-
 .../jetbrains.mps.logic.mpl                   |   2 +-
 .../jetbrains.mps.typechecking.annotation.mpl |   2 +-
 .../jetbrains.mps.typechecking.testlang.mpl   |   2 +-
 .../models/types.mps                          |   2 +-
 ...brains.mps.coderules.typechecking.test.msd |   2 +-
 ...ins.mps.coderules.incrementality@tests.mps |   2 +-
 ...rains.mps.coderules.typechecking@tests.mps |   4 +-
 .../jetbrains.mps.lang.coderules.template.msd |   2 +-
 .../jetbrains.mps.lang.coderules.macro.mps    |   2 +-
 .../jetbrains.mps.lang.coderules.template.mps |   2 +-
 .../jetbrains.mps.logic.test.msd              |   2 +-
 .../mps/logic/test/logical@tests.mps          |   2 +-
 .../jetbrains/mps/logic/test/unification.mps  |   2 +-
 .../mps/logic/test/unification@tests.mps      |  69 +--
 .../models/types.mps                          |   2 +-
 .../samples.fitch.firstOrderLogic.mpl         |   2 +-
 .../models/types.mps                          |   2 +-
 .../samples.fitch.herbrandLogic.mpl           |   2 +-
 .../models/types.mps                          |   2 +-
 .../samples.fitch.propositionalLogic.mpl      |   2 +-
 .../languages/samples.fitch/models/types.mps  |   2 +-
 .../languages/samples.fitch/samples.fitch.mpl |   2 +-
 .../samples.lambdacalc/models/types.mps       |  25 +-
 .../samples.lambdacalc/samples.lambdacalc.mpl |   2 +-
 .../jetbrains.mps.baseLanguage.javadocExt.mpl |   2 +-
 .../jetbrains.mps.baseLanguage.tuplesExt.mpl  |   2 +-
 ...rains.mps.baseLanguage.tuplesExt.types.mps |   2 +-
 .../jetbrains.mps.baseLanguageExt.mpl         |   2 +-
 .../models/controlflow.mps                    |   2 +-
 .../jetbrains.mps.baseLanguageExt.types.mps   | 443 +++++++-----------
 .../jetbrains.mps.baseLanguageExt.test.msd    |   2 +-
 ...s.mps.baseLanguageExt.test.types@tests.mps |   2 +-
 39 files changed, 262 insertions(+), 351 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 839bbef1..92111a54 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -7,7 +7,7 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="-1" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
     <use id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7" version="-1" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="-1" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
index 89c30a43..4c4d7ee1 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
+++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
@@ -54,7 +54,7 @@
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
-        <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+        <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
       </languageVersions>
       <dependencyVersions>
         <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -159,7 +159,7 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
     <language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util.order" version="0" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
     <language slang="l:696c1165-4a59-463b-bc5d-902caab85dd0:jetbrains.mps.make.facet" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
index 66bd2444..a387b052 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
@@ -2,7 +2,7 @@
 <model ref="r:6a6b9246-6407-4ef2-8408-df149f70bcd9(jetbrains.mps.lang.coderules.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd b/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
index 757f37fa..299f3f7e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
@@ -33,7 +33,7 @@
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
     <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 4bfde3d8..030e27b8 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -10,7 +10,7 @@
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index 7a7b10e3..55d11e27 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -11,7 +11,7 @@
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index c6f0fd46..6acfb4f0 100644
--- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -9,7 +9,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
diff --git a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index 3e78eebf..23956bfc 100644
--- a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -49,7 +49,7 @@
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
-        <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="10" />
+        <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
       </languageVersions>
       <dependencyVersions>
         <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl b/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
index a2974a6a..a4d8a750 100644
--- a/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
+++ b/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
@@ -55,7 +55,7 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
index bef45cc6..82c241ed 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
@@ -109,7 +109,7 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index ac4f43a0..b15ed2b2 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -6,7 +6,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="-1" />
     <engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
index 82fd5d2b..1fbde3da 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
@@ -49,7 +49,7 @@
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
     <language slang="l:3a1f0f04-b5e0-43be-884e-b856bfdeca21:jetbrains.mps.typechecking.testlang" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
index 774c84df..c42f0d13 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
@@ -10,7 +10,7 @@
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="-1" />
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="20" />
     <use id="3a1f0f04-b5e0-43be-884e-b856bfdeca21" name="jetbrains.mps.typechecking.testlang" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index a813d5e9..e37000ec 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -16,7 +16,7 @@
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <use id="3a1f0f04-b5e0-43be-884e-b856bfdeca21" name="jetbrains.mps.typechecking.testlang" version="0" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -957,7 +957,7 @@
                                   <ref role="3cqZAo" node="4ekZiHec9__" resolve="a" />
                                 </node>
                                 <node concept="liA8E" id="4ekZiHec9_l" role="2OqNvi">
-                                  <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmtpy" />
+                                  <ref role="37wK5l" to="fqlx:4ekZiHe4j$O" resolve="isEmpty" />
                                 </node>
                               </node>
                             </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd b/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
index b6dbc09c..6bc50ff3 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
@@ -32,7 +32,7 @@
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
index 4e17c683..e6112f0a 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
@@ -6,7 +6,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
   </languages>
   <imports>
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index c7e3583d..48570680 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -9,7 +9,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
   </languages>
   <imports>
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
diff --git a/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd b/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
index c38d4c0a..b387ad49 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
+++ b/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
@@ -39,7 +39,7 @@
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
   </languageVersions>
   <dependencyVersions>
     <module reference="1fd846c3-c5f9-4b9e-9ecc-e716f7149f86(Hamcrest)" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
index 684ef04b..aec2004b 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
index 9db4da76..89518466 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="5dc5fc0d-37ef-4782-8192-8b5ce1f69f80" name="jetbrains.mps.baseLanguage.extensionMethods" version="0" />
   </languages>
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
index f8384718..83f64663 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="5dc5fc0d-37ef-4782-8192-8b5ce1f69f80" name="jetbrains.mps.baseLanguage.extensionMethods" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
@@ -194,8 +194,9 @@
       <concept id="7571593955706137573" name="jetbrains.mps.logic.structure.Value" flags="ng" index="1oi5XN">
         <property id="7571593955706137638" name="value" index="1oi5yK" />
       </concept>
-      <concept id="960803923481532811" name="jetbrains.mps.logic.structure.ListNodeCons" flags="ng" index="3wJAYo">
-        <child id="960803923481835574" name="tail" index="3wIGS_" />
+      <concept id="1432138691741609740" name="jetbrains.mps.logic.structure.ConsListNode" flags="ng" index="1Pxxm1">
+        <child id="1432138691741609741" name="head" index="1Pxxm0" />
+        <child id="1432138691741609743" name="tail" index="1Pxxm2" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -1894,8 +1895,8 @@
                 <node concept="1oi5UN" id="3zXFZnUACfC" role="1oi0x0">
                   <node concept="1oi5ST" id="3zXFZnUADaI" role="1ojpOf">
                     <property role="TrG5h" value="child" />
-                    <node concept="3wJAYo" id="3zXFZnUADHd" role="1oi5TL">
-                      <node concept="1oi5UN" id="3zXFZnUAEqU" role="KCVpo">
+                    <node concept="1Pxxm1" id="7L5omgek1om" role="1oi5TL">
+                      <node concept="1oi5UN" id="3zXFZnUAEqU" role="1Pxxm0">
                         <node concept="1oi5Wm" id="3zXFZnUAEqV" role="1ojpOf">
                           <property role="TrG5h" value="name" />
                           <node concept="1oi5XN" id="3zXFZnUAEqW" role="1oi5zu">
@@ -1903,7 +1904,7 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="1oi5UN" id="3zXFZnUAEA$" role="KCVpo">
+                      <node concept="1oi5UN" id="3zXFZnUAEA$" role="1Pxxm0">
                         <node concept="1oi5Wm" id="3zXFZnUAEA_" role="1ojpOf">
                           <property role="TrG5h" value="name" />
                           <node concept="1oi5XN" id="3zXFZnUAEAA" role="1oi5zu">
@@ -1911,7 +1912,7 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="KCUsM" id="3zXFZnUAG8_" role="3wIGS_">
+                      <node concept="KCUsM" id="3zXFZnUAG8_" role="1Pxxm2">
                         <node concept="22Ky0T" id="3zXFZnUAGcC" role="lGtFl">
                           <node concept="1rXfSq" id="3zXFZnUAGkK" role="22Ky0K">
                             <ref role="37wK5l" node="1POzLwzc6O6" resolve="wildcard" />
@@ -2011,8 +2012,8 @@
                 <node concept="1oi5UN" id="68ncUim6KYH" role="1oi0x0">
                   <node concept="1oi5ST" id="68ncUim6LGq" role="1ojpOf">
                     <property role="TrG5h" value="child" />
-                    <node concept="3wJAYo" id="68ncUimaIH1" role="1oi5TL">
-                      <node concept="2IllgU" id="68ncUimaII9" role="3wIGS_" />
+                    <node concept="1Pxxm1" id="7L5omgek1on" role="1oi5TL">
+                      <node concept="2IllgU" id="68ncUimaII9" role="1Pxxm2" />
                     </node>
                   </node>
                   <node concept="1oi5Wm" id="68ncUim6KYN" role="1ojpOf">
@@ -2193,15 +2194,15 @@
               <node concept="1oi1Uc" id="3zXFZnUEJSJ" role="33vP2m">
                 <node concept="1oi5ST" id="3zXFZnUEKk7" role="1oi0x0">
                   <property role="TrG5h" value="list" />
-                  <node concept="3wJAYo" id="3zXFZnUEKu_" role="1oi5TL">
-                    <node concept="1oi5UN" id="3zXFZnUEKCE" role="KCVpo">
+                  <node concept="1Pxxm1" id="7L5omgek1oo" role="1oi5TL">
+                    <node concept="1oi5UN" id="3zXFZnUEKCE" role="1Pxxm0">
                       <node concept="22Ky0T" id="3zXFZnUEKH0" role="lGtFl">
                         <node concept="37vLTw" id="3zXFZnUEKLd" role="22Ky0K">
                           <ref role="3cqZAo" node="5_6ImQYXM2W" resolve="head" />
                         </node>
                       </node>
                     </node>
-                    <node concept="KCUsM" id="3zXFZnUEKT_" role="3wIGS_">
+                    <node concept="KCUsM" id="3zXFZnUEKT_" role="1Pxxm2">
                       <node concept="22Ky0T" id="3zXFZnUEKXV" role="lGtFl">
                         <node concept="37vLTw" id="3zXFZnUEL2g" role="22Ky0K">
                           <ref role="3cqZAo" node="5_6ImQYXM86" resolve="tail" />
@@ -2384,15 +2385,15 @@
               <node concept="1oi1Uc" id="3zXFZnUEMwZ" role="33vP2m">
                 <node concept="1oi5ST" id="3zXFZnUEMx0" role="1oi0x0">
                   <property role="TrG5h" value="list" />
-                  <node concept="3wJAYo" id="3zXFZnUEMx1" role="1oi5TL">
-                    <node concept="1oi5UN" id="3zXFZnUEMx2" role="KCVpo">
+                  <node concept="1Pxxm1" id="7L5omgek1op" role="1oi5TL">
+                    <node concept="1oi5UN" id="3zXFZnUEMx2" role="1Pxxm0">
                       <node concept="22Ky0T" id="3zXFZnUEMx3" role="lGtFl">
                         <node concept="37vLTw" id="3zXFZnUEMx4" role="22Ky0K">
                           <ref role="3cqZAo" node="5_6ImQYY3rO" resolve="head" />
                         </node>
                       </node>
                     </node>
-                    <node concept="KCUsM" id="3zXFZnUEMx5" role="3wIGS_">
+                    <node concept="KCUsM" id="3zXFZnUEMx5" role="1Pxxm2">
                       <node concept="22Ky0T" id="3zXFZnUEMx6" role="lGtFl">
                         <node concept="37vLTw" id="3zXFZnUEMx7" role="22Ky0K">
                           <ref role="3cqZAo" node="5_6ImQYY3rT" resolve="tail" />
@@ -5419,8 +5420,8 @@
                 <node concept="1oi5UN" id="1OShD0Ig2iV" role="1oi0x0">
                   <node concept="1oi5ST" id="3zXFZnUs4cQ" role="1ojpOf">
                     <property role="TrG5h" value="child" />
-                    <node concept="3wJAYo" id="3zXFZnUs4cU" role="1oi5TL">
-                      <node concept="1oi5UN" id="3zXFZnUs4cY" role="KCVpo">
+                    <node concept="1Pxxm1" id="7L5omgek1oq" role="1oi5TL">
+                      <node concept="1oi5UN" id="3zXFZnUs4cY" role="1Pxxm0">
                         <node concept="1oi5Wm" id="3zXFZnUs4cZ" role="1ojpOf">
                           <property role="TrG5h" value="name" />
                           <node concept="1oi5XN" id="3zXFZnUs4d0" role="1oi5zu">
@@ -5428,7 +5429,7 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="1oi5UN" id="3zXFZnUs4d9" role="KCVpo">
+                      <node concept="1oi5UN" id="3zXFZnUs4d9" role="1Pxxm0">
                         <node concept="1oi5Wm" id="3zXFZnUs4da" role="1ojpOf">
                           <property role="TrG5h" value="name" />
                           <node concept="1oi5XN" id="3zXFZnUs4db" role="1oi5zu">
@@ -5436,7 +5437,7 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="KCUsM" id="3zXFZnUs4gv" role="3wIGS_">
+                      <node concept="KCUsM" id="3zXFZnUs4gv" role="1Pxxm2">
                         <node concept="22Ky0T" id="3zXFZnUs4gB" role="lGtFl">
                           <node concept="37vLTw" id="3zXFZnUs4SK" role="22Ky0K">
                             <ref role="3cqZAo" node="1OShD0Ig2iN" resolve="x" />
@@ -5624,8 +5625,8 @@
                 <node concept="1oi5UN" id="1OShD0Ig9wm" role="1oi0x0">
                   <node concept="1oi5ST" id="1fvYCPAk_xC" role="1ojpOf">
                     <property role="TrG5h" value="child" />
-                    <node concept="3wJAYo" id="3zXFZnUoMc$" role="1oi5TL">
-                      <node concept="1oi5UN" id="1OShD0Ig9wp" role="KCVpo">
+                    <node concept="1Pxxm1" id="7L5omgek1or" role="1oi5TL">
+                      <node concept="1oi5UN" id="1OShD0Ig9wp" role="1Pxxm0">
                         <node concept="1oi5Wm" id="1OShD0Ig9wq" role="1ojpOf">
                           <property role="TrG5h" value="name" />
                           <node concept="1oi5XN" id="1OShD0Ig9wr" role="1oi5zu">
@@ -5633,7 +5634,7 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="1oi5UN" id="1OShD0Ig9ws" role="KCVpo">
+                      <node concept="1oi5UN" id="1OShD0Ig9ws" role="1Pxxm0">
                         <node concept="1oi5Wm" id="1OShD0Ig9wt" role="1ojpOf">
                           <property role="TrG5h" value="name" />
                           <node concept="1oi5XN" id="1OShD0Ig9wu" role="1oi5zu">
@@ -5641,7 +5642,7 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="KCUsM" id="3zXFZnUs4Vk" role="3wIGS_">
+                      <node concept="KCUsM" id="3zXFZnUs4Vk" role="1Pxxm2">
                         <node concept="22Ky0T" id="3zXFZnUs4Vs" role="lGtFl">
                           <node concept="37vLTw" id="3zXFZnUs4VN" role="22Ky0K">
                             <ref role="3cqZAo" node="1OShD0IgaBV" resolve="x" />
@@ -5829,8 +5830,8 @@
                 <node concept="1oi5UN" id="68ncUima8Nm" role="1oi0x0">
                   <node concept="1oi5ST" id="68ncUima8Nn" role="1ojpOf">
                     <property role="TrG5h" value="child" />
-                    <node concept="3wJAYo" id="68ncUima93W" role="1oi5TL">
-                      <node concept="KCUsM" id="68ncUima_PJ" role="3wIGS_">
+                    <node concept="1Pxxm1" id="7L5omgek1os" role="1oi5TL">
+                      <node concept="KCUsM" id="68ncUima_PJ" role="1Pxxm2">
                         <node concept="22Ky0T" id="68ncUima_PR" role="lGtFl">
                           <node concept="37vLTw" id="68ncUima_Qe" role="22Ky0K">
                             <ref role="3cqZAo" node="1OShD0IgiMd" resolve="x" />
@@ -6020,15 +6021,15 @@
                 <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8ISEPc" role="33vP2m">
-                <node concept="3wJAYo" id="3zXFZnUoMcA" role="1oi0x0">
-                  <node concept="1oi5UN" id="4$OyT8ISEPe" role="KCVpo">
+                <node concept="1Pxxm1" id="7L5omgek1ot" role="1oi0x0">
+                  <node concept="1oi5UN" id="4$OyT8ISEPe" role="1Pxxm0">
                     <node concept="22Ky0T" id="4$OyT8ISLW$" role="lGtFl">
                       <node concept="37vLTw" id="4$OyT8ISM_B" role="22Ky0K">
                         <ref role="3cqZAo" node="4$OyT8ISnwx" resolve="head" />
                       </node>
                     </node>
                   </node>
-                  <node concept="KCUsM" id="4$OyT8ITyPr" role="3wIGS_">
+                  <node concept="KCUsM" id="4$OyT8ITyPr" role="1Pxxm2">
                     <node concept="22Ky0T" id="4$OyT8ITzw0" role="lGtFl">
                       <node concept="37vLTw" id="4$OyT8IT$b6" role="22Ky0K">
                         <ref role="3cqZAo" node="4$OyT8ISnwA" resolve="tail" />
@@ -6237,15 +6238,15 @@
                 <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8ITVLv" role="33vP2m">
-                <node concept="3wJAYo" id="3zXFZnUoMcD" role="1oi0x0">
-                  <node concept="1oi5UN" id="4$OyT8IUqH1" role="KCVpo">
+                <node concept="1Pxxm1" id="7L5omgek1ou" role="1oi0x0">
+                  <node concept="1oi5UN" id="4$OyT8IUqH1" role="1Pxxm0">
                     <node concept="22Ky0T" id="4$OyT8IUrr1" role="lGtFl">
                       <node concept="1rXfSq" id="4$OyT8IUs9O" role="22Ky0K">
                         <ref role="37wK5l" node="1POzLwzc6O6" resolve="wildcard" />
                       </node>
                     </node>
                   </node>
-                  <node concept="KCUsM" id="4$OyT8ITVL$" role="3wIGS_">
+                  <node concept="KCUsM" id="4$OyT8ITVL$" role="1Pxxm2">
                     <node concept="22Ky0T" id="4$OyT8ITVL_" role="lGtFl">
                       <node concept="37vLTw" id="4$OyT8ITVLA" role="22Ky0K">
                         <ref role="3cqZAo" node="4$OyT8ITVLo" resolve="tail1" />
@@ -6263,15 +6264,15 @@
                 <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
               </node>
               <node concept="1oi1Uc" id="4$OyT8IUeDv" role="33vP2m">
-                <node concept="3wJAYo" id="3zXFZnUoMcE" role="1oi0x0">
-                  <node concept="1oi5UN" id="4$OyT8IUuji" role="KCVpo">
+                <node concept="1Pxxm1" id="7L5omgek1ov" role="1oi0x0">
+                  <node concept="1oi5UN" id="4$OyT8IUuji" role="1Pxxm0">
                     <node concept="22Ky0T" id="4$OyT8IUv16" role="lGtFl">
                       <node concept="1rXfSq" id="4$OyT8IUvK0" role="22Ky0K">
                         <ref role="37wK5l" node="1POzLwzc6O6" resolve="wildcard" />
                       </node>
                     </node>
                   </node>
-                  <node concept="KCUsM" id="4$OyT8IUeDy" role="3wIGS_">
+                  <node concept="KCUsM" id="4$OyT8IUeDy" role="1Pxxm2">
                     <node concept="22Ky0T" id="4$OyT8IUeDz" role="lGtFl">
                       <node concept="37vLTw" id="4$OyT8IUg7Q" role="22Ky0K">
                         <ref role="3cqZAo" node="4$OyT8IUcuk" resolve="tail2" />
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
index ee478d2d..e86210f7 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="20" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
     <engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
index 57b1bd9b..879e6d94 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
@@ -111,7 +111,7 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
index 8822b41f..42cca4e5 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
@@ -5,7 +5,7 @@
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="20" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
     <engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
index 543527ff..bfacc4e2 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
@@ -112,7 +112,7 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
index ba0503c6..c192f873 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
@@ -5,7 +5,7 @@
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="20" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
     <engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
index 47301ead..fb7eae33 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
@@ -110,7 +110,7 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/samples/fitch/languages/samples.fitch/models/types.mps b/samples/fitch/languages/samples.fitch/models/types.mps
index fd64380f..62f3d2c9 100644
--- a/samples/fitch/languages/samples.fitch/models/types.mps
+++ b/samples/fitch/languages/samples.fitch/models/types.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="20" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
     <engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
diff --git a/samples/fitch/languages/samples.fitch/samples.fitch.mpl b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
index 3f161f68..445c8363 100644
--- a/samples/fitch/languages/samples.fitch/samples.fitch.mpl
+++ b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
@@ -114,7 +114,7 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 526c9688..ab2b837b 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -9,7 +9,7 @@
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="-1" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="-1" />
     <engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
@@ -236,9 +236,7 @@
       <concept id="6856711987710888499" name="jetbrains.mps.logic.structure.DataNodeLiteral" flags="ng" index="Hz6ka">
         <child id="6856711987710888500" name="root" index="Hz6kd" />
       </concept>
-      <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM">
-        <child id="2105510410850136264" name="contents" index="KCVpo" />
-      </concept>
+      <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM" />
       <concept id="2381360340662937504" name="jetbrains.mps.logic.structure.TermType" flags="ig" index="32pEOW" />
       <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
         <child id="4780620083400582654" name="logical" index="1nq8_t" />
@@ -246,12 +244,13 @@
       <concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalDataForm" flags="ng" index="3wAshV">
         <child id="960803923479549586" name="logical" index="3wAq21" />
       </concept>
-      <concept id="960803923481532811" name="jetbrains.mps.logic.structure.ListNodeCons" flags="ng" index="3wJAYo">
-        <child id="960803923481835574" name="tail" index="3wIGS_" />
-      </concept>
       <concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
         <child id="8713947027062064784" name="logical" index="1FtiSR" />
       </concept>
+      <concept id="1432138691741609740" name="jetbrains.mps.logic.structure.ConsListNode" flags="ng" index="1Pxxm1">
+        <child id="1432138691741609741" name="head" index="1Pxxm0" />
+        <child id="1432138691741609743" name="tail" index="1Pxxm2" />
+      </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">
@@ -15054,13 +15053,13 @@
                         <ref role="a7OzE" node="3vXKzDNKn5S" resolve="List" />
                       </node>
                       <node concept="Hz6ka" id="3vXKzDNKmYE" role="1uarlW">
-                        <node concept="3wJAYo" id="3zXFZnUoM8m" role="Hz6kd">
-                          <node concept="3wAshV" id="3zXFZnUhsMQ" role="KCVpo">
+                        <node concept="1Pxxm1" id="7L5omgek1kj" role="Hz6kd">
+                          <node concept="3wAshV" id="3zXFZnUhsMQ" role="1Pxxm0">
                             <node concept="a7P8L" id="3vXKzDNKn09" role="3wAq21">
                               <ref role="a7OzE" node="3vXKzDNKmUJ" resolve="Head" />
                             </node>
                           </node>
-                          <node concept="3wAshV" id="3zXFZnUhsMR" role="3wIGS_">
+                          <node concept="3wAshV" id="3zXFZnUhsMR" role="1Pxxm2">
                             <node concept="a7P8L" id="3vXKzDNKn0L" role="3wAq21">
                               <ref role="a7OzE" node="3vXKzDNKmUY" resolve="Tail" />
                             </node>
@@ -15967,8 +15966,8 @@
                   </node>
                 </node>
                 <node concept="Hz6ka" id="5itBwM9psat" role="3A8w4Q">
-                  <node concept="3wJAYo" id="5itBwM9psau" role="Hz6kd">
-                    <node concept="3wAshV" id="5itBwM9psav" role="KCVpo">
+                  <node concept="1Pxxm1" id="7L5omgek1kk" role="Hz6kd">
+                    <node concept="3wAshV" id="5itBwM9psav" role="1Pxxm0">
                       <node concept="a7P8L" id="5itBwM9psaw" role="3wAq21">
                         <ref role="a7OzE" node="5itBwM9pchU" resolve="TmpTVs" />
                         <node concept="37vLTw" id="5itBwM9psax" role="3gCZO6">
@@ -15976,7 +15975,7 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="3wAshV" id="5itBwM9psay" role="3wIGS_">
+                    <node concept="3wAshV" id="5itBwM9psay" role="1Pxxm2">
                       <node concept="a7P8L" id="5itBwM9psaz" role="3wAq21">
                         <ref role="a7OzE" node="5itBwM9przy" resolve="TailsTVs" />
                         <node concept="3cpWs3" id="5itBwM9psa$" role="3gCZO6">
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
index 2796c9d6..e89399e8 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
+++ b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
@@ -71,7 +71,7 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
     <language slang="l:af858d84-85f2-42f4-a854-0b3c6b5cd482:samples.lambdacalc" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl
index 51b41770..b2b67449 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl
@@ -58,7 +58,7 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl
index 34165928..ca6540d3 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl
@@ -100,7 +100,7 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
index 61a0b028..8e2baf59 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="20" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <engage id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
index eba94758..cb4651ef 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
@@ -60,7 +60,7 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
index 163253a3..0b602f4d 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="20" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="2e120f68-abfb-4980-bb1c-bc70159b1f95" name="jetbrains.mps.lang.controlflow" version="0" />
     <engage id="2e120f68-abfb-4980-bb1c-bc70159b1f95" name="jetbrains.mps.lang.controlflow" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 189bbdbb..86392180 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="-1" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="-1" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
@@ -428,6 +428,7 @@
       <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM">
         <child id="2105510410850136264" name="contents" index="KCVpo" />
       </concept>
+      <concept id="5042557354438383712" name="jetbrains.mps.logic.structure.TermListType" flags="ig" index="VbTHi" />
       <concept id="2381360340662937504" name="jetbrains.mps.logic.structure.TermType" flags="ig" index="32pEOW" />
       <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
         <child id="4780620083400582654" name="logical" index="1nq8_t" />
@@ -444,18 +445,22 @@
       <concept id="7571593955706137573" name="jetbrains.mps.logic.structure.Value" flags="ng" index="1oi5XN">
         <property id="7571593955706137638" name="value" index="1oi5yK" />
       </concept>
+      <concept id="4363939677057762068" name="jetbrains.mps.logic.structure.TermConstructorDataForm" flags="ng" index="3sNhsn">
+        <child id="4363939677057762080" name="constructor" index="3sNhsz" />
+      </concept>
       <concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalDataForm" flags="ng" index="3wAshV">
         <child id="960803923479549586" name="logical" index="3wAq21" />
       </concept>
-      <concept id="960803923481532811" name="jetbrains.mps.logic.structure.ListNodeCons" flags="ng" index="3wJAYo">
-        <child id="960803923481835574" name="tail" index="3wIGS_" />
-      </concept>
       <concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
         <child id="8713947027062064784" name="logical" index="1FtiSR" />
       </concept>
       <concept id="323863683626000488" name="jetbrains.mps.logic.structure.LogicalVariableRefExpression" flags="ng" index="3IkZw_">
         <child id="323863683626065704" name="logical" index="3Ikct_" />
       </concept>
+      <concept id="1432138691741609740" name="jetbrains.mps.logic.structure.ConsListNode" flags="ng" index="1Pxxm1">
+        <child id="1432138691741609741" name="head" index="1Pxxm0" />
+        <child id="1432138691741609743" name="tail" index="1Pxxm2" />
+      </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1204834851141" name="jetbrains.mps.lang.smodel.structure.PoundExpression" flags="ng" index="25Kdxt">
@@ -1166,12 +1171,10 @@
                           <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
                           <node concept="1nq8_$" id="2vhmmFsNs2M" role="nsMwV">
                             <node concept="Hz6ka" id="2vhmmFsNs2N" role="1nq8_t">
-                              <node concept="KCUsM" id="2vhmmFsNs2O" role="Hz6kd">
-                                <node concept="22Ky0T" id="2vhmmFsNs2P" role="lGtFl">
-                                  <node concept="1nq8_$" id="2vhmmFsR$B2" role="22Ky0K">
-                                    <node concept="a7P8L" id="2vhmmFsR$B0" role="1nq8_t">
-                                      <ref role="a7OzE" node="2vhmmFsR$$B" resolve="ClassP" />
-                                    </node>
+                              <node concept="1Pxxm1" id="7L5omgek1rT" role="Hz6kd">
+                                <node concept="3wAshV" id="7L5omgek1rU" role="1Pxxm2">
+                                  <node concept="a7P8L" id="2vhmmFsR$B0" role="3wAq21">
+                                    <ref role="a7OzE" node="2vhmmFsR$$B" resolve="ClassP" />
                                   </node>
                                 </node>
                               </node>
@@ -3393,12 +3396,10 @@
                               <node concept="3Aqczg" id="6_5E9TNz50w" role="3cqZAp">
                                 <node concept="3A8Hvi" id="6_5E9TNz50x" role="3Aqpz8">
                                   <node concept="Hz6ka" id="6_5E9TNz50y" role="3A8w4Q">
-                                    <node concept="KCUsM" id="6_5E9TNz50z" role="Hz6kd">
-                                      <node concept="22Ky0T" id="6_5E9TNz50$" role="lGtFl">
-                                        <node concept="1nq8_$" id="6_5E9TNz50_" role="22Ky0K">
-                                          <node concept="a7P8L" id="6_5E9TNz50A" role="1nq8_t">
-                                            <ref role="a7OzE" node="6_5E9TNz4Yt" resolve="Clss" />
-                                          </node>
+                                    <node concept="1Pxxm1" id="7L5omgek1rV" role="Hz6kd">
+                                      <node concept="3wAshV" id="7L5omgek1rW" role="1Pxxm2">
+                                        <node concept="a7P8L" id="6_5E9TNz50A" role="3wAq21">
+                                          <ref role="a7OzE" node="6_5E9TNz4Yt" resolve="Clss" />
                                         </node>
                                       </node>
                                     </node>
@@ -3439,12 +3440,10 @@
                           <node concept="3Aqczg" id="6_5E9TNz50N" role="3cqZAp">
                             <node concept="3A8Hvi" id="6_5E9TNz50O" role="3Aqpz8">
                               <node concept="Hz6ka" id="6_5E9TNz50P" role="3A8w4Q">
-                                <node concept="KCUsM" id="6_5E9TNz50Q" role="Hz6kd">
-                                  <node concept="22Ky0T" id="6_5E9TNz50R" role="lGtFl">
-                                    <node concept="1nq8_$" id="6_5E9TNz50S" role="22Ky0K">
-                                      <node concept="a7P8L" id="6_5E9TNz50T" role="1nq8_t">
-                                        <ref role="a7OzE" node="6_5E9TNz4Xe" resolve="Paths" />
-                                      </node>
+                                <node concept="1Pxxm1" id="7L5omgek1rX" role="Hz6kd">
+                                  <node concept="3wAshV" id="7L5omgek1rY" role="1Pxxm2">
+                                    <node concept="a7P8L" id="6_5E9TNz50T" role="3wAq21">
+                                      <ref role="a7OzE" node="6_5E9TNz4Xe" resolve="Paths" />
                                     </node>
                                   </node>
                                 </node>
@@ -3516,13 +3515,9 @@
                       </node>
                       <node concept="Hz6ka" id="1yt2T3T1gFp" role="1uarlW">
                         <node concept="KCUsM" id="1yt2T3T1mn0" role="Hz6kd">
-                          <node concept="1oi5UN" id="5JguS01jdD3" role="KCVpo">
-                            <node concept="22Ky0T" id="5JguS01jdD5" role="lGtFl">
-                              <node concept="1nq8_$" id="5JguS01jdDq" role="22Ky0K">
-                                <node concept="ns1u0" id="5JguS01jdDp" role="1nq8_t">
-                                  <ref role="ns1xF" node="JOGAOsVt2r" resolve="variableArity" />
-                                </node>
-                              </node>
+                          <node concept="3sNhsn" id="7L5omgek1qT" role="KCVpo">
+                            <node concept="ns1u0" id="5JguS01jdDp" role="3sNhsz">
+                              <ref role="ns1xF" node="JOGAOsVt2r" resolve="variableArity" />
                             </node>
                           </node>
                         </node>
@@ -3575,18 +3570,14 @@
                       </node>
                       <node concept="Hz6ka" id="5JguS01jdEo" role="3A8w4Q">
                         <node concept="KCUsM" id="5JguS01jdEq" role="Hz6kd">
-                          <node concept="1oi5UN" id="5JguS01jdEs" role="KCVpo">
-                            <node concept="22Ky0T" id="5JguS01jdEt" role="lGtFl">
-                              <node concept="1nq8_$" id="5JguS01jdEu" role="22Ky0K">
-                                <node concept="ns1u0" id="5JguS01jdEv" role="1nq8_t">
-                                  <ref role="ns1xF" node="JOGAOsVt2r" resolve="variableArity" />
-                                  <node concept="nsMwS" id="5JguS01jdEC" role="ns1xD">
-                                    <ref role="nsMwP" node="58JqeLuPe7r" resolve="parameter" />
-                                    <node concept="1nq8_$" id="5JguS01jdEQ" role="nsMwV">
-                                      <node concept="a7P8L" id="5JguS01jdEO" role="1nq8_t">
-                                        <ref role="a7OzE" node="1yt2T3Thlfn" resolve="P" />
-                                      </node>
-                                    </node>
+                          <node concept="3sNhsn" id="7L5omgek1qU" role="KCVpo">
+                            <node concept="ns1u0" id="5JguS01jdEv" role="3sNhsz">
+                              <ref role="ns1xF" node="JOGAOsVt2r" resolve="variableArity" />
+                              <node concept="nsMwS" id="5JguS01jdEC" role="ns1xD">
+                                <ref role="nsMwP" node="58JqeLuPe7r" resolve="parameter" />
+                                <node concept="1nq8_$" id="5JguS01jdEQ" role="nsMwV">
+                                  <node concept="a7P8L" id="5JguS01jdEO" role="1nq8_t">
+                                    <ref role="a7OzE" node="1yt2T3Thlfn" resolve="P" />
                                   </node>
                                 </node>
                               </node>
@@ -3626,13 +3617,9 @@
                       </node>
                       <node concept="Hz6ka" id="1yt2T3T1TBI" role="1uarlW">
                         <node concept="KCUsM" id="1yt2T3T$5T0" role="Hz6kd">
-                          <node concept="1oi5UN" id="5JguS01jdFy" role="KCVpo">
-                            <node concept="22Ky0T" id="5JguS01jdF$" role="lGtFl">
-                              <node concept="1nq8_$" id="5JguS01jdFB" role="22Ky0K">
-                                <node concept="ns1u0" id="5JguS01jdFA" role="1nq8_t">
-                                  <ref role="ns1xF" node="JOGAOsVt2o" resolve="array" />
-                                </node>
-                              </node>
+                          <node concept="3sNhsn" id="7L5omgek1qV" role="KCVpo">
+                            <node concept="ns1u0" id="5JguS01jdFA" role="3sNhsz">
+                              <ref role="ns1xF" node="JOGAOsVt2o" resolve="array" />
                             </node>
                           </node>
                         </node>
@@ -3676,18 +3663,14 @@
                       </node>
                       <node concept="Hz6ka" id="5JguS01jdGu" role="3A8w4Q">
                         <node concept="KCUsM" id="5JguS01jdGw" role="Hz6kd">
-                          <node concept="1oi5UN" id="5JguS01jdG$" role="KCVpo">
-                            <node concept="22Ky0T" id="5JguS01jdG_" role="lGtFl">
-                              <node concept="1nq8_$" id="5JguS01jdGA" role="22Ky0K">
-                                <node concept="ns1u0" id="5JguS01jdGB" role="1nq8_t">
-                                  <ref role="ns1xF" node="JOGAOsVt2o" resolve="array" />
-                                  <node concept="nsMwS" id="5JguS01jdGK" role="ns1xD">
-                                    <ref role="nsMwP" node="39Sam6Zio_N" resolve="parameter" />
-                                    <node concept="1nq8_$" id="5JguS01jdGY" role="nsMwV">
-                                      <node concept="a7P8L" id="5JguS01jdGW" role="1nq8_t">
-                                        <ref role="a7OzE" node="1yt2T3T1TC6" resolve="ArrElemType" />
-                                      </node>
-                                    </node>
+                          <node concept="3sNhsn" id="7L5omgek1qW" role="KCVpo">
+                            <node concept="ns1u0" id="5JguS01jdGB" role="3sNhsz">
+                              <ref role="ns1xF" node="JOGAOsVt2o" resolve="array" />
+                              <node concept="nsMwS" id="5JguS01jdGK" role="ns1xD">
+                                <ref role="nsMwP" node="39Sam6Zio_N" resolve="parameter" />
+                                <node concept="1nq8_$" id="5JguS01jdGY" role="nsMwV">
+                                  <node concept="a7P8L" id="5JguS01jdGW" role="1nq8_t">
+                                    <ref role="a7OzE" node="1yt2T3T1TC6" resolve="ArrElemType" />
                                   </node>
                                 </node>
                               </node>
@@ -3792,13 +3775,13 @@
                         <ref role="a7OzE" node="2JTW8QYFL09" resolve="ArgTypes" />
                       </node>
                       <node concept="Hz6ka" id="2JTW8QYFKZz" role="1uarlW">
-                        <node concept="3wJAYo" id="2JTW8QYFKZ$" role="Hz6kd">
-                          <node concept="3wAshV" id="2JTW8QYFKZ_" role="KCVpo">
+                        <node concept="1Pxxm1" id="7L5omgek1kM" role="Hz6kd">
+                          <node concept="3wAshV" id="2JTW8QYFKZ_" role="1Pxxm0">
                             <node concept="a7P8L" id="2JTW8QYFKZA" role="3wAq21">
                               <ref role="a7OzE" node="2JTW8QYFL0a" resolve="A" />
                             </node>
                           </node>
-                          <node concept="3wAshV" id="2JTW8QYFKZB" role="3wIGS_">
+                          <node concept="3wAshV" id="2JTW8QYFKZB" role="1Pxxm2">
                             <node concept="a7P8L" id="2JTW8QYFKZC" role="3wAq21">
                               <ref role="a7OzE" node="2JTW8QYFL0b" resolve="ArgsTail" />
                             </node>
@@ -3811,13 +3794,13 @@
                         <ref role="a7OzE" node="2JTW8QYFL0e" resolve="ParamTypes" />
                       </node>
                       <node concept="Hz6ka" id="2JTW8QYFKZF" role="1uarlW">
-                        <node concept="3wJAYo" id="2JTW8QYFKZG" role="Hz6kd">
-                          <node concept="3wAshV" id="2JTW8QYFKZH" role="KCVpo">
+                        <node concept="1Pxxm1" id="7L5omgek1kN" role="Hz6kd">
+                          <node concept="3wAshV" id="2JTW8QYFKZH" role="1Pxxm0">
                             <node concept="a7P8L" id="2JTW8QYFKZI" role="3wAq21">
                               <ref role="a7OzE" node="2JTW8QYFL0f" resolve="P" />
                             </node>
                           </node>
-                          <node concept="3wAshV" id="2JTW8QYFKZJ" role="3wIGS_">
+                          <node concept="3wAshV" id="2JTW8QYFKZJ" role="1Pxxm2">
                             <node concept="a7P8L" id="2JTW8QYFKZK" role="3wAq21">
                               <ref role="a7OzE" node="2JTW8QYFL0g" resolve="ParamsTail" />
                             </node>
@@ -5454,23 +5437,19 @@
                               <node concept="3Aqt3T" id="4xoHD1GsA$w" role="3Aqpz8">
                                 <ref role="3AqCNq" node="1yt2T3T19j2" resolve="checkArgs" />
                                 <node concept="Hz6ka" id="4xoHD1GsA$x" role="3AunhB">
-                                  <node concept="KCUsM" id="4xoHD1GsA$y" role="Hz6kd">
-                                    <node concept="22Ky0T" id="4xoHD1GsA$z" role="lGtFl">
-                                      <node concept="1nq8_$" id="4xoHD1GsA$$" role="22Ky0K">
-                                        <node concept="a7P8L" id="4xoHD1GsA$_" role="1nq8_t">
-                                          <ref role="a7OzE" node="4xoHD1GsA_H" resolve="CapArgsT" />
-                                        </node>
+                                  <node concept="1Pxxm1" id="7L5omgek1rZ" role="Hz6kd">
+                                    <node concept="3wAshV" id="7L5omgek1s0" role="1Pxxm2">
+                                      <node concept="a7P8L" id="4xoHD1GsA$_" role="3wAq21">
+                                        <ref role="a7OzE" node="4xoHD1GsA_H" resolve="CapArgsT" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                                 <node concept="Hz6ka" id="4xoHD1GsA$A" role="3AunhB">
-                                  <node concept="KCUsM" id="4xoHD1GsA$B" role="Hz6kd">
-                                    <node concept="22Ky0T" id="4xoHD1GsA$C" role="lGtFl">
-                                      <node concept="1nq8_$" id="4xoHD1GsA$D" role="22Ky0K">
-                                        <node concept="a7P8L" id="4xoHD1GsA$E" role="1nq8_t">
-                                          <ref role="a7OzE" node="4xoHD1GsA_L" resolve="ParamsT" />
-                                        </node>
+                                  <node concept="1Pxxm1" id="7L5omgek1s1" role="Hz6kd">
+                                    <node concept="3wAshV" id="7L5omgek1s2" role="1Pxxm2">
+                                      <node concept="a7P8L" id="4xoHD1GsA$E" role="3wAq21">
+                                        <ref role="a7OzE" node="4xoHD1GsA_L" resolve="ParamsT" />
                                       </node>
                                     </node>
                                   </node>
@@ -6852,23 +6831,19 @@
                               <node concept="3Aqt3T" id="3R6X$QWrjB3" role="3Aqpz8">
                                 <ref role="3AqCNq" node="1yt2T3T19j2" resolve="checkArgs" />
                                 <node concept="Hz6ka" id="3R6X$QWrjB4" role="3AunhB">
-                                  <node concept="KCUsM" id="3R6X$QWrjB5" role="Hz6kd">
-                                    <node concept="22Ky0T" id="3R6X$QWrjB6" role="lGtFl">
-                                      <node concept="1nq8_$" id="3R6X$QWrjB7" role="22Ky0K">
-                                        <node concept="a7P8L" id="3R6X$QWrjB8" role="1nq8_t">
-                                          <ref role="a7OzE" node="3R6X$QWrjCz" resolve="CapArgsT" />
-                                        </node>
+                                  <node concept="1Pxxm1" id="7L5omgek1s3" role="Hz6kd">
+                                    <node concept="3wAshV" id="7L5omgek1s4" role="1Pxxm2">
+                                      <node concept="a7P8L" id="3R6X$QWrjB8" role="3wAq21">
+                                        <ref role="a7OzE" node="3R6X$QWrjCz" resolve="CapArgsT" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                                 <node concept="Hz6ka" id="3R6X$QWrjB9" role="3AunhB">
-                                  <node concept="KCUsM" id="3R6X$QWrjBa" role="Hz6kd">
-                                    <node concept="22Ky0T" id="3R6X$QWrjBb" role="lGtFl">
-                                      <node concept="1nq8_$" id="3R6X$QWrjBc" role="22Ky0K">
-                                        <node concept="a7P8L" id="3R6X$QWrjBd" role="1nq8_t">
-                                          <ref role="a7OzE" node="3R6X$QWrjD7" resolve="ParamsT" />
-                                        </node>
+                                  <node concept="1Pxxm1" id="7L5omgek1s5" role="Hz6kd">
+                                    <node concept="3wAshV" id="7L5omgek1s6" role="1Pxxm2">
+                                      <node concept="a7P8L" id="3R6X$QWrjBd" role="3wAq21">
+                                        <ref role="a7OzE" node="3R6X$QWrjD7" resolve="ParamsT" />
                                       </node>
                                     </node>
                                   </node>
@@ -7897,23 +7872,19 @@
                               <node concept="3Aqt3T" id="4xoHD1GjeIV" role="3Aqpz8">
                                 <ref role="3AqCNq" node="1yt2T3T19j2" resolve="checkArgs" />
                                 <node concept="Hz6ka" id="4xoHD1GjeIW" role="3AunhB">
-                                  <node concept="KCUsM" id="4xoHD1GjeIX" role="Hz6kd">
-                                    <node concept="22Ky0T" id="4xoHD1GjeIY" role="lGtFl">
-                                      <node concept="1nq8_$" id="4xoHD1GjeIZ" role="22Ky0K">
-                                        <node concept="a7P8L" id="4xoHD1GjeJ0" role="1nq8_t">
-                                          <ref role="a7OzE" node="4xoHD1GiYXr" resolve="ArgsT" />
-                                        </node>
+                                  <node concept="1Pxxm1" id="7L5omgek1s7" role="Hz6kd">
+                                    <node concept="3wAshV" id="7L5omgek1s8" role="1Pxxm2">
+                                      <node concept="a7P8L" id="4xoHD1GjeJ0" role="3wAq21">
+                                        <ref role="a7OzE" node="4xoHD1GiYXr" resolve="ArgsT" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                                 <node concept="Hz6ka" id="4xoHD1GjeJ1" role="3AunhB">
-                                  <node concept="KCUsM" id="4xoHD1GjeJ2" role="Hz6kd">
-                                    <node concept="22Ky0T" id="4xoHD1GjeJ3" role="lGtFl">
-                                      <node concept="1nq8_$" id="4xoHD1GjeJ4" role="22Ky0K">
-                                        <node concept="a7P8L" id="4xoHD1GjmQ0" role="1nq8_t">
-                                          <ref role="a7OzE" node="4xoHD1Gj287" resolve="ParamsT" />
-                                        </node>
+                                  <node concept="1Pxxm1" id="7L5omgek1s9" role="Hz6kd">
+                                    <node concept="3wAshV" id="7L5omgek1sa" role="1Pxxm2">
+                                      <node concept="a7P8L" id="4xoHD1GjmQ0" role="3wAq21">
+                                        <ref role="a7OzE" node="4xoHD1Gj287" resolve="ParamsT" />
                                       </node>
                                     </node>
                                   </node>
@@ -8573,23 +8544,19 @@
                               <node concept="3Aqt3T" id="4xoHD1GpWgw" role="3Aqpz8">
                                 <ref role="3AqCNq" node="1yt2T3T19j2" resolve="checkArgs" />
                                 <node concept="Hz6ka" id="4xoHD1GpWgx" role="3AunhB">
-                                  <node concept="KCUsM" id="4xoHD1GpWgy" role="Hz6kd">
-                                    <node concept="22Ky0T" id="4xoHD1GpWgz" role="lGtFl">
-                                      <node concept="1nq8_$" id="4xoHD1GpWg$" role="22Ky0K">
-                                        <node concept="a7P8L" id="4xoHD1GpWg_" role="1nq8_t">
-                                          <ref role="a7OzE" node="4xoHD1GpWdN" resolve="ArgsT" />
-                                        </node>
+                                  <node concept="1Pxxm1" id="7L5omgek1sb" role="Hz6kd">
+                                    <node concept="3wAshV" id="7L5omgek1sc" role="1Pxxm2">
+                                      <node concept="a7P8L" id="4xoHD1GpWg_" role="3wAq21">
+                                        <ref role="a7OzE" node="4xoHD1GpWdN" resolve="ArgsT" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                                 <node concept="Hz6ka" id="4xoHD1GpWgA" role="3AunhB">
-                                  <node concept="KCUsM" id="4xoHD1GpWgB" role="Hz6kd">
-                                    <node concept="22Ky0T" id="4xoHD1GpWgC" role="lGtFl">
-                                      <node concept="1nq8_$" id="4xoHD1GpWgD" role="22Ky0K">
-                                        <node concept="a7P8L" id="4xoHD1GpWgE" role="1nq8_t">
-                                          <ref role="a7OzE" node="4xoHD1GpWdR" resolve="ParamsT" />
-                                        </node>
+                                  <node concept="1Pxxm1" id="7L5omgek1sd" role="Hz6kd">
+                                    <node concept="3wAshV" id="7L5omgek1se" role="1Pxxm2">
+                                      <node concept="a7P8L" id="4xoHD1GpWgE" role="3wAq21">
+                                        <ref role="a7OzE" node="4xoHD1GpWdR" resolve="ParamsT" />
                                       </node>
                                     </node>
                                   </node>
@@ -19336,14 +19303,14 @@
                         </node>
                         <node concept="1HFMs5" id="24yJnOJhgMA" role="3AunhB">
                           <node concept="Hz6ka" id="24yJnOJhgMB" role="1uarlW">
-                            <node concept="3wJAYo" id="24yJnOJhgMC" role="Hz6kd">
-                              <node concept="2IllgU" id="24yJnOJhgMD" role="KCVpo" />
-                              <node concept="2IllgU" id="24yJnOJhgML" role="3wIGS_" />
-                              <node concept="3wAshV" id="24yJnOJhse1" role="KCVpo">
+                            <node concept="1Pxxm1" id="7L5omgek1kO" role="Hz6kd">
+                              <node concept="2IllgU" id="24yJnOJhgMD" role="1Pxxm0" />
+                              <node concept="3wAshV" id="24yJnOJhse1" role="1Pxxm0">
                                 <node concept="a7P8L" id="24yJnOJhsdZ" role="3wAq21">
                                   <ref role="a7OzE" node="24yJnOJhgMV" resolve="ExtType" />
                                 </node>
                               </node>
+                              <node concept="2IllgU" id="24yJnOJhgML" role="1Pxxm2" />
                             </node>
                           </node>
                           <node concept="a7P8L" id="24yJnOJhgMM" role="1uarlU">
@@ -19385,9 +19352,7 @@
                   <node concept="aZer4" id="24yJnOJhgN0" role="3XD1gS">
                     <property role="TrG5h" value="Tail" />
                   </node>
-                  <node concept="3uibUv" id="24yJnOJhgN1" role="3vLBG7">
-                    <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-                  </node>
+                  <node concept="VbTHi" id="7L5omgek2qq" role="3vLBG7" />
                 </node>
                 <node concept="3xSepi" id="6E2cNicdij2" role="3xSepv">
                   <node concept="3Aq9E8" id="24yJnOJhgN2" role="3xSepj">
@@ -19413,9 +19378,9 @@
                                 <ref role="a7OzE" node="24yJnOJhgMY" resolve="SubclassPath" />
                               </node>
                               <node concept="Hz6ka" id="24yJnOJhgNZ" role="3A8w4Q">
-                                <node concept="3wJAYo" id="24yJnOJhgO0" role="Hz6kd">
-                                  <node concept="2IllgU" id="24yJnOJhgO1" role="KCVpo" />
-                                  <node concept="3wAshV" id="24yJnOJhgO2" role="3wIGS_">
+                                <node concept="1Pxxm1" id="7L5omgek1kP" role="Hz6kd">
+                                  <node concept="2IllgU" id="24yJnOJhgO1" role="1Pxxm0" />
+                                  <node concept="3wAshV" id="24yJnOJhgO2" role="1Pxxm2">
                                     <node concept="a7P8L" id="24yJnOJhgO3" role="3wAq21">
                                       <ref role="a7OzE" node="24yJnOJhgN0" resolve="Tail" />
                                     </node>
@@ -20031,9 +19996,7 @@
               <node concept="aZer4" id="1RiyfbhdI6P" role="3XD1gS">
                 <property role="TrG5h" value="LubComponents" />
               </node>
-              <node concept="3uibUv" id="1RiyfbhdI9i" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2q_" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="1_2bK$p0mr9" role="0Rg$4">
               <node concept="aZer4" id="1_2bK$p0mra" role="3XD1gS">
@@ -21571,13 +21534,13 @@
                         <ref role="a7OzE" node="5TXeSYSG$OL" resolve="ClsList" />
                       </node>
                       <node concept="Hz6ka" id="27bTNFeIFOh" role="1uarlW">
-                        <node concept="3wJAYo" id="3zXFZnUoM8r" role="Hz6kd">
-                          <node concept="3wAshV" id="3zXFZnUhsN2" role="KCVpo">
+                        <node concept="1Pxxm1" id="7L5omgek1kQ" role="Hz6kd">
+                          <node concept="3wAshV" id="3zXFZnUhsN2" role="1Pxxm0">
                             <node concept="a7P8L" id="2rIdnPwk178" role="3wAq21">
                               <ref role="a7OzE" node="2rIdnPwk13T" resolve="ClsHead" />
                             </node>
                           </node>
-                          <node concept="3wAshV" id="3zXFZnUhsN3" role="3wIGS_">
+                          <node concept="3wAshV" id="3zXFZnUhsN3" role="1Pxxm2">
                             <node concept="a7P8L" id="27bTNFeIG0Y" role="3wAq21">
                               <ref role="a7OzE" node="2rIdnPwk5rN" resolve="ClsTail" />
                             </node>
@@ -21605,9 +21568,7 @@
               <node concept="aZer4" id="2rIdnPwk71p" role="3XD1gS">
                 <property role="TrG5h" value="TTailListNode" />
               </node>
-              <node concept="3uibUv" id="2rIdnPwk5tv" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2r2" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="5TXeSYSG$OJ" role="0Rg$4">
               <node concept="aZer4" id="5TXeSYSG$OK" role="3XD1gS">
@@ -21629,13 +21590,13 @@
                             <ref role="a7OzE" node="5TXeSYSG$OK" resolve="TListNode" />
                           </node>
                           <node concept="Hz6ka" id="2rIdnPwk84L" role="3A8w4Q">
-                            <node concept="3wJAYo" id="3zXFZnUoM8s" role="Hz6kd">
-                              <node concept="3wAshV" id="3zXFZnUhsN4" role="KCVpo">
+                            <node concept="1Pxxm1" id="7L5omgek1kR" role="Hz6kd">
+                              <node concept="3wAshV" id="3zXFZnUhsN4" role="1Pxxm0">
                                 <node concept="a7P8L" id="2rIdnPwk8eD" role="3wAq21">
                                   <ref role="a7OzE" node="2rIdnPwk57T" resolve="T" />
                                 </node>
                               </node>
-                              <node concept="3wAshV" id="3zXFZnUhsN5" role="3wIGS_">
+                              <node concept="3wAshV" id="3zXFZnUhsN5" role="1Pxxm2">
                                 <node concept="a7P8L" id="2rIdnPwk8jC" role="3wAq21">
                                   <ref role="a7OzE" node="2rIdnPwk71p" resolve="TTailListNode" />
                                 </node>
@@ -21864,13 +21825,13 @@
                         <ref role="a7OzE" node="5TXeSYSG_gN" resolve="TList" />
                       </node>
                       <node concept="Hz6ka" id="1qY0I4b_$l5" role="1uarlW">
-                        <node concept="3wJAYo" id="3zXFZnUoM8t" role="Hz6kd">
-                          <node concept="3wAshV" id="3zXFZnUhsN6" role="KCVpo">
+                        <node concept="1Pxxm1" id="7L5omgek1kS" role="Hz6kd">
+                          <node concept="3wAshV" id="3zXFZnUhsN6" role="1Pxxm0">
                             <node concept="a7P8L" id="1qY0I4b_$la" role="3wAq21">
                               <ref role="a7OzE" node="1qY0I4b_$li" resolve="THead" />
                             </node>
                           </node>
-                          <node concept="3wAshV" id="3zXFZnUhsN7" role="3wIGS_">
+                          <node concept="3wAshV" id="3zXFZnUhsN7" role="1Pxxm2">
                             <node concept="a7P8L" id="1qY0I4b_$le" role="3wAq21">
                               <ref role="a7OzE" node="1qY0I4b_$lk" resolve="TTail" />
                             </node>
@@ -21898,9 +21859,7 @@
               <node concept="aZer4" id="1qY0I4b_$ll" role="3XD1gS">
                 <property role="TrG5h" value="ClsTailListNode" />
               </node>
-              <node concept="3uibUv" id="1qY0I4b_$lm" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2r9" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="5TXeSYSG_gM" role="0Rg$4">
               <node concept="aZer4" id="5TXeSYSG_gN" role="3XD1gS">
@@ -21922,13 +21881,13 @@
                             <ref role="a7OzE" node="5TXeSYSG_gO" resolve="ClsListNode" />
                           </node>
                           <node concept="Hz6ka" id="1qY0I4b_$lu" role="3A8w4Q">
-                            <node concept="3wJAYo" id="3zXFZnUoM8u" role="Hz6kd">
-                              <node concept="3wAshV" id="3zXFZnUhsN8" role="KCVpo">
+                            <node concept="1Pxxm1" id="7L5omgek1kT" role="Hz6kd">
+                              <node concept="3wAshV" id="3zXFZnUhsN8" role="1Pxxm0">
                                 <node concept="a7P8L" id="1qY0I4b_$lz" role="3wAq21">
                                   <ref role="a7OzE" node="1qY0I4b_$lh" resolve="Cls" />
                                 </node>
                               </node>
-                              <node concept="3wAshV" id="3zXFZnUhsN9" role="3wIGS_">
+                              <node concept="3wAshV" id="3zXFZnUhsN9" role="1Pxxm2">
                                 <node concept="a7P8L" id="1qY0I4b_$lB" role="3wAq21">
                                   <ref role="a7OzE" node="1qY0I4b_$ll" resolve="ClsTailListNode" />
                                 </node>
@@ -26362,9 +26321,7 @@
               <node concept="aZer4" id="uhKQGLiP0W" role="3XD1gS">
                 <property role="TrG5h" value="ParamList" />
               </node>
-              <node concept="3uibUv" id="RZQG98OfrO" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2sr" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="uhKQGLiRRn" role="0Rg$4">
               <node concept="aZer4" id="uhKQGLiRRo" role="3XD1gS">
@@ -28301,13 +28258,13 @@
                         <ref role="a7OzE" node="5TXeSYSHy4v" resolve="Terms" />
                       </node>
                       <node concept="Hz6ka" id="2rIdnPwt65e" role="1uarlW">
-                        <node concept="3wJAYo" id="3zXFZnUoM8w" role="Hz6kd">
-                          <node concept="3wAshV" id="3zXFZnUhsNd" role="KCVpo">
+                        <node concept="1Pxxm1" id="7L5omgek1kU" role="Hz6kd">
+                          <node concept="3wAshV" id="3zXFZnUhsNd" role="1Pxxm0">
                             <node concept="a7P8L" id="2rIdnPwt68A" role="3wAq21">
                               <ref role="a7OzE" node="6N2bvv_l2E6" resolve="T" />
                             </node>
                           </node>
-                          <node concept="3wAshV" id="3zXFZnUhsNe" role="3wIGS_">
+                          <node concept="3wAshV" id="3zXFZnUhsNe" role="1Pxxm2">
                             <node concept="a7P8L" id="2rIdnPwt6c0" role="3wAq21">
                               <ref role="a7OzE" node="6N2bvv_l2Kl" resolve="Tail" />
                             </node>
@@ -28335,9 +28292,7 @@
               <node concept="aZer4" id="6N2bvv_l2Kl" role="3XD1gS">
                 <property role="TrG5h" value="Tail" />
               </node>
-              <node concept="3uibUv" id="6N2bvv_l2KW" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2tj" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="5TXeSYSHy4r" role="0Rg$4">
               <node concept="aZer4" id="5TXeSYSHy4s" role="3XD1gS">
@@ -36693,13 +36648,13 @@
                           <ref role="nsMwP" node="6N2bvv_fHBX" resolve="parameter" />
                           <node concept="1nq8_$" id="4btN1w5LE8p" role="nsMwV">
                             <node concept="Hz6ka" id="4btN1w5LE8q" role="1nq8_t">
-                              <node concept="3wJAYo" id="4btN1w5LE8r" role="Hz6kd">
-                                <node concept="3wAshV" id="4btN1w5LE8s" role="KCVpo">
+                              <node concept="1Pxxm1" id="7L5omgek1kV" role="Hz6kd">
+                                <node concept="3wAshV" id="4btN1w5LE8s" role="1Pxxm0">
                                   <node concept="a7P8L" id="4btN1w5LE8t" role="3wAq21">
                                     <ref role="a7OzE" node="4btN1w5LE7u" resolve="MainBnd" />
                                   </node>
                                 </node>
-                                <node concept="3wAshV" id="4btN1w5LE8u" role="3wIGS_">
+                                <node concept="3wAshV" id="4btN1w5LE8u" role="1Pxxm2">
                                   <node concept="a7P8L" id="4btN1w5LE8v" role="3wAq21">
                                     <ref role="a7OzE" node="4btN1w5LE7v" resolve="AuxBnds" />
                                   </node>
@@ -41579,9 +41534,7 @@
               <node concept="aZer4" id="1Riyfbh9SSY" role="3XD1gS">
                 <property role="TrG5h" value="ResTailListNode" />
               </node>
-              <node concept="3uibUv" id="1Riyfbh9SSH" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2uP" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="29MBl1AmGlu" role="0Rg$4">
               <node concept="aZer4" id="29MBl1AmGlv" role="3XD1gS">
@@ -41596,9 +41549,7 @@
               <node concept="aZer4" id="1Riyfbh9SRd" role="3XD1gS">
                 <property role="TrG5h" value="TsTail" />
               </node>
-              <node concept="3uibUv" id="1Riyfbh9SRQ" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2uS" role="3vLBG7" />
             </node>
             <node concept="3xSepi" id="6E2cNicdilz" role="3xSepv">
               <node concept="3Aq9E8" id="29MBl1AmHKR" role="3xSepj">
@@ -41635,13 +41586,13 @@
                         <ref role="a7OzE" node="5TXeSYSHKeT" resolve="TypeLists" />
                       </node>
                       <node concept="Hz6ka" id="29MBl1AmGmM" role="1uarlW">
-                        <node concept="3wJAYo" id="3zXFZnUoM8x" role="Hz6kd">
-                          <node concept="3wAshV" id="3zXFZnUhsNg" role="KCVpo">
+                        <node concept="1Pxxm1" id="7L5omgek1kW" role="Hz6kd">
+                          <node concept="3wAshV" id="3zXFZnUhsNg" role="1Pxxm0">
                             <node concept="a7P8L" id="29MBl1AmGmW" role="3wAq21">
                               <ref role="a7OzE" node="5TXeSYSHKeU" resolve="TsHead" />
                             </node>
                           </node>
-                          <node concept="3wAshV" id="3zXFZnUhsNh" role="3wIGS_">
+                          <node concept="3wAshV" id="3zXFZnUhsNh" role="1Pxxm2">
                             <node concept="a7P8L" id="29MBl1AmGni" role="3wAq21">
                               <ref role="a7OzE" node="5TXeSYSHKeW" resolve="TsTail" />
                             </node>
@@ -41666,9 +41617,7 @@
               <node concept="aZer4" id="5TXeSYSHJRe" role="3XD1gS">
                 <property role="TrG5h" value="ResTailListNode" />
               </node>
-              <node concept="3uibUv" id="5TXeSYSHJRf" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2uV" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="5TXeSYSHKeS" role="0Rg$4">
               <node concept="aZer4" id="5TXeSYSHKeT" role="3XD1gS">
@@ -41683,9 +41632,7 @@
               <node concept="aZer4" id="5TXeSYSHKeW" role="3XD1gS">
                 <property role="TrG5h" value="TsTail" />
               </node>
-              <node concept="3uibUv" id="5TXeSYSHKeX" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2uY" role="3vLBG7" />
             </node>
             <node concept="3xSepi" id="6E2cNicdil$" role="3xSepv">
               <node concept="3Aq9E8" id="29MBl1AmHt3" role="3xSepj">
@@ -41698,13 +41645,13 @@
                             <ref role="a7OzE" node="5TXeSYSHJRb" resolve="ResTypesList" />
                           </node>
                           <node concept="Hz6ka" id="29MBl1AmHwu" role="3A8w4Q">
-                            <node concept="3wJAYo" id="3zXFZnUoM8y" role="Hz6kd">
-                              <node concept="3wAshV" id="3zXFZnUhsNi" role="KCVpo">
+                            <node concept="1Pxxm1" id="7L5omgek1kX" role="Hz6kd">
+                              <node concept="3wAshV" id="3zXFZnUhsNi" role="1Pxxm0">
                                 <node concept="a7P8L" id="29MBl1AmHwA" role="3wAq21">
                                   <ref role="a7OzE" node="5TXeSYSHJRc" resolve="ResHead" />
                                 </node>
                               </node>
-                              <node concept="3wAshV" id="3zXFZnUhsNj" role="3wIGS_">
+                              <node concept="3wAshV" id="3zXFZnUhsNj" role="1Pxxm2">
                                 <node concept="a7P8L" id="29MBl1AmHxD" role="3wAq21">
                                   <ref role="a7OzE" node="5TXeSYSHJRe" resolve="ResTailListNode" />
                                 </node>
@@ -41778,9 +41725,7 @@
               <node concept="aZer4" id="5TXeSYSHKKi" role="3XD1gS">
                 <property role="TrG5h" value="ResTailListNode" />
               </node>
-              <node concept="3uibUv" id="5TXeSYSHKKj" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2v1" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="5TXeSYSHL7_" role="0Rg$4">
               <node concept="aZer4" id="5TXeSYSHL7A" role="3XD1gS">
@@ -41852,18 +41797,18 @@
                         <ref role="a7OzE" node="29MBl1AmHSK" resolve="GenTypes" />
                       </node>
                       <node concept="Hz6ka" id="29MBl1AmHTM" role="1uarlW">
-                        <node concept="3wJAYo" id="3zXFZnUoM8z" role="Hz6kd">
-                          <node concept="3wAshV" id="3zXFZnUhsNk" role="KCVpo">
+                        <node concept="1Pxxm1" id="7L5omgek1kY" role="Hz6kd">
+                          <node concept="3wAshV" id="3zXFZnUhsNk" role="1Pxxm0">
                             <node concept="a7P8L" id="29MBl1AmHU0" role="3wAq21">
                               <ref role="a7OzE" node="29MBl1AmHT2" resolve="G1" />
                             </node>
                           </node>
-                          <node concept="3wAshV" id="3zXFZnUhsNl" role="KCVpo">
+                          <node concept="3wAshV" id="3zXFZnUhsNl" role="1Pxxm0">
                             <node concept="a7P8L" id="29MBl1AmHWJ" role="3wAq21">
                               <ref role="a7OzE" node="29MBl1AmHWf" resolve="G2" />
                             </node>
                           </node>
-                          <node concept="3wAshV" id="3zXFZnUhsNm" role="3wIGS_">
+                          <node concept="3wAshV" id="3zXFZnUhsNm" role="1Pxxm2">
                             <node concept="a7P8L" id="29MBl1AmHUA" role="3wAq21">
                               <ref role="a7OzE" node="1Riyfbh9SVm" resolve="GTail" />
                             </node>
@@ -41903,9 +41848,7 @@
               <node concept="aZer4" id="1Riyfbh9SVm" role="3XD1gS">
                 <property role="TrG5h" value="GTail" />
               </node>
-              <node concept="3uibUv" id="1Riyfbh9SVG" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2v6" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="29MBl1AmHVh" role="0Rg$4">
               <node concept="aZer4" id="29MBl1AmHVi" role="3XD1gS">
@@ -41924,13 +41867,13 @@
                             <ref role="a7OzE" node="29MBl1AmIAg" resolve="NextTypes" />
                           </node>
                           <node concept="Hz6ka" id="29MBl1AmIBp" role="3A8w4Q">
-                            <node concept="3wJAYo" id="3zXFZnUoM8$" role="Hz6kd">
-                              <node concept="3wAshV" id="3zXFZnUhsNn" role="KCVpo">
+                            <node concept="1Pxxm1" id="7L5omgek1kZ" role="Hz6kd">
+                              <node concept="3wAshV" id="3zXFZnUhsNn" role="1Pxxm0">
                                 <node concept="a7P8L" id="29MBl1AmIEI" role="3wAq21">
                                   <ref role="a7OzE" node="29MBl1AmIE8" resolve="NextRes" />
                                 </node>
                               </node>
-                              <node concept="3wAshV" id="3zXFZnUhsNo" role="3wIGS_">
+                              <node concept="3wAshV" id="3zXFZnUhsNo" role="1Pxxm2">
                                 <node concept="a7P8L" id="29MBl1AmIBR" role="3wAq21">
                                   <ref role="a7OzE" node="1Riyfbh9SVm" resolve="GTail" />
                                 </node>
@@ -42181,9 +42124,7 @@
               <node concept="aZer4" id="1RiyfbhbRoA" role="3XD1gS">
                 <property role="TrG5h" value="Params2" />
               </node>
-              <node concept="3uibUv" id="1RiyfbhbRpv" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2vd" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="29MBl1AmIMC" role="0Rg$4">
               <node concept="aZer4" id="29MBl1AmIMD" role="3XD1gS">
@@ -42338,9 +42279,7 @@
               <node concept="aZer4" id="1SctYuaDL1p" role="3XD1gS">
                 <property role="TrG5h" value="Params2" />
               </node>
-              <node concept="3uibUv" id="1SctYuaDL1q" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2vh" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="1SctYuaDL1s" role="0Rg$4">
               <node concept="aZer4" id="1SctYuaDL1t" role="3XD1gS">
@@ -42443,9 +42382,7 @@
               <node concept="aZer4" id="5TXeSYSHMlI" role="3XD1gS">
                 <property role="TrG5h" value="Params2" />
               </node>
-              <node concept="3uibUv" id="5TXeSYSHMlJ" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2vl" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="5TXeSYSHMlL" role="0Rg$4">
               <node concept="aZer4" id="5TXeSYSHMlM" role="3XD1gS">
@@ -42929,9 +42866,7 @@
               <node concept="aZer4" id="1Riyfbh9TmN" role="3XD1gS">
                 <property role="TrG5h" value="ResTail" />
               </node>
-              <node concept="3uibUv" id="1Riyfbh9Tn2" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2vp" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="29MBl1AmJ2Q" role="0Rg$4">
               <node concept="aZer4" id="29MBl1AmJ2R" role="3XD1gS">
@@ -42946,9 +42881,7 @@
               <node concept="aZer4" id="1Riyfbh9SXF" role="3XD1gS">
                 <property role="TrG5h" value="Ps2Tail" />
               </node>
-              <node concept="3uibUv" id="1Riyfbh9Tmh" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2vs" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="29MBl1AmJ0U" role="0Rg$4">
               <node concept="aZer4" id="29MBl1AmJ0V" role="3XD1gS">
@@ -42963,9 +42896,7 @@
               <node concept="aZer4" id="1Riyfbh9SXu" role="3XD1gS">
                 <property role="TrG5h" value="Ps1Tail" />
               </node>
-              <node concept="3uibUv" id="1Riyfbh9SY0" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2vv" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="2VOKs1Au$Tr" role="0Rg$4">
               <node concept="aZer4" id="2VOKs1Au$Ts" role="3XD1gS">
@@ -43010,13 +42941,13 @@
                         <ref role="a7OzE" node="5TXeSYSHRYz" resolve="Params1" />
                       </node>
                       <node concept="Hz6ka" id="29MBl1AmJ24" role="1uarlW">
-                        <node concept="3wJAYo" id="3zXFZnUoM8C" role="Hz6kd">
-                          <node concept="3wAshV" id="3zXFZnUhsNw" role="KCVpo">
+                        <node concept="1Pxxm1" id="7L5omgek1l0" role="Hz6kd">
+                          <node concept="3wAshV" id="3zXFZnUhsNw" role="1Pxxm0">
                             <node concept="a7P8L" id="29MBl1AmJ3D" role="3wAq21">
                               <ref role="a7OzE" node="5TXeSYSHRY$" resolve="P1" />
                             </node>
                           </node>
-                          <node concept="3wAshV" id="3zXFZnUhsNx" role="3wIGS_">
+                          <node concept="3wAshV" id="3zXFZnUhsNx" role="1Pxxm2">
                             <node concept="a7P8L" id="29MBl1AmJ4n" role="3wAq21">
                               <ref role="a7OzE" node="5TXeSYSHRYA" resolve="Ps1Tail" />
                             </node>
@@ -43029,13 +42960,13 @@
                         <ref role="a7OzE" node="5TXeSYSHRYs" resolve="Params2" />
                       </node>
                       <node concept="Hz6ka" id="29MBl1AmJ4x" role="1uarlW">
-                        <node concept="3wJAYo" id="3zXFZnUoM8D" role="Hz6kd">
-                          <node concept="3wAshV" id="3zXFZnUhsNy" role="KCVpo">
+                        <node concept="1Pxxm1" id="7L5omgek1l1" role="Hz6kd">
+                          <node concept="3wAshV" id="3zXFZnUhsNy" role="1Pxxm0">
                             <node concept="a7P8L" id="29MBl1AmJ5v" role="3wAq21">
                               <ref role="a7OzE" node="5TXeSYSHRYt" resolve="P2" />
                             </node>
                           </node>
-                          <node concept="3wAshV" id="3zXFZnUhsNz" role="3wIGS_">
+                          <node concept="3wAshV" id="3zXFZnUhsNz" role="1Pxxm2">
                             <node concept="a7P8L" id="29MBl1AmJ5H" role="3wAq21">
                               <ref role="a7OzE" node="5TXeSYSHRYv" resolve="Ps2Tail" />
                             </node>
@@ -43060,9 +42991,7 @@
               <node concept="aZer4" id="5TXeSYSHRYo" role="3XD1gS">
                 <property role="TrG5h" value="ResTail" />
               </node>
-              <node concept="3uibUv" id="5TXeSYSHRYp" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2vz" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="5TXeSYSHRYr" role="0Rg$4">
               <node concept="aZer4" id="5TXeSYSHRYs" role="3XD1gS">
@@ -43077,9 +43006,7 @@
               <node concept="aZer4" id="5TXeSYSHRYv" role="3XD1gS">
                 <property role="TrG5h" value="Ps2Tail" />
               </node>
-              <node concept="3uibUv" id="5TXeSYSHRYw" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2vA" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="5TXeSYSHRYy" role="0Rg$4">
               <node concept="aZer4" id="5TXeSYSHRYz" role="3XD1gS">
@@ -43094,9 +43021,7 @@
               <node concept="aZer4" id="5TXeSYSHRYA" role="3XD1gS">
                 <property role="TrG5h" value="Ps1Tail" />
               </node>
-              <node concept="3uibUv" id="5TXeSYSHRYB" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2vD" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="5TXeSYSHRYD" role="0Rg$4">
               <node concept="aZer4" id="5TXeSYSHRYE" role="3XD1gS">
@@ -43160,13 +43085,13 @@
                             <ref role="a7OzE" node="5TXeSYSHRYl" resolve="ResList" />
                           </node>
                           <node concept="Hz6ka" id="29MBl1AmJ6U" role="3A8w4Q">
-                            <node concept="3wJAYo" id="3zXFZnUoM8E" role="Hz6kd">
-                              <node concept="3wAshV" id="3zXFZnUhsN$" role="KCVpo">
+                            <node concept="1Pxxm1" id="7L5omgek1l2" role="Hz6kd">
+                              <node concept="3wAshV" id="3zXFZnUhsN$" role="1Pxxm0">
                                 <node concept="a7P8L" id="2VOKs1AuA6z" role="3wAq21">
                                   <ref role="a7OzE" node="5TXeSYSHRYE" resolve="CapRes" />
                                 </node>
                               </node>
-                              <node concept="3wAshV" id="3zXFZnUhsN_" role="3wIGS_">
+                              <node concept="3wAshV" id="3zXFZnUhsN_" role="1Pxxm2">
                                 <node concept="a7P8L" id="29MBl1AmJ7o" role="3wAq21">
                                   <ref role="a7OzE" node="5TXeSYSHRYo" resolve="ResTail" />
                                 </node>
@@ -43206,13 +43131,13 @@
                           <ref role="a7OzE" node="29MBl1AmJhK" resolve="Params" />
                         </node>
                         <node concept="Hz6ka" id="29MBl1AmJhZ" role="1uarlW">
-                          <node concept="3wJAYo" id="3zXFZnUoM8F" role="Hz6kd">
-                            <node concept="3wAshV" id="3zXFZnUhsNA" role="KCVpo">
+                          <node concept="1Pxxm1" id="7L5omgek1l3" role="Hz6kd">
+                            <node concept="3wAshV" id="3zXFZnUhsNA" role="1Pxxm0">
                               <node concept="a7P8L" id="29MBl1AmJi4" role="3wAq21">
                                 <ref role="a7OzE" node="29MBl1AmJhL" resolve="P" />
                               </node>
                             </node>
-                            <node concept="3wAshV" id="3zXFZnUhsNB" role="3wIGS_">
+                            <node concept="3wAshV" id="3zXFZnUhsNB" role="1Pxxm2">
                               <node concept="a7P8L" id="29MBl1AmJi8" role="3wAq21">
                                 <ref role="a7OzE" node="1Riyfbh9Tp1" resolve="PsTail" />
                               </node>
@@ -43237,9 +43162,7 @@
                 <node concept="aZer4" id="1Riyfbh9ToA" role="3XD1gS">
                   <property role="TrG5h" value="ResTail" />
                 </node>
-                <node concept="3uibUv" id="1Riyfbh9ToV" role="3vLBG7">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-                </node>
+                <node concept="VbTHi" id="7L5omgek2vH" role="3vLBG7" />
               </node>
               <node concept="3NuqgR" id="29MBl1AmJhJ" role="0Rg$4">
                 <node concept="aZer4" id="29MBl1AmJhK" role="3XD1gS">
@@ -43254,9 +43177,7 @@
                 <node concept="aZer4" id="1Riyfbh9Tp1" role="3XD1gS">
                   <property role="TrG5h" value="PsTail" />
                 </node>
-                <node concept="3uibUv" id="1Riyfbh9Tp7" role="3vLBG7">
-                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-                </node>
+                <node concept="VbTHi" id="7L5omgek2vK" role="3vLBG7" />
               </node>
               <node concept="3xSepi" id="6E2cNicdilH" role="3xSepv">
                 <node concept="3Aq9E8" id="29MBl1AmJil" role="3xSepj">
@@ -43269,13 +43190,13 @@
                               <ref role="a7OzE" node="29MBl1AmJhF" resolve="ResList" />
                             </node>
                             <node concept="Hz6ka" id="29MBl1AmJis" role="3A8w4Q">
-                              <node concept="3wJAYo" id="3zXFZnUoM8G" role="Hz6kd">
-                                <node concept="3wAshV" id="3zXFZnUhsNC" role="KCVpo">
+                              <node concept="1Pxxm1" id="7L5omgek1l4" role="Hz6kd">
+                                <node concept="3wAshV" id="3zXFZnUhsNC" role="1Pxxm0">
                                   <node concept="a7P8L" id="29MBl1AmJix" role="3wAq21">
                                     <ref role="a7OzE" node="29MBl1AmJhG" resolve="ResParam" />
                                   </node>
                                 </node>
-                                <node concept="3wAshV" id="3zXFZnUhsND" role="3wIGS_">
+                                <node concept="3wAshV" id="3zXFZnUhsND" role="1Pxxm2">
                                   <node concept="a7P8L" id="29MBl1AmJi_" role="3wAq21">
                                     <ref role="a7OzE" node="1Riyfbh9ToA" resolve="ResTail" />
                                   </node>
@@ -46316,9 +46237,7 @@
                   <node concept="aZer4" id="4btN1w5MgLQ" role="3XD1gS">
                     <property role="TrG5h" value="ContextTVSubs" />
                   </node>
-                  <node concept="3uibUv" id="4btN1w5M5a$" role="3vLBG7">
-                    <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-                  </node>
+                  <node concept="VbTHi" id="7L5omgek2wQ" role="3vLBG7" />
                 </node>
                 <node concept="3xSepi" id="6E2cNicdim9" role="3xSepv">
                   <node concept="3Aq9E8" id="4btN1w5KnXf" role="3xSepj">
@@ -47805,13 +47724,13 @@
                         <ref role="a7OzE" node="1yt2T3T1O$D" resolve="Ts" />
                       </node>
                       <node concept="Hz6ka" id="1yt2T3T1PB1" role="1uarlW">
-                        <node concept="3wJAYo" id="1yt2T3T1PEQ" role="Hz6kd">
-                          <node concept="3wAshV" id="1yt2T3T1PMy" role="KCVpo">
+                        <node concept="1Pxxm1" id="7L5omgek1l5" role="Hz6kd">
+                          <node concept="3wAshV" id="1yt2T3T1PMy" role="1Pxxm0">
                             <node concept="a7P8L" id="1yt2T3T1PMw" role="3wAq21">
                               <ref role="a7OzE" node="1yt2T3T1OKt" resolve="T" />
                             </node>
                           </node>
-                          <node concept="3wAshV" id="1yt2T3T1PQr" role="3wIGS_">
+                          <node concept="3wAshV" id="1yt2T3T1PQr" role="1Pxxm2">
                             <node concept="a7P8L" id="1yt2T3T1PQq" role="3wAq21">
                               <ref role="a7OzE" node="1yt2T3T1OCF" resolve="TsTail" />
                             </node>
@@ -48319,13 +48238,13 @@
                         <ref role="a7OzE" node="2i6cuYQZocy" resolve="List" />
                       </node>
                       <node concept="Hz6ka" id="2i6cuYQZoca" role="1uarlW">
-                        <node concept="3wJAYo" id="2i6cuYQZocb" role="Hz6kd">
-                          <node concept="3wAshV" id="2i6cuYQZocc" role="KCVpo">
+                        <node concept="1Pxxm1" id="7L5omgek1l6" role="Hz6kd">
+                          <node concept="3wAshV" id="2i6cuYQZocc" role="1Pxxm0">
                             <node concept="a7P8L" id="2i6cuYQZocd" role="3wAq21">
                               <ref role="a7OzE" node="2i6cuYQZocs" resolve="Head" />
                             </node>
                           </node>
-                          <node concept="3wAshV" id="2i6cuYQZoce" role="3wIGS_">
+                          <node concept="3wAshV" id="2i6cuYQZoce" role="1Pxxm2">
                             <node concept="a7P8L" id="2i6cuYQZocf" role="3wAq21">
                               <ref role="a7OzE" node="2i6cuYQZocu" resolve="Tail" />
                             </node>
@@ -48347,9 +48266,7 @@
               <node concept="aZer4" id="2i6cuYQZocu" role="3XD1gS">
                 <property role="TrG5h" value="Tail" />
               </node>
-              <node concept="3uibUv" id="2i6cuYQZocv" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2xa" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="2i6cuYQZocx" role="0Rg$4">
               <node concept="aZer4" id="2i6cuYQZocy" role="3XD1gS">
@@ -48461,13 +48378,13 @@
                         <ref role="a7OzE" node="2i6cuYQZodV" resolve="List" />
                       </node>
                       <node concept="Hz6ka" id="2i6cuYQZodw" role="1uarlW">
-                        <node concept="3wJAYo" id="2i6cuYQZodx" role="Hz6kd">
-                          <node concept="3wAshV" id="2i6cuYQZody" role="KCVpo">
+                        <node concept="1Pxxm1" id="7L5omgek1l7" role="Hz6kd">
+                          <node concept="3wAshV" id="2i6cuYQZody" role="1Pxxm0">
                             <node concept="a7P8L" id="2i6cuYQZodz" role="3wAq21">
                               <ref role="a7OzE" node="2i6cuYQZodP" resolve="Head" />
                             </node>
                           </node>
-                          <node concept="3wAshV" id="2i6cuYQZod$" role="3wIGS_">
+                          <node concept="3wAshV" id="2i6cuYQZod$" role="1Pxxm2">
                             <node concept="a7P8L" id="2i6cuYQZod_" role="3wAq21">
                               <ref role="a7OzE" node="2i6cuYQZodR" resolve="Tail" />
                             </node>
@@ -48492,9 +48409,7 @@
               <node concept="aZer4" id="2i6cuYQZodR" role="3XD1gS">
                 <property role="TrG5h" value="Tail" />
               </node>
-              <node concept="3uibUv" id="2i6cuYQZodS" role="3vLBG7">
-                <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              </node>
+              <node concept="VbTHi" id="7L5omgek2xf" role="3vLBG7" />
             </node>
             <node concept="3NuqgR" id="2i6cuYQZodU" role="0Rg$4">
               <node concept="aZer4" id="2i6cuYQZodV" role="3XD1gS">
@@ -49213,23 +49128,19 @@
                         <node concept="3Aqt3T" id="6EK6UBPqbo$" role="3Aqpz8">
                           <ref role="3AqCNq" node="1yt2T3T19j2" resolve="checkArgs" />
                           <node concept="Hz6ka" id="6EK6UBPqbo_" role="3AunhB">
-                            <node concept="KCUsM" id="6EK6UBPqboA" role="Hz6kd">
-                              <node concept="22Ky0T" id="6EK6UBPqboB" role="lGtFl">
-                                <node concept="1nq8_$" id="6EK6UBPqboC" role="22Ky0K">
-                                  <node concept="a7P8L" id="6EK6UBPqboD" role="1nq8_t">
-                                    <ref role="a7OzE" node="6EK6UBPqe3X" resolve="CapArgsT" />
-                                  </node>
+                            <node concept="1Pxxm1" id="7L5omgek1sf" role="Hz6kd">
+                              <node concept="3wAshV" id="7L5omgek1sg" role="1Pxxm2">
+                                <node concept="a7P8L" id="6EK6UBPqboD" role="3wAq21">
+                                  <ref role="a7OzE" node="6EK6UBPqe3X" resolve="CapArgsT" />
                                 </node>
                               </node>
                             </node>
                           </node>
                           <node concept="Hz6ka" id="6EK6UBPqboE" role="3AunhB">
-                            <node concept="KCUsM" id="6EK6UBPqboF" role="Hz6kd">
-                              <node concept="22Ky0T" id="6EK6UBPqboG" role="lGtFl">
-                                <node concept="1nq8_$" id="6EK6UBPqboH" role="22Ky0K">
-                                  <node concept="a7P8L" id="6EK6UBPqboI" role="1nq8_t">
-                                    <ref role="a7OzE" node="6EK6UBPq2gz" resolve="ParamsT" />
-                                  </node>
+                            <node concept="1Pxxm1" id="7L5omgek1sh" role="Hz6kd">
+                              <node concept="3wAshV" id="7L5omgek1si" role="1Pxxm2">
+                                <node concept="a7P8L" id="6EK6UBPqboI" role="3wAq21">
+                                  <ref role="a7OzE" node="6EK6UBPq2gz" resolve="ParamsT" />
                                 </node>
                               </node>
                             </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
index 203495e2..fa36f6b3 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
@@ -44,7 +44,7 @@
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="12" />
     <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
index 452aab61..d006a257 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
@@ -10,7 +10,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="4" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>