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 9770bfbe..ef4e5b23 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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 c8e8c3a8..89c30a43 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="7" />
+        <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
       </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="7" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
     <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 9a261730..bee3a786 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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 b4bb45ea..757f37fa 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="7" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
     <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 0b8fddcc..68505ce4 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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 99937c89..292f1bc1 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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 4cbae77f..ab984d27 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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 b6fc5fab..0cd6ad97 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="7" />
+        <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
       </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 88e0c57a..a2974a6a 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="7" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
   </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 1f65e0ba..bef45cc6 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="7" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
   </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 cd68b5e8..eae9f30a 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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)" />
@@ -100,9 +100,6 @@
       <concept id="8829335963593820278" name="jetbrains.mps.logic.structure.LogicalVariable" flags="ng" index="a7P8L">
         <reference id="8829335963593822893" name="declaration" index="a7OzE" />
       </concept>
-      <concept id="8829335963591530299" name="jetbrains.mps.logic.structure.ExpressionLogicalVariable" flags="ng" index="aZ4PW">
-        <child id="8829335963591530990" name="expression" index="aZ4eD" />
-      </concept>
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
       <concept id="861509610434242029" name="jetbrains.mps.logic.structure.DataFormConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
@@ -743,8 +740,8 @@
                   <node concept="3I6s7M" id="7mB3viLbExU" role="3I6sU7">
                     <node concept="3Aqt3T" id="7mB3viLbExT" role="3I6s78">
                       <ref role="3AqCNq" node="7lt0LtPOZVl" resolve="recover" />
-                      <node concept="aZ4PW" id="5fMWD6IydEn" role="3AunhB">
-                        <node concept="2_cIyK" id="5fMWD6IydEt" role="aZ4eD">
+                      <node concept="37jhX" id="5HLeEcf2Ujj" role="3AunhB">
+                        <node concept="2_cIyK" id="5fMWD6IydEt" role="37jj2">
                           <ref role="2_cIwb" node="5fMWD6IydE6" resolve="typeCollector" />
                         </node>
                       </node>
@@ -935,8 +932,8 @@
         <node concept="3clFbS" id="7mB3viLcERW" role="3uniRr">
           <node concept="3Aqczg" id="7mB3viLcOg5" role="3cqZAp">
             <node concept="3A8Hvi" id="5TfjU0xUSeK" role="3Aqpz8">
-              <node concept="aZ4PW" id="7mB3viLcOgX" role="3A8wtg">
-                <node concept="3txIi4" id="7mB3viLcOh3" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2Ujk" role="3A8wtg">
+                <node concept="3txIi4" id="7mB3viLcOh3" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7mB3viLcOh9" role="3A8w4Q">
                 <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
@@ -1008,8 +1005,8 @@
         <node concept="3clFbS" id="7mB3viLdD9K" role="3uniRr">
           <node concept="3Aqczg" id="7mB3viLdD9J" role="3cqZAp">
             <node concept="3A8Hvi" id="5TfjU0xUSeL" role="3Aqpz8">
-              <node concept="aZ4PW" id="7mB3viLdD9Q" role="3A8wtg">
-                <node concept="3txIi4" id="7mB3viLdD9W" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2Ujl" role="3A8wtg">
+                <node concept="3txIi4" id="7mB3viLdD9W" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7mB3viLdDcc" role="3A8w4Q">
                 <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
@@ -1079,8 +1076,8 @@
         <node concept="3clFbS" id="7mB3viLggrP" role="3uniRr">
           <node concept="3Aqczg" id="7mB3viLggrO" role="3cqZAp">
             <node concept="3A8Hvi" id="5TfjU0xUSeM" role="3Aqpz8">
-              <node concept="aZ4PW" id="7mB3viLggrV" role="3A8wtg">
-                <node concept="3txIi4" id="7mB3viLggs1" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2Ujm" role="3A8wtg">
+                <node concept="3txIi4" id="7mB3viLggs1" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7mB3viLggs9" role="3A8w4Q">
                 <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
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 cf74f6fa..82fd5d2b 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="7" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
     <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 e435c03e..7e58c01d 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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 9e7b1aa9..20718bf4 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
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 98fd9388..b6dbc09c 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="7" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
   </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 bf62ed7f..2d1b936a 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
   </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 9840602c..d245d240 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
   </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 671920ea..c38d4c0a 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="7" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
   </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 62a53b91..e3c4604f 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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 58420566..9db4da76 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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 38a6be64..cc4757c9 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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" />
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
index b089f127..a6c9ff8f 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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)" />
@@ -111,9 +111,6 @@
       <concept id="8829335963593820278" name="jetbrains.mps.logic.structure.LogicalVariable" flags="ng" index="a7P8L">
         <reference id="8829335963593822893" name="declaration" index="a7OzE" />
       </concept>
-      <concept id="8829335963591530299" name="jetbrains.mps.logic.structure.ExpressionLogicalVariable" flags="ng" index="aZ4PW">
-        <child id="8829335963591530990" name="expression" index="aZ4eD" />
-      </concept>
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
       <concept id="861509610434242029" name="jetbrains.mps.logic.structure.DataFormConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
@@ -401,8 +398,8 @@
           </node>
           <node concept="3Aqczg" id="3w0n0hzlYj1" role="3cqZAp">
             <node concept="3A8Hvi" id="5TfjU0xtN57" role="3Aqpz8">
-              <node concept="aZ4PW" id="3w0n0hzlYje" role="3A8wtg">
-                <node concept="3txIi4" id="3w0n0hzlYjk" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2Uk4" role="3A8wtg">
+                <node concept="3txIi4" id="3w0n0hzlYjk" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7VBaGntKJ8V" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ6C" resolve="Equality" />
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 50690e12..57b1bd9b 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="7" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
   </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 c07c18db..353f53f2 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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)" />
@@ -164,9 +164,6 @@
         <reference id="8829335963593822893" name="declaration" index="a7OzE" />
         <child id="6036655413806858011" name="indexExpr" index="3gCZO6" />
       </concept>
-      <concept id="8829335963591530299" name="jetbrains.mps.logic.structure.ExpressionLogicalVariable" flags="ng" index="aZ4PW">
-        <child id="8829335963591530990" name="expression" index="aZ4eD" />
-      </concept>
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
         <child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
       </concept>
@@ -458,8 +455,8 @@
           </node>
           <node concept="3Aqczg" id="Vo$tzLEEIh" role="3cqZAp">
             <node concept="3A8Hvi" id="5TfjU0xtN5r" role="3Aqpz8">
-              <node concept="aZ4PW" id="Vo$tzLEEIz" role="3A8wtg">
-                <node concept="3txIi4" id="Vo$tzLEEID" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UkQ" role="3A8wtg">
+                <node concept="3txIi4" id="Vo$tzLEEID" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7VBaGntKJam" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ6Q" resolve="Forall" />
@@ -566,8 +563,8 @@
           </node>
           <node concept="3Aqczg" id="Vo$tzLEFMr" role="3cqZAp">
             <node concept="3A8Hvi" id="5TfjU0xtN5s" role="3Aqpz8">
-              <node concept="aZ4PW" id="Vo$tzLEFMt" role="3A8wtg">
-                <node concept="3txIi4" id="Vo$tzLEFMu" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UkR" role="3A8wtg">
+                <node concept="3txIi4" id="Vo$tzLEFMu" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7VBaGntKJap" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ6U" resolve="Exists" />
@@ -749,8 +746,8 @@
           </node>
           <node concept="3Aqczg" id="Vo$tzLIpZC" role="3cqZAp">
             <node concept="3A8Hvi" id="5TfjU0xtN5t" role="3Aqpz8">
-              <node concept="aZ4PW" id="Vo$tzLIpZE" role="3A8wtg">
-                <node concept="3txIi4" id="Vo$tzLIpZF" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UkS" role="3A8wtg">
+                <node concept="3txIi4" id="Vo$tzLIpZF" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7VBaGntKJav" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ6Y" resolve="Relation" />
@@ -804,8 +801,8 @@
         <node concept="3clFbS" id="Vo$tzLIbPc" role="3uniRr">
           <node concept="3Aqczg" id="Vo$tzLIbPb" role="3cqZAp">
             <node concept="3A8Hvi" id="5TfjU0xtN5u" role="3Aqpz8">
-              <node concept="aZ4PW" id="Vo$tzLIbPi" role="3A8wtg">
-                <node concept="3txIi4" id="Vo$tzLIbPo" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UkT" role="3A8wtg">
+                <node concept="3txIi4" id="Vo$tzLIbPo" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7VBaGntKJab" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ72" resolve="Object" />
@@ -879,11 +876,11 @@
             <node concept="3clFbS" id="2oO2uzBX6DX" role="3clFbx">
               <node concept="3Aqczg" id="2oO2uzBX6DY" role="3cqZAp">
                 <node concept="3A8Hvi" id="5TfjU0xtN5v" role="3Aqpz8">
-                  <node concept="aZ4PW" id="2oO2uzBX6LO" role="3A8wtg">
-                    <node concept="3txIi4" id="2oO2uzBX6LU" role="aZ4eD" />
+                  <node concept="37jhX" id="5HLeEcf2UkU" role="3A8wtg">
+                    <node concept="3txIi4" id="2oO2uzBX6LU" role="37jj2" />
                   </node>
-                  <node concept="aZ4PW" id="2oO2uzBX6E1" role="3A8w4Q">
-                    <node concept="37vLTw" id="2oO2uzBX6E2" role="aZ4eD">
+                  <node concept="37jhX" id="5HLeEcf2UkV" role="3A8w4Q">
+                    <node concept="37vLTw" id="2oO2uzBX6E2" role="37jj2">
                       <ref role="3cqZAo" node="2oO2uzBX6DP" resolve="VarSubs" />
                     </node>
                   </node>
@@ -901,8 +898,8 @@
               <node concept="3clFbS" id="2oO2uzBX6E8" role="9aQI4">
                 <node concept="3Aqczg" id="Vo$tzLIbUM" role="3cqZAp">
                   <node concept="3A8Hvi" id="5TfjU0xtN5w" role="3Aqpz8">
-                    <node concept="aZ4PW" id="Vo$tzLIbUT" role="3A8wtg">
-                      <node concept="3txIi4" id="Vo$tzLIbUZ" role="aZ4eD" />
+                    <node concept="37jhX" id="5HLeEcf2UkW" role="3A8wtg">
+                      <node concept="3txIi4" id="Vo$tzLIbUZ" role="37jj2" />
                     </node>
                     <node concept="ns1u0" id="7VBaGntKJay" role="3A8w4Q">
                       <ref role="ns1xF" node="7VBaGntKJ75" resolve="Variable" />
@@ -1034,8 +1031,8 @@
           </node>
           <node concept="3Aqczg" id="Vo$tzLIpQv" role="3cqZAp">
             <node concept="3A8Hvi" id="5TfjU0xtN5x" role="3Aqpz8">
-              <node concept="aZ4PW" id="Vo$tzLIpQR" role="3A8wtg">
-                <node concept="3txIi4" id="Vo$tzLIpRh" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UkX" role="3A8wtg">
+                <node concept="3txIi4" id="Vo$tzLIpRh" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7VBaGntKJaB" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ78" resolve="Function" />
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 f9401085..543527ff 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="7" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
   </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 83520927..4cb4ae54 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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" />
@@ -88,9 +88,6 @@
         <reference id="8829335963593822893" name="declaration" index="a7OzE" />
         <child id="6036655413806858011" name="indexExpr" index="3gCZO6" />
       </concept>
-      <concept id="8829335963591530299" name="jetbrains.mps.logic.structure.ExpressionLogicalVariable" flags="ng" index="aZ4PW">
-        <child id="8829335963591530990" name="expression" index="aZ4eD" />
-      </concept>
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
         <child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
       </concept>
@@ -312,8 +309,8 @@
         <node concept="3clFbS" id="5RfK0kxl0X9" role="3uniRr">
           <node concept="3Aqczg" id="5RfK0kxl0YB" role="3cqZAp">
             <node concept="3A8Hvi" id="5TfjU0xtN79" role="3Aqpz8">
-              <node concept="aZ4PW" id="5RfK0kxl0YQ" role="3A8wtg">
-                <node concept="3txIi4" id="5RfK0kxl0ZL" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UlR" role="3A8wtg">
+                <node concept="3txIi4" id="5RfK0kxl0ZL" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7VBaGntKJe2" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ7X" resolve="Const" />
@@ -425,8 +422,8 @@
           </node>
           <node concept="3Aqczg" id="5RfK0kxlc3S" role="3cqZAp">
             <node concept="3A8Hvi" id="5TfjU0xtN7a" role="3Aqpz8">
-              <node concept="aZ4PW" id="5RfK0kxlc4q" role="3A8wtg">
-                <node concept="3txIi4" id="5RfK0kxlc4w" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UlS" role="3A8wtg">
+                <node concept="3txIi4" id="5RfK0kxlc4w" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7VBaGntKJeh" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ80" resolve="And" />
@@ -540,8 +537,8 @@
           </node>
           <node concept="3Aqczg" id="5RfK0kxld9U" role="3cqZAp">
             <node concept="3A8Hvi" id="5TfjU0xtN7b" role="3Aqpz8">
-              <node concept="aZ4PW" id="5RfK0kxld9W" role="3A8wtg">
-                <node concept="3txIi4" id="5RfK0kxld9X" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UlT" role="3A8wtg">
+                <node concept="3txIi4" id="5RfK0kxld9X" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7VBaGntKJf3" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ83" resolve="Or" />
@@ -605,8 +602,8 @@
           </node>
           <node concept="3Aqczg" id="5RfK0kxlwEC" role="3cqZAp">
             <node concept="3A8Hvi" id="5TfjU0xtN7c" role="3Aqpz8">
-              <node concept="aZ4PW" id="5RfK0kxlwEN" role="3A8wtg">
-                <node concept="3txIi4" id="5RfK0kxlwET" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UlU" role="3A8wtg">
+                <node concept="3txIi4" id="5RfK0kxlwET" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7VBaGntKJej" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ86" resolve="Not" />
@@ -701,8 +698,8 @@
           </node>
           <node concept="3Aqczg" id="5RfK0kxlxKk" role="3cqZAp">
             <node concept="3A8Hvi" id="5TfjU0xtN7d" role="3Aqpz8">
-              <node concept="aZ4PW" id="5RfK0kxlxK$" role="3A8wtg">
-                <node concept="3txIi4" id="5RfK0kxlxKE" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UlV" role="3A8wtg">
+                <node concept="3txIi4" id="5RfK0kxlxKE" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7VBaGntKJeG" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ89" resolve="If" />
@@ -805,8 +802,8 @@
           </node>
           <node concept="3Aqczg" id="5RfK0kxly76" role="3cqZAp">
             <node concept="3A8Hvi" id="5TfjU0xtN7e" role="3Aqpz8">
-              <node concept="aZ4PW" id="5RfK0kxly78" role="3A8wtg">
-                <node concept="3txIi4" id="5RfK0kxly79" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UlW" role="3A8wtg">
+                <node concept="3txIi4" id="5RfK0kxly79" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7VBaGntKJeP" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntKJ8d" resolve="Iff" />
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 68107f66..47301ead 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="7" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
   </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 817bc1ed..fd64380f 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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)" />
@@ -64,9 +64,6 @@
       <concept id="8829335963593820278" name="jetbrains.mps.logic.structure.LogicalVariable" flags="ng" index="a7P8L">
         <reference id="8829335963593822893" name="declaration" index="a7OzE" />
       </concept>
-      <concept id="8829335963591530299" name="jetbrains.mps.logic.structure.ExpressionLogicalVariable" flags="ng" index="aZ4PW">
-        <child id="8829335963591530990" name="expression" index="aZ4eD" />
-      </concept>
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
       <concept id="861509610434243104" name="jetbrains.mps.logic.structure.DataFormTable" flags="ng" index="ns1xd">
         <child id="861509610434243105" name="contents" index="ns1xc" />
@@ -562,8 +559,8 @@
                   <node concept="3I6s7M" id="2rdxkKxrXAl" role="3I6sU7">
                     <node concept="3Aqt3T" id="2rdxkKxrXAk" role="3I6s78">
                       <ref role="3AqCNq" node="2aBGSFge6lJ" resolve="checkAll" />
-                      <node concept="aZ4PW" id="5fMWD6IydCl" role="3AunhB">
-                        <node concept="2_cIyK" id="5fMWD6IydCt" role="aZ4eD">
+                      <node concept="37jhX" id="5HLeEcf2UnH" role="3AunhB">
+                        <node concept="2_cIyK" id="5fMWD6IydCt" role="37jj2">
                           <ref role="2_cIwb" node="5fMWD6Iy9vK" resolve="typeCollector" />
                         </node>
                       </node>
diff --git a/samples/fitch/languages/samples.fitch/samples.fitch.mpl b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
index 5c9ba940..3f161f68 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="7" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
   </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 29cc5798..5143bc35 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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)" />
@@ -208,9 +208,6 @@
         <reference id="8829335963593822893" name="declaration" index="a7OzE" />
         <child id="6036655413806858011" name="indexExpr" index="3gCZO6" />
       </concept>
-      <concept id="8829335963591530299" name="jetbrains.mps.logic.structure.ExpressionLogicalVariable" flags="ng" index="aZ4PW">
-        <child id="8829335963591530990" name="expression" index="aZ4eD" />
-      </concept>
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
         <child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
       </concept>
@@ -564,8 +561,8 @@
         <node concept="3clFbS" id="4dPZ2m2k8Vr" role="3uniRr">
           <node concept="3Aqczg" id="4dPZ2m2k8Vq" role="3cqZAp">
             <node concept="3A8Hvi" id="4dPZ2m2k8Vn" role="3Aqpz8">
-              <node concept="aZ4PW" id="4dPZ2m2k8Vx" role="3A8wtg">
-                <node concept="3txIi4" id="4dPZ2m2k8VB" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2Uov" role="3A8wtg">
+                <node concept="3txIi4" id="4dPZ2m2k8VB" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7VBaGntJSGF" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntJSG0" resolve="Bool" />
@@ -662,8 +659,8 @@
           </node>
           <node concept="3Aqczg" id="JqEP$8smJ2" role="3cqZAp">
             <node concept="3A8Hvi" id="JqEP$8smJ8" role="3Aqpz8">
-              <node concept="aZ4PW" id="JqEP$8smJ9" role="3A8wtg">
-                <node concept="3txIi4" id="JqEP$8smJa" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2Uow" role="3A8wtg">
+                <node concept="3txIi4" id="JqEP$8smJa" role="37jj2" />
               </node>
               <node concept="ns1u0" id="JqEP$8smJb" role="3A8w4Q">
                 <ref role="ns1xF" node="JqEP$8smGC" resolve="Pair" />
@@ -715,8 +712,8 @@
           </node>
           <node concept="3Aqczg" id="4dPZ2m2k8VP" role="3cqZAp">
             <node concept="3A8Hvi" id="4dPZ2m2k8VQ" role="3Aqpz8">
-              <node concept="aZ4PW" id="4dPZ2m2k8VR" role="3A8wtg">
-                <node concept="3txIi4" id="4dPZ2m2k8VS" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2Uox" role="3A8wtg">
+                <node concept="3txIi4" id="4dPZ2m2k8VS" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7VBaGntJSGt" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntJSG2" resolve="Fun" />
@@ -822,8 +819,8 @@
           </node>
           <node concept="3Aqczg" id="3vXKzDNGvky" role="3cqZAp">
             <node concept="3A8Hvi" id="3vXKzDNGvkz" role="3Aqpz8">
-              <node concept="aZ4PW" id="3vXKzDNGvk$" role="3A8wtg">
-                <node concept="3txIi4" id="3vXKzDNGvk_" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2Uoy" role="3A8wtg">
+                <node concept="3txIi4" id="3vXKzDNGvk_" role="37jj2" />
               </node>
               <node concept="a7P8L" id="3vXKzDNGvm8" role="3A8w4Q">
                 <ref role="a7OzE" node="3vXKzDNGvlI" resolve="Free" />
@@ -892,8 +889,8 @@
           </node>
           <node concept="3Aqczg" id="3vXKzDNGwIN" role="3cqZAp">
             <node concept="3A8Hvi" id="3vXKzDNGwIO" role="3Aqpz8">
-              <node concept="aZ4PW" id="3vXKzDNGwIP" role="3A8wtg">
-                <node concept="3txIi4" id="3vXKzDNGwIQ" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2Uoz" role="3A8wtg">
+                <node concept="3txIi4" id="3vXKzDNGwIQ" role="37jj2" />
               </node>
               <node concept="ns1u0" id="3vXKzDNGwK0" role="3A8w4Q">
                 <ref role="ns1xF" node="48ZGLP8wdTf" resolve="VarRef" />
@@ -1497,8 +1494,8 @@
           </node>
           <node concept="3Aqczg" id="12dHl3ZCEw0" role="3cqZAp">
             <node concept="3A8Hvi" id="12dHl3ZCEvX" role="3Aqpz8">
-              <node concept="aZ4PW" id="12dHl3ZCEw7" role="3A8wtg">
-                <node concept="3txIi4" id="12dHl3ZCEwd" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2Uo$" role="3A8wtg">
+                <node concept="3txIi4" id="12dHl3ZCEwd" role="37jj2" />
               </node>
               <node concept="ns1u0" id="7VBaGntJSGP" role="3A8w4Q">
                 <ref role="ns1xF" node="7VBaGntJSG6" resolve="Forall" />
@@ -1678,8 +1675,8 @@
           </node>
           <node concept="3Aqczg" id="47tET_W4X7n" role="3cqZAp">
             <node concept="3A8Hvi" id="47tET_W4X7o" role="3Aqpz8">
-              <node concept="aZ4PW" id="47tET_W4X7p" role="3A8wtg">
-                <node concept="3txIi4" id="47tET_W4X7q" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2Uo_" role="3A8wtg">
+                <node concept="3txIi4" id="47tET_W4X7q" role="37jj2" />
               </node>
               <node concept="a7P8L" id="47tET_W4X8W" role="3A8w4Q">
                 <ref role="a7OzE" node="47tET_W4Sbx" resolve="Ctr" />
@@ -8593,8 +8590,8 @@
                   <node concept="3I6s7M" id="5Eb7bDWO9lH" role="3I6sU7">
                     <node concept="3Aqt3T" id="5Eb7bDWO9lG" role="3I6s78">
                       <ref role="3AqCNq" node="4dPZ2m2jAgt" resolve="recoverAll" />
-                      <node concept="aZ4PW" id="5fMWD6HQq56" role="3AunhB">
-                        <node concept="2_cIyK" id="5fMWD6HQq5e" role="aZ4eD">
+                      <node concept="37jhX" id="5HLeEcf2UoA" role="3AunhB">
+                        <node concept="2_cIyK" id="5fMWD6HQq5e" role="37jj2">
                           <ref role="2_cIwb" node="5fMWD6HFjux" resolve="typesUpdateFun" />
                         </node>
                       </node>
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
index d00ac7d9..2796c9d6 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="7" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
     <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 aee7a4b6..51b41770 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="7" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
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 90313734..12596726 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
@@ -59,7 +59,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="7" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
   </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 b74e4969..163253a3 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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 f6e3a7a7..533c3aca 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="0" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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="20" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -366,9 +366,6 @@
         <reference id="8829335963593822893" name="declaration" index="a7OzE" />
         <child id="6036655413806858011" name="indexExpr" index="3gCZO6" />
       </concept>
-      <concept id="8829335963591530299" name="jetbrains.mps.logic.structure.ExpressionLogicalVariable" flags="ng" index="aZ4PW">
-        <child id="8829335963591530990" name="expression" index="aZ4eD" />
-      </concept>
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
         <child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
       </concept>
@@ -16409,8 +16406,8 @@
         <node concept="3clFbS" id="4lCLOtwq46M" role="3uniRr">
           <node concept="3Aqczg" id="4lCLOtwq46N" role="3cqZAp">
             <node concept="3A8Hvi" id="4lCLOtwq46O" role="3Aqpz8">
-              <node concept="aZ4PW" id="4lCLOtwq46P" role="3A8wtg">
-                <node concept="3txIi4" id="4lCLOtwq46Q" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UrE" role="3A8wtg">
+                <node concept="3txIi4" id="4lCLOtwq46Q" role="37jj2" />
               </node>
               <node concept="ns1u0" id="4lCLOtwq4cs" role="3A8w4Q">
                 <ref role="ns1xF" node="4lCLOtwq2MF" resolve="type" />
@@ -16457,8 +16454,8 @@
           </node>
           <node concept="3Aqczg" id="2HYHa0WV2Rc" role="3cqZAp">
             <node concept="3A8Hvi" id="2HYHa0WV2R9" role="3Aqpz8">
-              <node concept="aZ4PW" id="2HYHa0WV2Rj" role="3A8wtg">
-                <node concept="3txIi4" id="2HYHa0WV2Rp" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UrF" role="3A8wtg">
+                <node concept="3txIi4" id="2HYHa0WV2Rp" role="37jj2" />
               </node>
               <node concept="ns1u0" id="4vr5SApNsrv" role="3A8w4Q">
                 <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
@@ -16523,8 +16520,8 @@
           <node concept="3clFbH" id="4MEOIDEwTac" role="3cqZAp" />
           <node concept="3Aqczg" id="4MEOIDEwTar" role="3cqZAp">
             <node concept="3A8Hvi" id="4MEOIDEwTas" role="3Aqpz8">
-              <node concept="aZ4PW" id="4MEOIDEwTat" role="3A8wtg">
-                <node concept="3txIi4" id="4MEOIDEwTau" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UrG" role="3A8wtg">
+                <node concept="3txIi4" id="4MEOIDEwTau" role="37jj2" />
               </node>
               <node concept="ns1u0" id="JOGAOsVt9A" role="3A8w4Q">
                 <ref role="ns1xF" node="JOGAOsVt2o" resolve="array" />
@@ -16596,8 +16593,8 @@
           <node concept="3clFbH" id="4MEOIDEwTiK" role="3cqZAp" />
           <node concept="3Aqczg" id="4MEOIDEwTgI" role="3cqZAp">
             <node concept="3A8Hvi" id="4MEOIDEwTgJ" role="3Aqpz8">
-              <node concept="aZ4PW" id="4MEOIDEwTgK" role="3A8wtg">
-                <node concept="3txIi4" id="4MEOIDEwTgL" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UrH" role="3A8wtg">
+                <node concept="3txIi4" id="4MEOIDEwTgL" role="37jj2" />
               </node>
               <node concept="ns1u0" id="JOGAOsVtaG" role="3A8w4Q">
                 <ref role="ns1xF" node="JOGAOsVt2r" resolve="variableArity" />
@@ -16668,8 +16665,8 @@
           <node concept="3clFbH" id="3AWu6EmiQZm" role="3cqZAp" />
           <node concept="3Aqczg" id="4MEOIDEwTno" role="3cqZAp">
             <node concept="3A8Hvi" id="4MEOIDEwTnp" role="3Aqpz8">
-              <node concept="aZ4PW" id="4MEOIDEwTnq" role="3A8wtg">
-                <node concept="3txIi4" id="4MEOIDEwTnr" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UrI" role="3A8wtg">
+                <node concept="3txIi4" id="4MEOIDEwTnr" role="37jj2" />
               </node>
               <node concept="ns1u0" id="JOGAOsVta5" role="3A8w4Q">
                 <ref role="ns1xF" node="JOGAOsVt2u" resolve="upperBound" />
@@ -16740,8 +16737,8 @@
           <node concept="3clFbH" id="3AWu6EmiPOJ" role="3cqZAp" />
           <node concept="3Aqczg" id="4MEOIDEwT$F" role="3cqZAp">
             <node concept="3A8Hvi" id="4MEOIDEwT$G" role="3Aqpz8">
-              <node concept="aZ4PW" id="4MEOIDEwT$H" role="3A8wtg">
-                <node concept="3txIi4" id="4MEOIDEwT$I" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UrJ" role="3A8wtg">
+                <node concept="3txIi4" id="4MEOIDEwT$I" role="37jj2" />
               </node>
               <node concept="ns1u0" id="JOGAOsVt8W" role="3A8w4Q">
                 <ref role="ns1xF" node="JOGAOsVt2x" resolve="lowerBound" />
@@ -16771,8 +16768,8 @@
         <node concept="3clFbS" id="4MEOIDEwTET" role="3uniRr">
           <node concept="3Aqczg" id="4MEOIDEwTEV" role="3cqZAp">
             <node concept="3A8Hvi" id="4MEOIDEwTEW" role="3Aqpz8">
-              <node concept="aZ4PW" id="4MEOIDEwTEX" role="3A8wtg">
-                <node concept="3txIi4" id="4MEOIDEwTEY" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UrK" role="3A8wtg">
+                <node concept="3txIi4" id="4MEOIDEwTEY" role="37jj2" />
               </node>
               <node concept="ns1u0" id="JOGAOsVt9C" role="3A8w4Q">
                 <ref role="ns1xF" node="JOGAOsVt2$" resolve="wildcard" />
@@ -16794,8 +16791,8 @@
         <node concept="3clFbS" id="4MEOIDEwU4$" role="3uniRr">
           <node concept="3Aqczg" id="4MEOIDEwU4A" role="3cqZAp">
             <node concept="3A8Hvi" id="4MEOIDEwU4B" role="3Aqpz8">
-              <node concept="aZ4PW" id="4MEOIDEwU4C" role="3A8wtg">
-                <node concept="3txIi4" id="4MEOIDEwU4D" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UrL" role="3A8wtg">
+                <node concept="3txIi4" id="4MEOIDEwU4D" role="37jj2" />
               </node>
               <node concept="ns1u0" id="JOGAOsVtaV" role="3A8w4Q">
                 <ref role="ns1xF" node="JOGAOsVt3a" resolve="_void_" />
@@ -16817,8 +16814,8 @@
         <node concept="3clFbS" id="4MEOIDEwU5o" role="3uniRr">
           <node concept="3Aqczg" id="4MEOIDEwU5s" role="3cqZAp">
             <node concept="3A8Hvi" id="4MEOIDEwU5t" role="3Aqpz8">
-              <node concept="aZ4PW" id="4MEOIDEwU5u" role="3A8wtg">
-                <node concept="3txIi4" id="4MEOIDEwU5v" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UrM" role="3A8wtg">
+                <node concept="3txIi4" id="4MEOIDEwU5v" role="37jj2" />
               </node>
               <node concept="ns1u0" id="JOGAOsVt9g" role="3A8w4Q">
                 <ref role="ns1xF" node="JOGAOsVt3c" resolve="_null_" />
@@ -32429,8 +32426,8 @@
                   <node concept="3I6s7M" id="12QmIoyIWn9" role="3I6sU7">
                     <node concept="3Aqt3T" id="12QmIoyIWn7" role="3I6s78">
                       <ref role="3AqCNq" node="20Zoq4kTOFb" resolve="recoverAll" />
-                      <node concept="aZ4PW" id="5fMWD6HQq56" role="3AunhB">
-                        <node concept="2_cIyK" id="5fMWD6HQq5e" role="aZ4eD">
+                      <node concept="37jhX" id="5HLeEcf2UrN" role="3AunhB">
+                        <node concept="2_cIyK" id="5fMWD6HQq5e" role="37jj2">
                           <ref role="2_cIwb" node="5fMWD6HFjux" resolve="typeCollector" />
                         </node>
                       </node>
@@ -34539,8 +34536,8 @@
           </node>
           <node concept="3Aqczg" id="4btN1w5JK$v" role="3cqZAp">
             <node concept="3A8Hvi" id="4btN1w5JK$p" role="3Aqpz8">
-              <node concept="aZ4PW" id="4btN1w5JKDf" role="3A8wtg">
-                <node concept="3txIi4" id="4btN1w5JKKV" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UrO" role="3A8wtg">
+                <node concept="3txIi4" id="4btN1w5JKKV" role="37jj2" />
               </node>
               <node concept="ns1u0" id="4btN1w5JKSB" role="3A8w4Q">
                 <ref role="ns1xF" node="4btN1w5A0eS" resolve="genDecl" />
@@ -34607,8 +34604,8 @@
         <node concept="3clFbS" id="4btN1w5K$Qf" role="3uniRr">
           <node concept="3Aqczg" id="5mvKPwwqdbi" role="3cqZAp">
             <node concept="3A8Hvi" id="5mvKPwwqdbc" role="3Aqpz8">
-              <node concept="aZ4PW" id="5mvKPwwqdoH" role="3A8wtg">
-                <node concept="3txIi4" id="5mvKPwwqdwp" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2UrP" role="3A8wtg">
+                <node concept="3txIi4" id="5mvKPwwqdwp" role="37jj2" />
               </node>
               <node concept="ns1u0" id="5mvKPwwqebK" role="3A8w4Q">
                 <ref role="ns1xF" node="4btN1w5JLyI" resolve="typeVariableDecl" />
@@ -34921,8 +34918,8 @@
                 </node>
                 <node concept="3Aqczg" id="5Oz70LKcmHX" role="3cqZAp">
                   <node concept="3A8Hvi" id="5Oz70LKcmHY" role="3Aqpz8">
-                    <node concept="aZ4PW" id="5Oz70LKcmHZ" role="3A8wtg">
-                      <node concept="3txIi4" id="5Oz70LKcmI0" role="aZ4eD" />
+                    <node concept="37jhX" id="5HLeEcf2UrQ" role="3A8wtg">
+                      <node concept="3txIi4" id="5Oz70LKcmI0" role="37jj2" />
                     </node>
                     <node concept="ns1u0" id="5Oz70LKcmI1" role="3A8w4Q">
                       <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
@@ -35098,8 +35095,8 @@
                       </node>
                       <node concept="3Aqczg" id="5Oz70LKtpTf" role="3cqZAp">
                         <node concept="3A8Hvi" id="5Oz70LKtpTg" role="3Aqpz8">
-                          <node concept="aZ4PW" id="5Oz70LKtpTh" role="3A8wtg">
-                            <node concept="3txIi4" id="5Oz70LKtpTi" role="aZ4eD" />
+                          <node concept="37jhX" id="5HLeEcf2UrR" role="3A8wtg">
+                            <node concept="3txIi4" id="5Oz70LKtpTi" role="37jj2" />
                           </node>
                           <node concept="ns1u0" id="5Oz70LKtpTj" role="3A8w4Q">
                             <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
@@ -35179,8 +35176,8 @@
                       </node>
                       <node concept="3Aqczg" id="4btN1w5K5qK" role="3cqZAp">
                         <node concept="3A8Hvi" id="4btN1w5K5qH" role="3Aqpz8">
-                          <node concept="aZ4PW" id="4btN1w5K5yr" role="3A8wtg">
-                            <node concept="3txIi4" id="4btN1w5K5Ak" role="aZ4eD" />
+                          <node concept="37jhX" id="5HLeEcf2UrS" role="3A8wtg">
+                            <node concept="3txIi4" id="4btN1w5K5Ak" role="37jj2" />
                           </node>
                           <node concept="ns1u0" id="4btN1w5K5Ed" role="3A8w4Q">
                             <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
@@ -35336,8 +35333,8 @@
                     </node>
                     <node concept="3Aqczg" id="3R6X$QWh1f8" role="3cqZAp">
                       <node concept="3A8Hvi" id="3R6X$QWh1f9" role="3Aqpz8">
-                        <node concept="aZ4PW" id="3R6X$QWh1fa" role="3A8wtg">
-                          <node concept="3txIi4" id="3R6X$QWh1fb" role="aZ4eD" />
+                        <node concept="37jhX" id="5HLeEcf2UrT" role="3A8wtg">
+                          <node concept="3txIi4" id="3R6X$QWh1fb" role="37jj2" />
                         </node>
                         <node concept="ns1u0" id="3R6X$QWh1fc" role="3A8w4Q">
                           <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
@@ -35437,8 +35434,8 @@
               </node>
               <node concept="3Aqczg" id="3fECE2uOjPL" role="3cqZAp">
                 <node concept="3A8Hvi" id="3fECE2uOjPM" role="3Aqpz8">
-                  <node concept="aZ4PW" id="3fECE2uOjPN" role="3A8wtg">
-                    <node concept="3txIi4" id="3fECE2uOjPO" role="aZ4eD" />
+                  <node concept="37jhX" id="5HLeEcf2UrU" role="3A8wtg">
+                    <node concept="3txIi4" id="3fECE2uOjPO" role="37jj2" />
                   </node>
                   <node concept="ns1u0" id="3fECE2uOjPP" role="3A8w4Q">
                     <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
@@ -35544,8 +35541,8 @@
               </node>
               <node concept="3Aqczg" id="1GnJ2SU0X8Z" role="3cqZAp">
                 <node concept="3A8Hvi" id="1GnJ2SU0X90" role="3Aqpz8">
-                  <node concept="aZ4PW" id="1GnJ2SU0X91" role="3A8wtg">
-                    <node concept="3txIi4" id="1GnJ2SU0X92" role="aZ4eD" />
+                  <node concept="37jhX" id="5HLeEcf2UrV" role="3A8wtg">
+                    <node concept="3txIi4" id="1GnJ2SU0X92" role="37jj2" />
                   </node>
                   <node concept="a7P8L" id="1GnJ2SU0X93" role="3A8w4Q">
                     <ref role="a7OzE" node="4btN1w5LPR0" resolve="TVType" />
@@ -35622,11 +35619,11 @@
                         </node>
                         <node concept="3Aqczg" id="5ZX9ph0Eoc9" role="3cqZAp">
                           <node concept="3A8Hvi" id="5ZX9ph0Eoca" role="3Aqpz8">
-                            <node concept="aZ4PW" id="5ZX9ph0Eocb" role="3A8wtg">
-                              <node concept="3txIi4" id="5ZX9ph0Eocc" role="aZ4eD" />
+                            <node concept="37jhX" id="5HLeEcf2UrW" role="3A8wtg">
+                              <node concept="3txIi4" id="5ZX9ph0Eocc" role="37jj2" />
                             </node>
-                            <node concept="aZ4PW" id="6GI3QeRx_Bn" role="3A8w4Q">
-                              <node concept="37vLTw" id="5ZX9ph0EEV3" role="aZ4eD">
+                            <node concept="37jhX" id="5HLeEcf2UrX" role="3A8w4Q">
+                              <node concept="37vLTw" id="5ZX9ph0EEV3" role="37jj2">
                                 <ref role="3cqZAo" node="5ZX9ph0EiYq" resolve="tvsubs" />
                               </node>
                             </node>
@@ -35669,8 +35666,8 @@
                           </node>
                           <node concept="3Aqczg" id="3R6X$QWvkQV" role="3cqZAp">
                             <node concept="3A8Hvi" id="3R6X$QWvkQW" role="3Aqpz8">
-                              <node concept="aZ4PW" id="3R6X$QWvkQX" role="3A8wtg">
-                                <node concept="3txIi4" id="3R6X$QWvkQY" role="aZ4eD" />
+                              <node concept="37jhX" id="5HLeEcf2UrY" role="3A8wtg">
+                                <node concept="3txIi4" id="3R6X$QWvkQY" role="37jj2" />
                               </node>
                               <node concept="a7P8L" id="2ssC8Ui5Gng" role="3A8w4Q">
                                 <ref role="a7OzE" node="4btN1w5KJhG" resolve="TV" />
@@ -35856,8 +35853,8 @@
                       </node>
                       <node concept="3Aqczg" id="4btN1w5KFr9" role="3cqZAp">
                         <node concept="3A8Hvi" id="4btN1w5KFr6" role="3Aqpz8">
-                          <node concept="aZ4PW" id="4btN1w5KFv1" role="3A8wtg">
-                            <node concept="3txIi4" id="4btN1w5KFyU" role="aZ4eD" />
+                          <node concept="37jhX" id="5HLeEcf2UrZ" role="3A8wtg">
+                            <node concept="3txIi4" id="4btN1w5KFyU" role="37jj2" />
                           </node>
                           <node concept="a7P8L" id="4btN1w5LSLI" role="3A8w4Q">
                             <ref role="a7OzE" node="4btN1w5LPR0" resolve="TVType" />
@@ -36414,8 +36411,8 @@
           </node>
           <node concept="3Aqczg" id="4MEOIDEwU3f" role="3cqZAp">
             <node concept="3A8Hvi" id="4MEOIDEwU3g" role="3Aqpz8">
-              <node concept="aZ4PW" id="4MEOIDEwU3h" role="3A8wtg">
-                <node concept="3txIi4" id="4MEOIDEwU3i" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2Us0" role="3A8wtg">
+                <node concept="3txIi4" id="4MEOIDEwU3i" role="37jj2" />
               </node>
               <node concept="ns1u0" id="JOGAOsVt8R" role="3A8w4Q">
                 <ref role="ns1xF" node="JOGAOsVt36" resolve="_boolean_" />
@@ -36458,8 +36455,8 @@
             <node concept="3clFbS" id="4vr5SApBIWI" role="3clFbx">
               <node concept="3Aqczg" id="4vr5SApBIYN" role="3cqZAp">
                 <node concept="3A8Hvi" id="4vr5SApBIYO" role="3Aqpz8">
-                  <node concept="aZ4PW" id="4vr5SApBIYP" role="3A8wtg">
-                    <node concept="3txIi4" id="4vr5SApBIYQ" role="aZ4eD" />
+                  <node concept="37jhX" id="5HLeEcf2Us1" role="3A8wtg">
+                    <node concept="3txIi4" id="4vr5SApBIYQ" role="37jj2" />
                   </node>
                   <node concept="ns1u0" id="4vr5SApBIYR" role="3A8w4Q">
                     <ref role="ns1xF" node="JOGAOsVt2M" resolve="_char_" />
@@ -36485,8 +36482,8 @@
               <node concept="3clFbS" id="4vr5SApBJd5" role="9aQI4">
                 <node concept="3Aqczg" id="5XJPBczymaz" role="3cqZAp">
                   <node concept="3A8Hvi" id="5XJPBczyma$" role="3Aqpz8">
-                    <node concept="aZ4PW" id="5XJPBczyma_" role="3A8wtg">
-                      <node concept="3txIi4" id="5XJPBczymaA" role="aZ4eD" />
+                    <node concept="37jhX" id="5HLeEcf2Us2" role="3A8wtg">
+                      <node concept="3txIi4" id="5XJPBczymaA" role="37jj2" />
                     </node>
                     <node concept="ns1u0" id="5XJPBczymaB" role="3A8w4Q">
                       <ref role="ns1xF" node="JOGAOsVt2M" resolve="_char_" />
@@ -36543,8 +36540,8 @@
         <node concept="3clFbS" id="4MEOIDEwTVc" role="3uniRr">
           <node concept="3Aqczg" id="4MEOIDEwTVe" role="3cqZAp">
             <node concept="3A8Hvi" id="4MEOIDEwTVf" role="3Aqpz8">
-              <node concept="aZ4PW" id="4MEOIDEwTVg" role="3A8wtg">
-                <node concept="3txIi4" id="4MEOIDEwTVh" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2Us3" role="3A8wtg">
+                <node concept="3txIi4" id="4MEOIDEwTVh" role="37jj2" />
               </node>
               <node concept="ns1u0" id="JOGAOsVtaP" role="3A8w4Q">
                 <ref role="ns1xF" node="JOGAOsVt2I" resolve="_byte_" />
@@ -36566,8 +36563,8 @@
         <node concept="3clFbS" id="4MEOIDEwU1X" role="3uniRr">
           <node concept="3Aqczg" id="5XJPBczy$GD" role="3cqZAp">
             <node concept="3A8Hvi" id="5XJPBczy$GE" role="3Aqpz8">
-              <node concept="aZ4PW" id="5XJPBczy$GF" role="3A8wtg">
-                <node concept="3txIi4" id="5XJPBczy$GG" role="aZ4eD" />
+              <node concept="37jhX" id="5HLeEcf2Us4" role="3A8wtg">
+                <node concept="3txIi4" id="5XJPBczy$GG" role="37jj2" />
               </node>
               <node concept="ns1u0" id="5XJPBczy$GH" role="3A8w4Q">
                 <ref role="ns1xF" node="JOGAOsVt2Q" resolve="_short_" />
@@ -36647,8 +36644,8 @@
                   </node>
                   <node concept="3Aqczg" id="4MEOIDEwTQ_" role="3cqZAp">
                     <node concept="3A8Hvi" id="4MEOIDEwTQA" role="3Aqpz8">
-                      <node concept="aZ4PW" id="4MEOIDEwTQB" role="3A8wtg">
-                        <node concept="3txIi4" id="4MEOIDEwTQC" role="aZ4eD" />
+                      <node concept="37jhX" id="5HLeEcf2Us5" role="3A8wtg">
+                        <node concept="3txIi4" id="4MEOIDEwTQC" role="37jj2" />
                       </node>
                       <node concept="ns1u0" id="JOGAOsVtcg" role="3A8w4Q">
                         <ref role="ns1xF" node="JOGAOsVt2E" resolve="_int_" />
@@ -36667,8 +36664,8 @@
                   <node concept="3clFbS" id="4vr5SApBJST" role="9aQI4">
                     <node concept="3Aqczg" id="4vr5SApBJVg" role="3cqZAp">
                       <node concept="3A8Hvi" id="4vr5SApBJVh" role="3Aqpz8">
-                        <node concept="aZ4PW" id="4vr5SApBJVi" role="3A8wtg">
-                          <node concept="3txIi4" id="4vr5SApBJVj" role="aZ4eD" />
+                        <node concept="37jhX" id="5HLeEcf2Us6" role="3A8wtg">
+                          <node concept="3txIi4" id="4vr5SApBJVj" role="37jj2" />
                         </node>
                         <node concept="ns1u0" id="4vr5SApBJVk" role="3A8w4Q">
                           <ref role="ns1xF" node="JOGAOsVt2E" resolve="_int_" />
@@ -36760,8 +36757,8 @@
                 <node concept="3clFbS" id="5XJPBczUo9X" role="3clFbx">
                   <node concept="3Aqczg" id="5XJPBczy$Rf" role="3cqZAp">
                     <node concept="3A8Hvi" id="5XJPBczy$Rg" role="3Aqpz8">
-                      <node concept="aZ4PW" id="5XJPBczy$Rh" role="3A8wtg">
-                        <node concept="3txIi4" id="5XJPBczy$Ri" role="aZ4eD" />
+                      <node concept="37jhX" id="5HLeEcf2Us7" role="3A8wtg">
+                        <node concept="3txIi4" id="5XJPBczy$Ri" role="37jj2" />
                       </node>
                       <node concept="ns1u0" id="5XJPBczy$Rj" role="3A8w4Q">
                         <ref role="ns1xF" node="JOGAOsVt2U" resolve="_long_" />
@@ -36839,8 +36836,8 @@
                   <node concept="3clFbS" id="4vr5SApBKiB" role="9aQI4">
                     <node concept="3Aqczg" id="4vr5SApBKme" role="3cqZAp">
                       <node concept="3A8Hvi" id="4vr5SApBKmf" role="3Aqpz8">
-                        <node concept="aZ4PW" id="4vr5SApBKmg" role="3A8wtg">
-                          <node concept="3txIi4" id="4vr5SApBKmh" role="aZ4eD" />
+                        <node concept="37jhX" id="5HLeEcf2Us8" role="3A8wtg">
+                          <node concept="3txIi4" id="4vr5SApBKmh" role="37jj2" />
                         </node>
                         <node concept="ns1u0" id="4vr5SApBKmi" role="3A8w4Q">
                           <ref role="ns1xF" node="JOGAOsVt2U" resolve="_long_" />
@@ -36906,8 +36903,8 @@
                 <node concept="3clFbS" id="5XJPBczUoyD" role="3clFbx">
                   <node concept="3Aqczg" id="5XJPBczyBMB" role="3cqZAp">
                     <node concept="3A8Hvi" id="5XJPBczyBMC" role="3Aqpz8">
-                      <node concept="aZ4PW" id="5XJPBczyBMD" role="3A8wtg">
-                        <node concept="3txIi4" id="5XJPBczyBME" role="aZ4eD" />
+                      <node concept="37jhX" id="5HLeEcf2Us9" role="3A8wtg">
+                        <node concept="3txIi4" id="5XJPBczyBME" role="37jj2" />
                       </node>
                       <node concept="ns1u0" id="5XJPBczyBMF" role="3A8w4Q">
                         <ref role="ns1xF" node="JOGAOsVt2Y" resolve="_float_" />
@@ -36936,8 +36933,8 @@
                   <node concept="3clFbS" id="4vr5SApBKZF" role="9aQI4">
                     <node concept="3Aqczg" id="4vr5SApBKXt" role="3cqZAp">
                       <node concept="3A8Hvi" id="4vr5SApBKXu" role="3Aqpz8">
-                        <node concept="aZ4PW" id="4vr5SApBKXv" role="3A8wtg">
-                          <node concept="3txIi4" id="4vr5SApBKXw" role="aZ4eD" />
+                        <node concept="37jhX" id="5HLeEcf2Usa" role="3A8wtg">
+                          <node concept="3txIi4" id="4vr5SApBKXw" role="37jj2" />
                         </node>
                         <node concept="ns1u0" id="4vr5SApBKXx" role="3A8w4Q">
                           <ref role="ns1xF" node="JOGAOsVt2Y" resolve="_float_" />
@@ -37003,8 +37000,8 @@
                 <node concept="3clFbS" id="5XJPBczUoVW" role="3clFbx">
                   <node concept="3Aqczg" id="5XJPBczyDT3" role="3cqZAp">
                     <node concept="3A8Hvi" id="5XJPBczyDT4" role="3Aqpz8">
-                      <node concept="aZ4PW" id="5XJPBczyDT5" role="3A8wtg">
-                        <node concept="3txIi4" id="5XJPBczyDT6" role="aZ4eD" />
+                      <node concept="37jhX" id="5HLeEcf2Usb" role="3A8wtg">
+                        <node concept="3txIi4" id="5XJPBczyDT6" role="37jj2" />
                       </node>
                       <node concept="ns1u0" id="5XJPBczyDT7" role="3A8w4Q">
                         <ref role="ns1xF" node="JOGAOsVt32" resolve="_double_" />
@@ -37033,8 +37030,8 @@
                   <node concept="3clFbS" id="4vr5SApBLk0" role="9aQI4">
                     <node concept="3Aqczg" id="4vr5SApBLqq" role="3cqZAp">
                       <node concept="3A8Hvi" id="4vr5SApBLqr" role="3Aqpz8">
-                        <node concept="aZ4PW" id="4vr5SApBLqs" role="3A8wtg">
-                          <node concept="3txIi4" id="4vr5SApBLqt" role="aZ4eD" />
+                        <node concept="37jhX" id="5HLeEcf2Usc" role="3A8wtg">
+                          <node concept="3txIi4" id="4vr5SApBLqt" role="37jj2" />
                         </node>
                         <node concept="ns1u0" id="4vr5SApBLqu" role="3A8w4Q">
                           <ref role="ns1xF" node="JOGAOsVt32" resolve="_double_" />
@@ -37467,8 +37464,8 @@
                   </node>
                   <node concept="3I6s7M" id="4pwDyRBIFn$" role="3I6sU7">
                     <node concept="3A8Hvi" id="4pwDyRBIFnu" role="3I6s78">
-                      <node concept="aZ4PW" id="4pwDyRBIFnT" role="3A8wtg">
-                        <node concept="2_cIyK" id="4pwDyRBIFnZ" role="aZ4eD">
+                      <node concept="37jhX" id="5HLeEcf2Usd" role="3A8wtg">
+                        <node concept="2_cIyK" id="4pwDyRBIFnZ" role="37jj2">
                           <ref role="2_cIwb" node="4pwDyRBuLd4" resolve="result" />
                         </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 3b091a8e..203495e2 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="7" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="8" />
     <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 0be3b779..239d9583 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="7" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="8" />
     <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>