From 796ad9ad2cebe1d17a7f6c1120f9c7a8b996f49b Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 12 Feb 2020 12:26:09 +0100
Subject: [PATCH] Apply migration to drop ValueOfExpression.

---
 .../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                          |  62 +-
 ...brains.mps.coderules.typechecking.test.msd |   2 +-
 ...ins.mps.coderules.incrementality@tests.mps |   2 +-
 ...rains.mps.coderules.typechecking@tests.mps |   2 +-
 .../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      |   2 +-
 .../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  |  17 +-
 .../languages/samples.fitch/samples.fitch.mpl |   2 +-
 .../samples.lambdacalc/models/types.mps       | 190 ++---
 .../samples.lambdacalc/samples.lambdacalc.mpl |   2 +-
 .../jetbrains.mps.baseLanguage.javadocExt.mpl |   2 +-
 .../jetbrains.mps.baseLanguageExt.mpl         |   2 +-
 .../models/controlflow.mps                    | 145 ++--
 .../jetbrains.mps.baseLanguageExt.types.mps   | 702 +++++++-----------
 .../jetbrains.mps.baseLanguageExt.test.msd    |   2 +-
 ...s.mps.baseLanguageExt.test.types@tests.mps |   2 +-
 37 files changed, 453 insertions(+), 729 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 404b3e49..de85621b 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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 6ad4e96a..addcdcb7 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="5" />
+        <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
       </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="5" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
     <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 3ad0fe7d..fff51fcb 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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 107c17f8..dd5cadee 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="5" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
     <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 0289638d..0053c1f7 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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 f9c3c9e4..7a76dc03 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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 95248658..5a4ae10c 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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 e54a965c..9b5acfc8 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="5" />
+        <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
       </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 a08a44df..86ec832d 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="5" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
   </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 e42b7c18..904d5f65 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="5" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
   </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 b8dd8047..b03edde5 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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)" />
@@ -129,8 +129,8 @@
       <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
         <child id="4780620083400582654" name="logical" index="1nq8_t" />
       </concept>
-      <concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfExpression" flags="ng" index="1TmgYN">
-        <child id="2455719244613924416" name="logical" index="1Tms7$" />
+      <concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
+        <child id="8713947027062064784" name="logical" index="1FtiSR" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -395,11 +395,9 @@
                   <node concept="3I6s7M" id="5fMWD6IydMw" role="3I6sU7">
                     <node concept="3wWvb2" id="5fMWD6IydMs" role="3I6s78">
                       <node concept="2OqwBi" id="5fMWD6IydWI" role="3wWo3s">
-                        <node concept="1TmgYN" id="5fMWD6IydMP" role="2Oq$k0">
-                          <node concept="1nq8_$" id="5fMWD6IydN0" role="1Tms7$">
-                            <node concept="a7P8L" id="5fMWD6IydMY" role="1nq8_t">
-                              <ref role="a7OzE" node="5fMWD6IydHS" resolve="TypeCollector" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYxa" role="2Oq$k0">
+                          <node concept="a7P8L" id="5fMWD6IydMY" role="1FtiSR">
+                            <ref role="a7OzE" node="5fMWD6IydHS" resolve="TypeCollector" />
                           </node>
                         </node>
                         <node concept="liA8E" id="5fMWD6Iyeel" role="2OqNvi">
@@ -415,21 +413,17 @@
                               <ref role="2pJxaS" to="qulx:7mB3viLbCL0" resolve="Type" />
                               <node concept="2pJxcG" id="5fMWD6IyeVP" role="2pJxcM">
                                 <ref role="2pJxcJ" to="qulx:7mB3viLbCL1" resolve="name" />
-                                <node concept="1TmgYN" id="5fMWD6IyeVQ" role="28ntcv">
-                                  <node concept="1nq8_$" id="5fMWD6IyeVR" role="1Tms7$">
-                                    <node concept="a7P8L" id="5fMWD6IyeVS" role="1nq8_t">
-                                      <ref role="a7OzE" node="7mB3viLdI2x" resolve="Name" />
-                                    </node>
+                                <node concept="1Ft4W6" id="7zIaaskbYxb" role="28ntcv">
+                                  <node concept="a7P8L" id="5fMWD6IyeVS" role="1FtiSR">
+                                    <ref role="a7OzE" node="7mB3viLdI2x" resolve="Name" />
                                   </node>
                                 </node>
                               </node>
                               <node concept="2pJxcG" id="5fMWD6IyeVT" role="2pJxcM">
                                 <ref role="2pJxcJ" to="qulx:7mB3viLggsO" resolve="val" />
-                                <node concept="1TmgYN" id="5fMWD6IyeVU" role="28ntcv">
-                                  <node concept="1nq8_$" id="5fMWD6IyeVV" role="1Tms7$">
-                                    <node concept="a7P8L" id="5fMWD6IyeVW" role="1nq8_t">
-                                      <ref role="a7OzE" node="7lt0LtPP29U" resolve="Val" />
-                                    </node>
+                                <node concept="1Ft4W6" id="7zIaaskbYxc" role="28ntcv">
+                                  <node concept="a7P8L" id="5fMWD6IyeVW" role="1FtiSR">
+                                    <ref role="a7OzE" node="7lt0LtPP29U" resolve="Val" />
                                   </node>
                                 </node>
                               </node>
@@ -522,22 +516,18 @@
                       <node concept="2YIFZM" id="7mB3viLiciz" role="3uHU7B">
                         <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
                         <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-                        <node concept="1TmgYN" id="7mB3viLicQJ" role="37wK5m">
-                          <node concept="1nq8_$" id="7mB3viLicSp" role="1Tms7$">
-                            <node concept="a7P8L" id="7mB3viLicSn" role="1nq8_t">
-                              <ref role="a7OzE" node="7mB3viLi4pZ" resolve="AVal" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYxd" role="37wK5m">
+                          <node concept="a7P8L" id="7mB3viLicSn" role="1FtiSR">
+                            <ref role="a7OzE" node="7mB3viLi4pZ" resolve="AVal" />
                           </node>
                         </node>
                       </node>
                       <node concept="2YIFZM" id="7mB3viLie5Z" role="3uHU7w">
                         <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
                         <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-                        <node concept="1TmgYN" id="7mB3viLie60" role="37wK5m">
-                          <node concept="1nq8_$" id="7mB3viLie61" role="1Tms7$">
-                            <node concept="a7P8L" id="7mB3viLieeF" role="1nq8_t">
-                              <ref role="a7OzE" node="7mB3viLi4qx" resolve="BVal" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYxe" role="37wK5m">
+                          <node concept="a7P8L" id="7mB3viLieeF" role="1FtiSR">
+                            <ref role="a7OzE" node="7mB3viLi4qx" resolve="BVal" />
                           </node>
                         </node>
                       </node>
@@ -631,22 +621,18 @@
                       <node concept="2YIFZM" id="2DIFeUB7n6D" role="3uHU7B">
                         <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
                         <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-                        <node concept="1TmgYN" id="2DIFeUB7n6E" role="37wK5m">
-                          <node concept="1nq8_$" id="2DIFeUB7n6F" role="1Tms7$">
-                            <node concept="a7P8L" id="2DIFeUB7seG" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYT5cnq" resolve="AVal" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYxf" role="37wK5m">
+                          <node concept="a7P8L" id="2DIFeUB7seG" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYT5cnq" resolve="AVal" />
                           </node>
                         </node>
                       </node>
                       <node concept="2YIFZM" id="2DIFeUB7n6H" role="3uHU7w">
                         <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
                         <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-                        <node concept="1TmgYN" id="2DIFeUB7n6I" role="37wK5m">
-                          <node concept="1nq8_$" id="2DIFeUB7n6J" role="1Tms7$">
-                            <node concept="a7P8L" id="2DIFeUB7seJ" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYT5cnr" resolve="BVal" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYxg" role="37wK5m">
+                          <node concept="a7P8L" id="2DIFeUB7seJ" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYT5cnr" resolve="BVal" />
                           </node>
                         </node>
                       </node>
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 0e8c5b86..d6e5e44b 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="5" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
     <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 8e001c5e..31e965db 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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 55a4236b..65b01320 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
   </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 834a7902..0ff0da86 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="5" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
   </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 15c876a5..42e1e0c1 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
   </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 9e89180b..9ef6a899 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
   </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 aeb71ce2..479e09c7 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="5" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
   </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 3d312f86..f1e9bb60 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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 3dd03b3f..18260a52 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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 e2412ec4..da5c5f02 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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 f86ccc24..2e0b4a41 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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 713d7da3..1696f1f7 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="5" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
   </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 bb772a9b..4a14864f 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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 8b0cd2ff..cdeb4a11 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="5" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
   </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 7ceb9670..60182b92 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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 be6faaff..640543e6 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="5" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
   </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 4aae69a5..5788ea26 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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)" />
@@ -75,11 +75,8 @@
         <child id="861509610434243084" name="template" index="ns1xx" />
       </concept>
       <concept id="861509610434276450" name="jetbrains.mps.logic.structure.DataFormTemplate" flags="ng" index="nspSf" />
-      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
-        <child id="4780620083400582654" name="logical" index="1nq8_t" />
-      </concept>
-      <concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfExpression" flags="ng" index="1TmgYN">
-        <child id="2455719244613924416" name="logical" index="1Tms7$" />
+      <concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
+        <child id="8713947027062064784" name="logical" index="1FtiSR" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -486,11 +483,9 @@
                   <node concept="3I6s7M" id="5fMWD6Iy9EN" role="3I6sU7">
                     <node concept="3wWvb2" id="5fMWD6Iy9EJ" role="3I6s78">
                       <node concept="2OqwBi" id="5fMWD6Iy9ON" role="3wWo3s">
-                        <node concept="1TmgYN" id="5fMWD6Iy9F0" role="2Oq$k0">
-                          <node concept="1nq8_$" id="5fMWD6Iy9Fb" role="1Tms7$">
-                            <node concept="a7P8L" id="5fMWD6Iy9F9" role="1nq8_t">
-                              <ref role="a7OzE" node="5fMWD6Iy9CG" resolve="TypeCollector" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYAE" role="2Oq$k0">
+                          <node concept="a7P8L" id="5fMWD6Iy9F9" role="1FtiSR">
+                            <ref role="a7OzE" node="5fMWD6Iy9CG" resolve="TypeCollector" />
                           </node>
                         </node>
                         <node concept="liA8E" id="5fMWD6Iya6q" role="2OqNvi">
diff --git a/samples/fitch/languages/samples.fitch/samples.fitch.mpl b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
index d6d28c1d..6c6439ed 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="5" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
   </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 a718140c..4741159d 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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)" />
@@ -252,8 +252,8 @@
       <concept id="960803923481532811" name="jetbrains.mps.logic.structure.ListNodeCons" flags="ng" index="3wJAYo">
         <child id="960803923481835574" name="tail" index="3wIGS_" />
       </concept>
-      <concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfExpression" flags="ng" index="1TmgYN">
-        <child id="2455719244613924416" name="logical" index="1Tms7$" />
+      <concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
+        <child id="8713947027062064784" name="logical" index="1FtiSR" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -3774,18 +3774,14 @@
                         <node concept="Xl_RD" id="1laj_RShlQz" role="37wK5m">
                           <property role="Xl_RC" value="cannot unify '%s' and '%s'" />
                         </node>
-                        <node concept="1TmgYN" id="1laj_RShlQ$" role="37wK5m">
-                          <node concept="1nq8_$" id="1laj_RShlQ_" role="1Tms7$">
-                            <node concept="a7P8L" id="1laj_RShlQA" role="1nq8_t">
-                              <ref role="a7OzE" node="44a9n8ErWrT" resolve="A" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYCn" role="37wK5m">
+                          <node concept="a7P8L" id="1laj_RShlQA" role="1FtiSR">
+                            <ref role="a7OzE" node="44a9n8ErWrT" resolve="A" />
                           </node>
                         </node>
-                        <node concept="1TmgYN" id="1laj_RShlQB" role="37wK5m">
-                          <node concept="1nq8_$" id="1laj_RShlQC" role="1Tms7$">
-                            <node concept="a7P8L" id="1laj_RShlQD" role="1nq8_t">
-                              <ref role="a7OzE" node="44a9n8Es2A7" resolve="FA" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYCo" role="37wK5m">
+                          <node concept="a7P8L" id="1laj_RShlQD" role="1FtiSR">
+                            <ref role="a7OzE" node="44a9n8Es2A7" resolve="FA" />
                           </node>
                         </node>
                       </node>
@@ -5165,11 +5161,9 @@
                   <node concept="3I6s7M" id="5fMWD6IxDdh" role="3I6sU7">
                     <node concept="3wWvb2" id="5fMWD6IxDdd" role="3I6s78">
                       <node concept="2OqwBi" id="5fMWD6IxDnG" role="3wWo3s">
-                        <node concept="1TmgYN" id="5fMWD6IxDdT" role="2Oq$k0">
-                          <node concept="1nq8_$" id="5fMWD6IxDe4" role="1Tms7$">
-                            <node concept="a7P8L" id="5fMWD6IxDe2" role="1nq8_t">
-                              <ref role="a7OzE" node="5fMWD6IxD8b" resolve="TypeCollector" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYCp" role="2Oq$k0">
+                          <node concept="a7P8L" id="5fMWD6IxDe2" role="1FtiSR">
+                            <ref role="a7OzE" node="5fMWD6IxD8b" resolve="TypeCollector" />
                           </node>
                         </node>
                         <node concept="liA8E" id="5fMWD6IxDFs" role="2OqNvi">
@@ -5180,11 +5174,9 @@
                             </node>
                             <node concept="iZEcu" id="5fMWD6IxEqZ" role="2OqNvi" />
                           </node>
-                          <node concept="1TmgYN" id="5fMWD6IxDJe" role="37wK5m">
-                            <node concept="1nq8_$" id="5fMWD6IxDL7" role="1Tms7$">
-                              <node concept="a7P8L" id="5fMWD6IxDTm" role="1nq8_t">
-                                <ref role="a7OzE" node="4dPZ2m2jBnq" resolve="Node" />
-                              </node>
+                          <node concept="1Ft4W6" id="7zIaaskbYCq" role="37wK5m">
+                            <node concept="a7P8L" id="5fMWD6IxDTm" role="1FtiSR">
+                              <ref role="a7OzE" node="4dPZ2m2jBnq" resolve="Node" />
                             </node>
                           </node>
                         </node>
@@ -5304,11 +5296,9 @@
                                 <property role="2qtEX8" value="def" />
                                 <property role="P3scX" value="af858d84-85f2-42f4-a854-0b3c6b5cd482/4773731068388848390/4773731068388848403" />
                                 <property role="3hQQBS" value="VarTypeRef" />
-                                <node concept="1TmgYN" id="2O9ahh6IVfi" role="2c44t1">
-                                  <node concept="1nq8_$" id="2O9ahh6IVfB" role="1Tms7$">
-                                    <node concept="a7P8L" id="2O9ahh6IVf_" role="1nq8_t">
-                                      <ref role="a7OzE" node="2O9ahh6I0ou" resolve="VarNode" />
-                                    </node>
+                                <node concept="1Ft4W6" id="7zIaaskbYCr" role="2c44t1">
+                                  <node concept="a7P8L" id="2O9ahh6IVf_" role="1FtiSR">
+                                    <ref role="a7OzE" node="2O9ahh6I0ou" resolve="VarNode" />
                                   </node>
                                 </node>
                               </node>
@@ -5417,11 +5407,9 @@
                               <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
                               <property role="3hQQBS" value="VarType" />
                               <property role="3qcH_f" value="true" />
-                              <node concept="1TmgYN" id="48ZGLP8Lim5" role="2c44t1">
-                                <node concept="1nq8_$" id="48ZGLP8Lim6" role="1Tms7$">
-                                  <node concept="a7P8L" id="48ZGLP8Lim7" role="1nq8_t">
-                                    <ref role="a7OzE" node="48ZGLP8yKxg" resolve="Name" />
-                                  </node>
+                              <node concept="1Ft4W6" id="7zIaaskbYCs" role="2c44t1">
+                                <node concept="a7P8L" id="48ZGLP8Lim7" role="1FtiSR">
+                                  <ref role="a7OzE" node="48ZGLP8yKxg" resolve="Name" />
                                 </node>
                               </node>
                             </node>
@@ -5516,20 +5504,16 @@
                                   <node concept="liA8E" id="2O9ahh6Ln6a" role="2OqNvi">
                                     <ref role="37wK5l" node="6EwjVjWsiF5" resolve="nextIndex" />
                                   </node>
-                                  <node concept="1TmgYN" id="2O9ahh6LnnE" role="2Oq$k0">
-                                    <node concept="1nq8_$" id="2O9ahh6LnqJ" role="1Tms7$">
-                                      <node concept="a7P8L" id="2O9ahh6LnqH" role="1nq8_t">
-                                        <ref role="a7OzE" node="6EwjVjWspeV" resolve="VN" />
-                                      </node>
+                                  <node concept="1Ft4W6" id="7zIaaskbYCt" role="2Oq$k0">
+                                    <node concept="a7P8L" id="2O9ahh6LnqH" role="1FtiSR">
+                                      <ref role="a7OzE" node="6EwjVjWspeV" resolve="VN" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="1TmgYN" id="2O9ahh6Lnbz" role="2Oq$k0">
-                                <node concept="1nq8_$" id="2O9ahh6LncL" role="1Tms7$">
-                                  <node concept="a7P8L" id="2O9ahh6LncJ" role="1nq8_t">
-                                    <ref role="a7OzE" node="6EwjVjWspeV" resolve="VN" />
-                                  </node>
+                              <node concept="1Ft4W6" id="7zIaaskbYCu" role="2Oq$k0">
+                                <node concept="a7P8L" id="2O9ahh6LncJ" role="1FtiSR">
+                                  <ref role="a7OzE" node="6EwjVjWspeV" resolve="VN" />
                                 </node>
                               </node>
                             </node>
@@ -5549,11 +5533,9 @@
                                   <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
                                   <property role="3hQQBS" value="VarType" />
                                   <property role="3qcH_f" value="true" />
-                                  <node concept="1TmgYN" id="2O9ahh6LnAP" role="2c44t1">
-                                    <node concept="1nq8_$" id="2O9ahh6LnBa" role="1Tms7$">
-                                      <node concept="a7P8L" id="2O9ahh6LnB8" role="1nq8_t">
-                                        <ref role="a7OzE" node="2O9ahh6LmhD" resolve="Name" />
-                                      </node>
+                                  <node concept="1Ft4W6" id="7zIaaskbYCv" role="2c44t1">
+                                    <node concept="a7P8L" id="2O9ahh6LnB8" role="1FtiSR">
+                                      <ref role="a7OzE" node="2O9ahh6LmhD" resolve="Name" />
                                     </node>
                                   </node>
                                 </node>
@@ -5775,11 +5757,9 @@
                                 <node concept="3P8Jbz" id="4dPZ2m2i6wS" role="1jz_fp">
                                   <node concept="2c44te" id="4dPZ2m2i6x1" role="lGtFl">
                                     <node concept="2OqwBi" id="PoGdiA68Gk" role="2c44t1">
-                                      <node concept="1TmgYN" id="PoGdiA68Gl" role="2Oq$k0">
-                                        <node concept="1nq8_$" id="PoGdiA68Gm" role="1Tms7$">
-                                          <node concept="a7P8L" id="PoGdiA68Gn" role="1nq8_t">
-                                            <ref role="a7OzE" node="4dPZ2m2i6rS" resolve="TypeArgNode" />
-                                          </node>
+                                      <node concept="1Ft4W6" id="7zIaaskbYCw" role="2Oq$k0">
+                                        <node concept="a7P8L" id="PoGdiA68Gn" role="1FtiSR">
+                                          <ref role="a7OzE" node="4dPZ2m2i6rS" resolve="TypeArgNode" />
                                         </node>
                                       </node>
                                       <node concept="1$rogu" id="PoGdiA68Go" role="2OqNvi" />
@@ -5789,11 +5769,9 @@
                                 <node concept="3P8Jbz" id="4dPZ2m2i6yC" role="1jz_f_">
                                   <node concept="2c44te" id="4dPZ2m2i6yL" role="lGtFl">
                                     <node concept="2OqwBi" id="PoGdiA68H_" role="2c44t1">
-                                      <node concept="1TmgYN" id="PoGdiA68HA" role="2Oq$k0">
-                                        <node concept="1nq8_$" id="PoGdiA68HB" role="1Tms7$">
-                                          <node concept="a7P8L" id="PoGdiA68HC" role="1nq8_t">
-                                            <ref role="a7OzE" node="4dPZ2m2i6s7" resolve="TypeResNode" />
-                                          </node>
+                                      <node concept="1Ft4W6" id="7zIaaskbYCx" role="2Oq$k0">
+                                        <node concept="a7P8L" id="PoGdiA68HC" role="1FtiSR">
+                                          <ref role="a7OzE" node="4dPZ2m2i6s7" resolve="TypeResNode" />
                                         </node>
                                       </node>
                                       <node concept="1$rogu" id="PoGdiA68HD" role="2OqNvi" />
@@ -5937,11 +5915,9 @@
                                 <node concept="3P8Jbz" id="JqEP$8sK5B" role="3EVAi">
                                   <node concept="2c44te" id="JqEP$8sK5C" role="lGtFl">
                                     <node concept="2OqwBi" id="JqEP$8sK5D" role="2c44t1">
-                                      <node concept="1TmgYN" id="JqEP$8sK5E" role="2Oq$k0">
-                                        <node concept="1nq8_$" id="JqEP$8sK5F" role="1Tms7$">
-                                          <node concept="a7P8L" id="JqEP$8sK6v" role="1nq8_t">
-                                            <ref role="a7OzE" node="JqEP$8soEj" resolve="RNode" />
-                                          </node>
+                                      <node concept="1Ft4W6" id="7zIaaskbYCy" role="2Oq$k0">
+                                        <node concept="a7P8L" id="JqEP$8sK6v" role="1FtiSR">
+                                          <ref role="a7OzE" node="JqEP$8soEj" resolve="RNode" />
                                         </node>
                                       </node>
                                       <node concept="1$rogu" id="JqEP$8sK5H" role="2OqNvi" />
@@ -5951,11 +5927,9 @@
                                 <node concept="3P8Jbz" id="JqEP$8sK7A" role="3EVAk">
                                   <node concept="2c44te" id="JqEP$8sK7B" role="lGtFl">
                                     <node concept="2OqwBi" id="JqEP$8sK7C" role="2c44t1">
-                                      <node concept="1TmgYN" id="JqEP$8sK7D" role="2Oq$k0">
-                                        <node concept="1nq8_$" id="JqEP$8sK7E" role="1Tms7$">
-                                          <node concept="a7P8L" id="JqEP$8sK8u" role="1nq8_t">
-                                            <ref role="a7OzE" node="JqEP$8soE6" resolve="LNode" />
-                                          </node>
+                                      <node concept="1Ft4W6" id="7zIaaskbYCz" role="2Oq$k0">
+                                        <node concept="a7P8L" id="JqEP$8sK8u" role="1FtiSR">
+                                          <ref role="a7OzE" node="JqEP$8soE6" resolve="LNode" />
                                         </node>
                                       </node>
                                       <node concept="1$rogu" id="JqEP$8sK7G" role="2OqNvi" />
@@ -6135,11 +6109,9 @@
                               <node concept="3JbUGG" id="PoGdiA68Yf" role="2c44tc">
                                 <node concept="1FkZV4" id="47tET_WiT5J" role="1FkZ4g">
                                   <node concept="2c44t8" id="47tET_WiT5Z" role="lGtFl">
-                                    <node concept="1TmgYN" id="47tET_WiT6m" role="2c44t1">
-                                      <node concept="1nq8_$" id="47tET_WiT6O" role="1Tms7$">
-                                        <node concept="a7P8L" id="47tET_WiT6M" role="1nq8_t">
-                                          <ref role="a7OzE" node="47tET_WiRqd" resolve="CtsNodes" />
-                                        </node>
+                                    <node concept="1Ft4W6" id="7zIaaskbYC$" role="2c44t1">
+                                      <node concept="a7P8L" id="47tET_WiT6M" role="1FtiSR">
+                                        <ref role="a7OzE" node="47tET_WiRqd" resolve="CtsNodes" />
                                       </node>
                                     </node>
                                   </node>
@@ -6147,11 +6119,9 @@
                                 <node concept="1jz_8w" id="PoGdiA68Yg" role="3JbKvY">
                                   <node concept="2c44te" id="PoGdiA68Yh" role="lGtFl">
                                     <node concept="2OqwBi" id="PoGdiA68Yi" role="2c44t1">
-                                      <node concept="1TmgYN" id="PoGdiA68Yj" role="2Oq$k0">
-                                        <node concept="1nq8_$" id="PoGdiA68Yk" role="1Tms7$">
-                                          <node concept="a7P8L" id="PoGdiA68Yl" role="1nq8_t">
-                                            <ref role="a7OzE" node="RRVBbp7DN3" resolve="TNode" />
-                                          </node>
+                                      <node concept="1Ft4W6" id="7zIaaskbYC_" role="2Oq$k0">
+                                        <node concept="a7P8L" id="PoGdiA68Yl" role="1FtiSR">
+                                          <ref role="a7OzE" node="RRVBbp7DN3" resolve="TNode" />
                                         </node>
                                       </node>
                                       <node concept="1$rogu" id="PoGdiA68Ym" role="2OqNvi" />
@@ -6160,11 +6130,9 @@
                                 </node>
                                 <node concept="2BbKIm" id="48ZGLP7txTB" role="5lUUh">
                                   <node concept="2c44t8" id="48ZGLP7txTR" role="lGtFl">
-                                    <node concept="1TmgYN" id="48ZGLP7txUe" role="2c44t1">
-                                      <node concept="1nq8_$" id="48ZGLP7txUG" role="1Tms7$">
-                                        <node concept="a7P8L" id="48ZGLP7txUE" role="1nq8_t">
-                                          <ref role="a7OzE" node="48ZGLP7rHRI" resolve="TVNodes" />
-                                        </node>
+                                    <node concept="1Ft4W6" id="7zIaaskbYCA" role="2c44t1">
+                                      <node concept="a7P8L" id="48ZGLP7txUE" role="1FtiSR">
+                                        <ref role="a7OzE" node="48ZGLP7rHRI" resolve="TVNodes" />
                                       </node>
                                     </node>
                                   </node>
@@ -6290,20 +6258,16 @@
                       <node concept="3Aqczg" id="47tET_Wheys" role="3cqZAp">
                         <node concept="3wWvb2" id="48ZGLP7rJ3Q" role="3Aqpz8">
                           <node concept="2OqwBi" id="48ZGLP7rJV5" role="3wWo3s">
-                            <node concept="1TmgYN" id="48ZGLP7rJ3U" role="2Oq$k0">
-                              <node concept="1nq8_$" id="48ZGLP7rJ43" role="1Tms7$">
-                                <node concept="a7P8L" id="48ZGLP7rJ41" role="1nq8_t">
-                                  <ref role="a7OzE" node="48ZGLP7rJ0v" resolve="TVNodes" />
-                                </node>
+                            <node concept="1Ft4W6" id="7zIaaskbYCB" role="2Oq$k0">
+                              <node concept="a7P8L" id="48ZGLP7rJ41" role="1FtiSR">
+                                <ref role="a7OzE" node="48ZGLP7rJ0v" resolve="TVNodes" />
                               </node>
                             </node>
                             <node concept="TSZUe" id="28iKXKDgzNn" role="2OqNvi">
                               <node concept="2OqwBi" id="28iKXKDgzNp" role="25WWJ7">
-                                <node concept="1TmgYN" id="28iKXKDgzNq" role="2Oq$k0">
-                                  <node concept="1nq8_$" id="28iKXKDgzNr" role="1Tms7$">
-                                    <node concept="a7P8L" id="28iKXKDgzNs" role="1nq8_t">
-                                      <ref role="a7OzE" node="48ZGLP7rLS4" resolve="TVNode" />
-                                    </node>
+                                <node concept="1Ft4W6" id="7zIaaskbYCC" role="2Oq$k0">
+                                  <node concept="a7P8L" id="28iKXKDgzNs" role="1FtiSR">
+                                    <ref role="a7OzE" node="48ZGLP7rLS4" resolve="TVNode" />
                                   </node>
                                 </node>
                                 <node concept="1$rogu" id="28iKXKDgzNt" role="2OqNvi" />
@@ -6698,11 +6662,9 @@
                                   <property role="2qtEX9" value="typeclassName" />
                                   <property role="P4ACc" value="af858d84-85f2-42f4-a854-0b3c6b5cd482/4746138258032205784/4746138258032205785" />
                                   <property role="3qcH_f" value="true" />
-                                  <node concept="1TmgYN" id="47tET_X1EJJ" role="2c44t1">
-                                    <node concept="1nq8_$" id="47tET_X1EJR" role="1Tms7$">
-                                      <node concept="a7P8L" id="47tET_X1EJP" role="1nq8_t">
-                                        <ref role="a7OzE" node="47tET_WUy3_" resolve="TcName" />
-                                      </node>
+                                  <node concept="1Ft4W6" id="7zIaaskbYCD" role="2c44t1">
+                                    <node concept="a7P8L" id="47tET_X1EJP" role="1FtiSR">
+                                      <ref role="a7OzE" node="47tET_WUy3_" resolve="TcName" />
                                     </node>
                                   </node>
                                 </node>
@@ -6710,11 +6672,9 @@
                                   <property role="2qtEX9" value="typeVarName" />
                                   <property role="P4ACc" value="af858d84-85f2-42f4-a854-0b3c6b5cd482/4746138258032205784/4746138258034063219" />
                                   <property role="3qcH_f" value="true" />
-                                  <node concept="1TmgYN" id="47tET_X1EK2" role="2c44t1">
-                                    <node concept="1nq8_$" id="47tET_X1EKa" role="1Tms7$">
-                                      <node concept="a7P8L" id="5TXeSYSE$36" role="1nq8_t">
-                                        <ref role="a7OzE" node="5TXeSYSEyPh" resolve="TVName" />
-                                      </node>
+                                  <node concept="1Ft4W6" id="7zIaaskbYCE" role="2c44t1">
+                                    <node concept="a7P8L" id="5TXeSYSE$36" role="1FtiSR">
+                                      <ref role="a7OzE" node="5TXeSYSEyPh" resolve="TVName" />
                                     </node>
                                   </node>
                                 </node>
@@ -6726,19 +6686,15 @@
                       <node concept="3Aqczg" id="47tET_WiP86" role="3cqZAp">
                         <node concept="3wWvb2" id="47tET_WiP87" role="3Aqpz8">
                           <node concept="2OqwBi" id="47tET_WiP88" role="3wWo3s">
-                            <node concept="1TmgYN" id="47tET_WiP89" role="2Oq$k0">
-                              <node concept="1nq8_$" id="47tET_WiP8a" role="1Tms7$">
-                                <node concept="a7P8L" id="5TXeSYSEzFq" role="1nq8_t">
-                                  <ref role="a7OzE" node="5TXeSYSEyq6" resolve="CtsNodes" />
-                                </node>
+                            <node concept="1Ft4W6" id="7zIaaskbYCF" role="2Oq$k0">
+                              <node concept="a7P8L" id="5TXeSYSEzFq" role="1FtiSR">
+                                <ref role="a7OzE" node="5TXeSYSEyq6" resolve="CtsNodes" />
                               </node>
                             </node>
                             <node concept="TSZUe" id="47tET_WiP8c" role="2OqNvi">
-                              <node concept="1TmgYN" id="47tET_WiP8e" role="25WWJ7">
-                                <node concept="1nq8_$" id="47tET_WiP8f" role="1Tms7$">
-                                  <node concept="a7P8L" id="47tET_WiPxh" role="1nq8_t">
-                                    <ref role="a7OzE" node="47tET_WiLgW" resolve="CtsNode" />
-                                  </node>
+                              <node concept="1Ft4W6" id="7zIaaskbYCG" role="25WWJ7">
+                                <node concept="a7P8L" id="47tET_WiPxh" role="1FtiSR">
+                                  <ref role="a7OzE" node="47tET_WiLgW" resolve="CtsNode" />
                                 </node>
                               </node>
                             </node>
@@ -15683,11 +15639,9 @@
                   </node>
                   <node concept="3I6s7M" id="47tET_WsEky" role="3I6sU7">
                     <node concept="3wWvb2" id="47tET_WsEkw" role="3I6s78">
-                      <node concept="1TmgYN" id="47tET_WsEkE" role="3wWo3s">
-                        <node concept="1nq8_$" id="47tET_WsEkN" role="1Tms7$">
-                          <node concept="a7P8L" id="47tET_WsEkL" role="1nq8_t">
-                            <ref role="a7OzE" node="47tET_WsEju" resolve="Result" />
-                          </node>
+                      <node concept="1Ft4W6" id="7zIaaskbYCH" role="3wWo3s">
+                        <node concept="a7P8L" id="47tET_WsEkL" role="1FtiSR">
+                          <ref role="a7OzE" node="47tET_WsEju" resolve="Result" />
                         </node>
                       </node>
                     </node>
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
index a3ec35ea..f641ce34 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="5" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
     <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 2ce3362c..d067531b 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="5" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
   </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 79c95bc8..1928c54c 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="5" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
   </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 bd779166..79a0f642 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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)" />
@@ -136,11 +136,8 @@
       </concept>
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
       <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" />
-      </concept>
-      <concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfExpression" flags="ng" index="1TmgYN">
-        <child id="2455719244613924416" name="logical" index="1Tms7$" />
+      <concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
+        <child id="8713947027062064784" name="logical" index="1FtiSR" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -5964,11 +5961,9 @@
                                 </node>
                                 <node concept="3Mi1_Z" id="PYgJzEqhLv" role="3Mj9YC">
                                   <node concept="3Milgn" id="PYgJzEqhNR" role="3MiYds">
-                                    <node concept="1TmgYN" id="PYgJzEqhOH" role="3MiK7k">
-                                      <node concept="1nq8_$" id="PYgJzEqhQr" role="1Tms7$">
-                                        <node concept="a7P8L" id="PYgJzEqhQp" role="1nq8_t">
-                                          <ref role="a7OzE" node="7pxta7vmQA_" resolve="Loc" />
-                                        </node>
+                                    <node concept="1Ft4W6" id="7zIaaskbYH9" role="3MiK7k">
+                                      <node concept="a7P8L" id="PYgJzEqhQp" role="1FtiSR">
+                                        <ref role="a7OzE" node="7pxta7vmQA_" resolve="Loc" />
                                       </node>
                                     </node>
                                     <node concept="2ShNRf" id="5pIcDR7tvPR" role="3MiMdn">
@@ -5976,11 +5971,9 @@
                                         <node concept="3uibUv" id="5pIcDR7twcB" role="HW$YZ">
                                           <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
                                         </node>
-                                        <node concept="1TmgYN" id="PYgJzEqhPz" role="HW$Y0">
-                                          <node concept="1nq8_$" id="PYgJzEqhRg" role="1Tms7$">
-                                            <node concept="a7P8L" id="PYgJzEqhRe" role="1nq8_t">
-                                              <ref role="a7OzE" node="7pxta7vmQAD" resolve="Node" />
-                                            </node>
+                                        <node concept="1Ft4W6" id="7zIaaskbYHa" role="HW$Y0">
+                                          <node concept="a7P8L" id="PYgJzEqhRe" role="1FtiSR">
+                                            <ref role="a7OzE" node="7pxta7vmQAD" resolve="Node" />
                                           </node>
                                         </node>
                                       </node>
@@ -6104,19 +6097,15 @@
                   <node concept="3I6s7M" id="5pIcDR7zgQ0" role="3I6sU7">
                     <node concept="3wWvb2" id="5pIcDR7zgQ1" role="3I6s78">
                       <node concept="2OqwBi" id="5pIcDR7zgQ2" role="3wWo3s">
-                        <node concept="1TmgYN" id="5pIcDR7zgQ3" role="2Oq$k0">
-                          <node concept="1nq8_$" id="5pIcDR7zgQ4" role="1Tms7$">
-                            <node concept="a7P8L" id="5pIcDR7zgQ5" role="1nq8_t">
-                              <ref role="a7OzE" node="5pIcDR7wVV6" resolve="Uses" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHb" role="2Oq$k0">
+                          <node concept="a7P8L" id="5pIcDR7zgQ5" role="1FtiSR">
+                            <ref role="a7OzE" node="5pIcDR7wVV6" resolve="Uses" />
                           </node>
                         </node>
                         <node concept="kI3uX" id="5pIcDR7zgQ6" role="2OqNvi">
-                          <node concept="1TmgYN" id="5pIcDR7zgQ7" role="kIiFs">
-                            <node concept="1nq8_$" id="5pIcDR7zgQ8" role="1Tms7$">
-                              <node concept="a7P8L" id="5pIcDR7zgQ9" role="1nq8_t">
-                                <ref role="a7OzE" node="5pIcDR7wW2m" resolve="Loc" />
-                              </node>
+                          <node concept="1Ft4W6" id="7zIaaskbYHc" role="kIiFs">
+                            <node concept="a7P8L" id="5pIcDR7zgQ9" role="1FtiSR">
+                              <ref role="a7OzE" node="5pIcDR7wW2m" resolve="Loc" />
                             </node>
                           </node>
                         </node>
@@ -6182,27 +6171,21 @@
                   <node concept="3wWvb2" id="2Uh$R6pCkEP" role="3I6s78">
                     <node concept="2OqwBi" id="2Uh$R6pDzZN" role="3wWo3s">
                       <node concept="3EllGN" id="2Uh$R6pDznl" role="2Oq$k0">
-                        <node concept="1TmgYN" id="2Uh$R6pDznD" role="3ElVtu">
-                          <node concept="1nq8_$" id="2Uh$R6pDznL" role="1Tms7$">
-                            <node concept="a7P8L" id="2Uh$R6pDznJ" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSG1kQ" resolve="Loc" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHd" role="3ElVtu">
+                          <node concept="a7P8L" id="2Uh$R6pDznJ" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSG1kQ" resolve="Loc" />
                           </node>
                         </node>
-                        <node concept="1TmgYN" id="2Uh$R6pCkET" role="3ElQJh">
-                          <node concept="1nq8_$" id="2Uh$R6pCkEZ" role="1Tms7$">
-                            <node concept="a7P8L" id="2Uh$R6pCkEX" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSG127" resolve="Uses" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHe" role="3ElQJh">
+                          <node concept="a7P8L" id="2Uh$R6pCkEX" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSG127" resolve="Uses" />
                           </node>
                         </node>
                       </node>
                       <node concept="3JPx81" id="2Uh$R6pD_1q" role="2OqNvi">
-                        <node concept="1TmgYN" id="2Uh$R6pD_1w" role="25WWJ7">
-                          <node concept="1nq8_$" id="2Uh$R6pD_1C" role="1Tms7$">
-                            <node concept="a7P8L" id="2Uh$R6pD_1Q" role="1nq8_t">
-                              <ref role="a7OzE" node="2Uh$R6pD_1J" resolve="RSite" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHf" role="25WWJ7">
+                          <node concept="a7P8L" id="2Uh$R6pD_1Q" role="1FtiSR">
+                            <ref role="a7OzE" node="2Uh$R6pD_1J" resolve="RSite" />
                           </node>
                         </node>
                       </node>
@@ -6513,27 +6496,21 @@
                   <node concept="3wWvb2" id="PYgJzEx8mN" role="3I6s78">
                     <node concept="2OqwBi" id="5pIcDR7tx$G" role="3wWo3s">
                       <node concept="3EllGN" id="PYgJzEx8mP" role="2Oq$k0">
-                        <node concept="1TmgYN" id="PYgJzEx8mQ" role="3ElVtu">
-                          <node concept="1nq8_$" id="PYgJzEx8mR" role="1Tms7$">
-                            <node concept="a7P8L" id="PYgJzEx8mS" role="1nq8_t">
-                              <ref role="a7OzE" node="PYgJzEfgKz" resolve="Loc" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHg" role="3ElVtu">
+                          <node concept="a7P8L" id="PYgJzEx8mS" role="1FtiSR">
+                            <ref role="a7OzE" node="PYgJzEfgKz" resolve="Loc" />
                           </node>
                         </node>
-                        <node concept="1TmgYN" id="PYgJzEx8mT" role="3ElQJh">
-                          <node concept="1nq8_$" id="PYgJzEx8mU" role="1Tms7$">
-                            <node concept="a7P8L" id="PYgJzEx8mV" role="1nq8_t">
-                              <ref role="a7OzE" node="PYgJzEfhvA" resolve="Uses" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHh" role="3ElQJh">
+                          <node concept="a7P8L" id="PYgJzEx8mV" role="1FtiSR">
+                            <ref role="a7OzE" node="PYgJzEfhvA" resolve="Uses" />
                           </node>
                         </node>
                       </node>
                       <node concept="3JPx81" id="5pIcDR7tyTA" role="2OqNvi">
-                        <node concept="1TmgYN" id="PYgJzEx8mW" role="25WWJ7">
-                          <node concept="1nq8_$" id="PYgJzEx8mX" role="1Tms7$">
-                            <node concept="a7P8L" id="PYgJzEx8mY" role="1nq8_t">
-                              <ref role="a7OzE" node="PYgJzEfgOp" resolve="RSite" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHi" role="25WWJ7">
+                          <node concept="a7P8L" id="PYgJzEx8mY" role="1FtiSR">
+                            <ref role="a7OzE" node="PYgJzEfgOp" resolve="RSite" />
                           </node>
                         </node>
                       </node>
@@ -6670,27 +6647,21 @@
                   <node concept="3wWvb2" id="5pIcDR7sJ8I" role="3I6s78">
                     <node concept="2OqwBi" id="5pIcDR7tAdt" role="3wWo3s">
                       <node concept="3EllGN" id="5pIcDR7sJ8K" role="2Oq$k0">
-                        <node concept="1TmgYN" id="5pIcDR7sJ8L" role="3ElVtu">
-                          <node concept="1nq8_$" id="5pIcDR7sJ8M" role="1Tms7$">
-                            <node concept="a7P8L" id="5pIcDR7sJlB" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSG1Vp" resolve="Loc" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHj" role="3ElVtu">
+                          <node concept="a7P8L" id="5pIcDR7sJlB" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSG1Vp" resolve="Loc" />
                           </node>
                         </node>
-                        <node concept="1TmgYN" id="5pIcDR7sJ8O" role="3ElQJh">
-                          <node concept="1nq8_$" id="5pIcDR7sJ8P" role="1Tms7$">
-                            <node concept="a7P8L" id="5pIcDR7sJmq" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSG1Vv" resolve="Uses" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHk" role="3ElQJh">
+                          <node concept="a7P8L" id="5pIcDR7sJmq" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSG1Vv" resolve="Uses" />
                           </node>
                         </node>
                       </node>
                       <node concept="3JPx81" id="5pIcDR7tBSN" role="2OqNvi">
-                        <node concept="1TmgYN" id="5pIcDR7sJ8R" role="25WWJ7">
-                          <node concept="1nq8_$" id="5pIcDR7sJ8S" role="1Tms7$">
-                            <node concept="a7P8L" id="5pIcDR7sJkO" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSG1Vs" resolve="RSite" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHl" role="25WWJ7">
+                          <node concept="a7P8L" id="5pIcDR7sJkO" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSG1Vs" resolve="RSite" />
                           </node>
                         </node>
                       </node>
@@ -6948,18 +6919,14 @@
                       <node concept="2YIFZM" id="5pIcDR7tYH_" role="3wWo3s">
                         <ref role="37wK5l" node="5pIcDR7tDMk" resolve="append" />
                         <ref role="1Pybhc" node="7pxta7vc_Jb" resolve="Util" />
-                        <node concept="1TmgYN" id="5pIcDR7tYL2" role="37wK5m">
-                          <node concept="1nq8_$" id="5pIcDR7tYMl" role="1Tms7$">
-                            <node concept="a7P8L" id="5pIcDR7tYMj" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSG4cT" resolve="Into" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHm" role="37wK5m">
+                          <node concept="a7P8L" id="5pIcDR7tYMj" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSG4cT" resolve="Into" />
                           </node>
                         </node>
-                        <node concept="1TmgYN" id="5pIcDR7tYOU" role="37wK5m">
-                          <node concept="1nq8_$" id="5pIcDR7tYQj" role="1Tms7$">
-                            <node concept="a7P8L" id="5pIcDR7tYQh" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSG4cU" resolve="From" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHn" role="37wK5m">
+                          <node concept="a7P8L" id="5pIcDR7tYQh" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSG4cU" resolve="From" />
                           </node>
                         </node>
                       </node>
@@ -7026,18 +6993,14 @@
                       <node concept="2YIFZM" id="5pIcDR7tYSm" role="3wWo3s">
                         <ref role="37wK5l" node="5pIcDR7tDMk" resolve="append" />
                         <ref role="1Pybhc" node="7pxta7vc_Jb" resolve="Util" />
-                        <node concept="1TmgYN" id="5pIcDR7tYSn" role="37wK5m">
-                          <node concept="1nq8_$" id="5pIcDR7tYSo" role="1Tms7$">
-                            <node concept="a7P8L" id="5pIcDR7tYSp" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSG4Dg" resolve="Into" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHo" role="37wK5m">
+                          <node concept="a7P8L" id="5pIcDR7tYSp" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSG4Dg" resolve="Into" />
                           </node>
                         </node>
-                        <node concept="1TmgYN" id="5pIcDR7tYSq" role="37wK5m">
-                          <node concept="1nq8_$" id="5pIcDR7tYSr" role="1Tms7$">
-                            <node concept="a7P8L" id="5pIcDR7tYSs" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSG4Dh" resolve="From" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHp" role="37wK5m">
+                          <node concept="a7P8L" id="5pIcDR7tYSs" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSG4Dh" resolve="From" />
                           </node>
                         </node>
                       </node>
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 cd98315e..cdda4def 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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" />
@@ -426,8 +426,8 @@
       <concept id="960803923481532811" name="jetbrains.mps.logic.structure.ListNodeCons" flags="ng" index="3wJAYo">
         <child id="960803923481835574" name="tail" index="3wIGS_" />
       </concept>
-      <concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfExpression" flags="ng" index="1TmgYN">
-        <child id="2455719244613924416" name="logical" index="1Tms7$" />
+      <concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
+        <child id="8713947027062064784" name="logical" index="1FtiSR" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -4810,11 +4810,9 @@
                           </node>
                           <node concept="HKQnh" id="2JTW8QYFLtS" role="3A8w4Q">
                             <node concept="2OqwBi" id="2JTW8QYFNWA" role="HKQng">
-                              <node concept="1TmgYN" id="2JTW8QYFLtX" role="2Oq$k0">
-                                <node concept="1nq8_$" id="2JTW8QYFLu8" role="1Tms7$">
-                                  <node concept="a7P8L" id="2JTW8QYFLu6" role="1nq8_t">
-                                    <ref role="a7OzE" node="2JTW8QYFL0q" resolve="ArgNodesList" />
-                                  </node>
+                              <node concept="1Ft4W6" id="7zIaaskbYHq" role="2Oq$k0">
+                                <node concept="a7P8L" id="2JTW8QYFLu6" role="1FtiSR">
+                                  <ref role="a7OzE" node="2JTW8QYFL0q" resolve="ArgNodesList" />
                                 </node>
                               </node>
                               <node concept="1uHKPH" id="2JTW8QYFO4w" role="2OqNvi" />
@@ -4829,11 +4827,9 @@
                           </node>
                           <node concept="HKQnh" id="2JTW8QYFO8W" role="3A8w4Q">
                             <node concept="2OqwBi" id="2JTW8QYFOUU" role="HKQng">
-                              <node concept="1TmgYN" id="2JTW8QYFO91" role="2Oq$k0">
-                                <node concept="1nq8_$" id="2JTW8QYFO9c" role="1Tms7$">
-                                  <node concept="a7P8L" id="2JTW8QYFO9a" role="1nq8_t">
-                                    <ref role="a7OzE" node="2JTW8QYFL0q" resolve="ArgNodesList" />
-                                  </node>
+                              <node concept="1Ft4W6" id="7zIaaskbYHr" role="2Oq$k0">
+                                <node concept="a7P8L" id="2JTW8QYFO9a" role="1FtiSR">
+                                  <ref role="a7OzE" node="2JTW8QYFL0q" resolve="ArgNodesList" />
                                 </node>
                               </node>
                               <node concept="1eb2uI" id="2JTW8QYFPy0" role="2OqNvi">
@@ -11229,19 +11225,15 @@
                   <node concept="3I6s7M" id="1laj_RTZu2P" role="3I6sU7">
                     <node concept="1lHd6T" id="1laj_RTZu2O" role="3I6s78">
                       <property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
-                      <node concept="1TmgYN" id="1laj_RTZu5z" role="1ljv2e">
-                        <node concept="1nq8_$" id="1laj_RTZu5$" role="1Tms7$">
-                          <node concept="a7P8L" id="1laj_RTZu5_" role="1nq8_t">
-                            <ref role="a7OzE" node="5moyjRHroB8" resolve="Msg" />
-                          </node>
+                      <node concept="1Ft4W6" id="7zIaaskbYHs" role="1ljv2e">
+                        <node concept="a7P8L" id="1laj_RTZu5_" role="1FtiSR">
+                          <ref role="a7OzE" node="5moyjRHroB8" resolve="Msg" />
                         </node>
                       </node>
                       <node concept="3G3gwz" id="1laj_RTZu5R" role="3Gvizk">
-                        <node concept="1TmgYN" id="1laj_RTZu5V" role="3G3gzb">
-                          <node concept="1nq8_$" id="1laj_RTZu5W" role="1Tms7$">
-                            <node concept="a7P8L" id="1laj_RTZu5X" role="1nq8_t">
-                              <ref role="a7OzE" node="5moyjRHroAV" resolve="Node" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHt" role="3G3gzb">
+                          <node concept="a7P8L" id="1laj_RTZu5X" role="1FtiSR">
+                            <ref role="a7OzE" node="5moyjRHroAV" resolve="Node" />
                           </node>
                         </node>
                       </node>
@@ -12495,11 +12487,9 @@
                             <node concept="Xl_RD" id="4WwvXRZ8efu" role="3uHU7B">
                               <property role="Xl_RC" value="type " />
                             </node>
-                            <node concept="1TmgYN" id="4WwvXRZbqj8" role="3uHU7w">
-                              <node concept="1nq8_$" id="4WwvXRZbqjH" role="1Tms7$">
-                                <node concept="a7P8L" id="4WwvXRZbqjF" role="1nq8_t">
-                                  <ref role="a7OzE" node="2603Jg6Asuz" resolve="S" />
-                                </node>
+                            <node concept="1Ft4W6" id="7zIaaskbYHu" role="3uHU7w">
+                              <node concept="a7P8L" id="4WwvXRZbqjF" role="1FtiSR">
+                                <ref role="a7OzE" node="2603Jg6Asuz" resolve="S" />
                               </node>
                             </node>
                           </node>
@@ -12507,11 +12497,9 @@
                             <property role="Xl_RC" value=" is not contained in " />
                           </node>
                         </node>
-                        <node concept="1TmgYN" id="4WwvXRZbqtr" role="3uHU7w">
-                          <node concept="1nq8_$" id="4WwvXRZbqyK" role="1Tms7$">
-                            <node concept="a7P8L" id="4WwvXRZbqyI" role="1nq8_t">
-                              <ref role="a7OzE" node="2603Jg6Asu$" resolve="T" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHv" role="3uHU7w">
+                          <node concept="a7P8L" id="4WwvXRZbqyI" role="1FtiSR">
+                            <ref role="a7OzE" node="2603Jg6Asu$" resolve="T" />
                           </node>
                         </node>
                       </node>
@@ -15537,11 +15525,9 @@
                             <node concept="Xl_RD" id="2i6cuYQV7G$" role="3uHU7B">
                               <property role="Xl_RC" value="type " />
                             </node>
-                            <node concept="1TmgYN" id="2i6cuYQV7G_" role="3uHU7w">
-                              <node concept="1nq8_$" id="2i6cuYQV7GA" role="1Tms7$">
-                                <node concept="a7P8L" id="2i6cuYQV7GB" role="1nq8_t">
-                                  <ref role="a7OzE" node="2i6cuYQV6tk" resolve="S" />
-                                </node>
+                            <node concept="1Ft4W6" id="7zIaaskbYHw" role="3uHU7w">
+                              <node concept="a7P8L" id="2i6cuYQV7GB" role="1FtiSR">
+                                <ref role="a7OzE" node="2i6cuYQV6tk" resolve="S" />
                               </node>
                             </node>
                           </node>
@@ -15549,11 +15535,9 @@
                             <property role="Xl_RC" value=" cannot be converted to " />
                           </node>
                         </node>
-                        <node concept="1TmgYN" id="2i6cuYQV7GD" role="3uHU7w">
-                          <node concept="1nq8_$" id="2i6cuYQV7GE" role="1Tms7$">
-                            <node concept="a7P8L" id="2i6cuYQV7GF" role="1nq8_t">
-                              <ref role="a7OzE" node="2i6cuYQV6tl" resolve="T" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHx" role="3uHU7w">
+                          <node concept="a7P8L" id="2i6cuYQV7GF" role="1FtiSR">
+                            <ref role="a7OzE" node="2i6cuYQV6tl" resolve="T" />
                           </node>
                         </node>
                       </node>
@@ -16868,11 +16852,9 @@
                             <node concept="Xl_RD" id="3R6X$QWFiGv" role="3uHU7B">
                               <property role="Xl_RC" value="type " />
                             </node>
-                            <node concept="1TmgYN" id="3R6X$QWFiGw" role="3uHU7w">
-                              <node concept="1nq8_$" id="3R6X$QWFiGx" role="1Tms7$">
-                                <node concept="a7P8L" id="3R6X$QWFiGy" role="1nq8_t">
-                                  <ref role="a7OzE" node="2CsZ2XTdf5" resolve="S" />
-                                </node>
+                            <node concept="1Ft4W6" id="7zIaaskbYHy" role="3uHU7w">
+                              <node concept="a7P8L" id="3R6X$QWFiGy" role="1FtiSR">
+                                <ref role="a7OzE" node="2CsZ2XTdf5" resolve="S" />
                               </node>
                             </node>
                           </node>
@@ -16880,11 +16862,9 @@
                             <property role="Xl_RC" value=" cannot be converted to " />
                           </node>
                         </node>
-                        <node concept="1TmgYN" id="3R6X$QWFiG$" role="3uHU7w">
-                          <node concept="1nq8_$" id="3R6X$QWFiG_" role="1Tms7$">
-                            <node concept="a7P8L" id="3R6X$QWFiGA" role="1nq8_t">
-                              <ref role="a7OzE" node="2CsZ2XTdfe" resolve="T" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHz" role="3uHU7w">
+                          <node concept="a7P8L" id="3R6X$QWFiGA" role="1FtiSR">
+                            <ref role="a7OzE" node="2CsZ2XTdfe" resolve="T" />
                           </node>
                         </node>
                       </node>
@@ -17711,18 +17691,14 @@
                               <node concept="2YIFZM" id="2rIdnPtWlnO" role="HKQng">
                                 <ref role="1Pybhc" node="3KV3FXk1fjd" resolve="PathHelper" />
                                 <ref role="37wK5l" node="3KV3FXk1fGe" resolve="findPath" />
-                                <node concept="1TmgYN" id="2rIdnPtWlnQ" role="37wK5m">
-                                  <node concept="1nq8_$" id="2rIdnPtWlnY" role="1Tms7$">
-                                    <node concept="a7P8L" id="2rIdnPtWlnW" role="1nq8_t">
-                                      <ref role="a7OzE" node="WauyOOvJ8R" resolve="AllSubclassPaths" />
-                                    </node>
+                                <node concept="1Ft4W6" id="7zIaaskbYH$" role="37wK5m">
+                                  <node concept="a7P8L" id="2rIdnPtWlnW" role="1FtiSR">
+                                    <ref role="a7OzE" node="WauyOOvJ8R" resolve="AllSubclassPaths" />
                                   </node>
                                 </node>
-                                <node concept="1TmgYN" id="2rIdnPvGQsl" role="37wK5m">
-                                  <node concept="1nq8_$" id="2rIdnPvGQu6" role="1Tms7$">
-                                    <node concept="a7P8L" id="2rIdnPvGQu4" role="1nq8_t">
-                                      <ref role="a7OzE" node="5_6ImQYcOig" resolve="StartFrom" />
-                                    </node>
+                                <node concept="1Ft4W6" id="7zIaaskbYH_" role="37wK5m">
+                                  <node concept="a7P8L" id="2rIdnPvGQu4" role="1FtiSR">
+                                    <ref role="a7OzE" node="5_6ImQYcOig" resolve="StartFrom" />
                                   </node>
                                 </node>
                               </node>
@@ -18006,18 +17982,14 @@
                             <node concept="2YIFZM" id="24yJnOJM4xz" role="HKQng">
                               <ref role="37wK5l" node="3KV3FXk1fGe" resolve="findPath" />
                               <ref role="1Pybhc" node="3KV3FXk1fjd" resolve="PathHelper" />
-                              <node concept="1TmgYN" id="24yJnOJM4x$" role="37wK5m">
-                                <node concept="1nq8_$" id="24yJnOJM4x_" role="1Tms7$">
-                                  <node concept="a7P8L" id="24yJnOJM4xA" role="1nq8_t">
-                                    <ref role="a7OzE" node="2yxaISahpK5" resolve="AllSubclassPaths" />
-                                  </node>
+                              <node concept="1Ft4W6" id="7zIaaskbYHA" role="37wK5m">
+                                <node concept="a7P8L" id="24yJnOJM4xA" role="1FtiSR">
+                                  <ref role="a7OzE" node="2yxaISahpK5" resolve="AllSubclassPaths" />
                                 </node>
                               </node>
-                              <node concept="1TmgYN" id="24yJnOJM4xB" role="37wK5m">
-                                <node concept="1nq8_$" id="24yJnOJM4xC" role="1Tms7$">
-                                  <node concept="a7P8L" id="24yJnOJM4xD" role="1nq8_t">
-                                    <ref role="a7OzE" node="2yxaISahpK3" resolve="T" />
-                                  </node>
+                              <node concept="1Ft4W6" id="7zIaaskbYHB" role="37wK5m">
+                                <node concept="a7P8L" id="24yJnOJM4xD" role="1FtiSR">
+                                  <ref role="a7OzE" node="2yxaISahpK3" resolve="T" />
                                 </node>
                               </node>
                             </node>
@@ -19078,11 +19050,9 @@
                             <node concept="Xl_RD" id="4WwvXRZ9Olf" role="3uHU7B">
                               <property role="Xl_RC" value="type " />
                             </node>
-                            <node concept="1TmgYN" id="4WwvXRZbul2" role="3uHU7w">
-                              <node concept="1nq8_$" id="4WwvXRZbulB" role="1Tms7$">
-                                <node concept="a7P8L" id="4WwvXRZbul_" role="1nq8_t">
-                                  <ref role="a7OzE" node="5_6ImQYeLqu" resolve="Subtype" />
-                                </node>
+                            <node concept="1Ft4W6" id="7zIaaskbYHC" role="3uHU7w">
+                              <node concept="a7P8L" id="4WwvXRZbul_" role="1FtiSR">
+                                <ref role="a7OzE" node="5_6ImQYeLqu" resolve="Subtype" />
                               </node>
                             </node>
                           </node>
@@ -19090,11 +19060,9 @@
                             <property role="Xl_RC" value=" cannot be converted to " />
                           </node>
                         </node>
-                        <node concept="1TmgYN" id="4WwvXRZbu$9" role="3uHU7w">
-                          <node concept="1nq8_$" id="4WwvXRZbuD4" role="1Tms7$">
-                            <node concept="a7P8L" id="4WwvXRZbuD2" role="1nq8_t">
-                              <ref role="a7OzE" node="5_6ImQYeLqB" resolve="Supertype" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHD" role="3uHU7w">
+                          <node concept="a7P8L" id="4WwvXRZbuD2" role="1FtiSR">
+                            <ref role="a7OzE" node="5_6ImQYeLqB" resolve="Supertype" />
                           </node>
                         </node>
                       </node>
@@ -19676,18 +19644,14 @@
                             <node concept="2YIFZM" id="2rIdnPtx_ae" role="HKQng">
                               <ref role="37wK5l" node="5H6hZahmloU" resolve="findRawLub" />
                               <ref role="1Pybhc" node="5H6hZahmlon" resolve="LubHelper" />
-                              <node concept="1TmgYN" id="2rIdnPtx_cM" role="37wK5m">
-                                <node concept="1nq8_$" id="2rIdnPtx_dT" role="1Tms7$">
-                                  <node concept="a7P8L" id="2rIdnPtx_dR" role="1nq8_t">
-                                    <ref role="a7OzE" node="2q0gzCFHpC6" resolve="PathsLeft" />
-                                  </node>
+                              <node concept="1Ft4W6" id="7zIaaskbYHE" role="37wK5m">
+                                <node concept="a7P8L" id="2rIdnPtx_dR" role="1FtiSR">
+                                  <ref role="a7OzE" node="2q0gzCFHpC6" resolve="PathsLeft" />
                                 </node>
                               </node>
-                              <node concept="1TmgYN" id="2rIdnPtx_eV" role="37wK5m">
-                                <node concept="1nq8_$" id="2rIdnPtx_fz" role="1Tms7$">
-                                  <node concept="a7P8L" id="2rIdnPtx_fx" role="1nq8_t">
-                                    <ref role="a7OzE" node="2q0gzCFHpC9" resolve="PathsRight" />
-                                  </node>
+                              <node concept="1Ft4W6" id="7zIaaskbYHF" role="37wK5m">
+                                <node concept="a7P8L" id="2rIdnPtx_fx" role="1FtiSR">
+                                  <ref role="a7OzE" node="2q0gzCFHpC9" resolve="PathsRight" />
                                 </node>
                               </node>
                             </node>
@@ -20836,11 +20800,9 @@
                             <node concept="Xl_RD" id="4WwvXRZ8ar8" role="3uHU7B">
                               <property role="Xl_RC" value="cannot coerce " />
                             </node>
-                            <node concept="1TmgYN" id="4WwvXRZbplK" role="3uHU7w">
-                              <node concept="1nq8_$" id="4WwvXRZbpml" role="1Tms7$">
-                                <node concept="a7P8L" id="4WwvXRZbpmj" role="1nq8_t">
-                                  <ref role="a7OzE" node="4j2EcMONQOb" resolve="Type" />
-                                </node>
+                            <node concept="1Ft4W6" id="7zIaaskbYHG" role="3uHU7w">
+                              <node concept="a7P8L" id="4WwvXRZbpmj" role="1FtiSR">
+                                <ref role="a7OzE" node="4j2EcMONQOb" resolve="Type" />
                               </node>
                             </node>
                           </node>
@@ -20848,11 +20810,9 @@
                             <property role="Xl_RC" value=" to " />
                           </node>
                         </node>
-                        <node concept="1TmgYN" id="4WwvXRZbp$R" role="3uHU7w">
-                          <node concept="1nq8_$" id="4WwvXRZbpDM" role="1Tms7$">
-                            <node concept="a7P8L" id="4WwvXRZbpDK" role="1nq8_t">
-                              <ref role="a7OzE" node="4j2EcMONQOd" resolve="Domain" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHH" role="3uHU7w">
+                          <node concept="a7P8L" id="4WwvXRZbpDK" role="1FtiSR">
+                            <ref role="a7OzE" node="4j2EcMONQOd" resolve="Domain" />
                           </node>
                         </node>
                       </node>
@@ -22100,11 +22060,9 @@
                 <node concept="3I6s7M" id="2HYHa0Wzvxw" role="3I6sU7">
                   <node concept="3wWvb2" id="2HYHa0Wzvxx" role="3I6s78">
                     <node concept="3eOVzh" id="2HYHa0Wzvxy" role="3wWo3s">
-                      <node concept="1TmgYN" id="2HYHa0WzvxC" role="3uHU7B">
-                        <node concept="1nq8_$" id="2HYHa0WzvxD" role="1Tms7$">
-                          <node concept="a7P8L" id="2HYHa0WzMkX" role="1nq8_t">
-                            <ref role="a7OzE" node="2HYHa0WzMkK" resolve="SVal" />
-                          </node>
+                      <node concept="1Ft4W6" id="7zIaaskbYHI" role="3uHU7B">
+                        <node concept="a7P8L" id="2HYHa0WzMkX" role="1FtiSR">
+                          <ref role="a7OzE" node="2HYHa0WzMkK" resolve="SVal" />
                         </node>
                       </node>
                       <node concept="3cmrfG" id="2HYHa0Wzvxz" role="3uHU7w">
@@ -22189,11 +22147,9 @@
                 <node concept="3I6s7M" id="7AyqXCdDQo7" role="3I6sU7">
                   <node concept="3wWvb2" id="7AyqXCdDQo8" role="3I6s78">
                     <node concept="3eOVzh" id="7AyqXCdDQo9" role="3wWo3s">
-                      <node concept="1TmgYN" id="7AyqXCdDQof" role="3uHU7B">
-                        <node concept="1nq8_$" id="7AyqXCdDQog" role="1Tms7$">
-                          <node concept="a7P8L" id="7AyqXCdDQr5" role="1nq8_t">
-                            <ref role="a7OzE" node="5TXeSYSHpZg" resolve="SVal" />
-                          </node>
+                      <node concept="1Ft4W6" id="7zIaaskbYHJ" role="3uHU7B">
+                        <node concept="a7P8L" id="7AyqXCdDQr5" role="1FtiSR">
+                          <ref role="a7OzE" node="5TXeSYSHpZg" resolve="SVal" />
                         </node>
                       </node>
                       <node concept="3cmrfG" id="7AyqXCdDQoa" role="3uHU7w">
@@ -22274,11 +22230,9 @@
                 <node concept="3I6s7M" id="2HYHa0W_yn7" role="3I6sU7">
                   <node concept="3wWvb2" id="2HYHa0W_yn8" role="3I6s78">
                     <node concept="3eOVzh" id="2HYHa0W_yn9" role="3wWo3s">
-                      <node concept="1TmgYN" id="2HYHa0W_ynf" role="3uHU7B">
-                        <node concept="1nq8_$" id="2HYHa0W_yng" role="1Tms7$">
-                          <node concept="a7P8L" id="2HYHa0W_ynh" role="1nq8_t">
-                            <ref role="a7OzE" node="2HYHa0W_ymQ" resolve="SVal" />
-                          </node>
+                      <node concept="1Ft4W6" id="7zIaaskbYHK" role="3uHU7B">
+                        <node concept="a7P8L" id="2HYHa0W_ynh" role="1FtiSR">
+                          <ref role="a7OzE" node="2HYHa0W_ymQ" resolve="SVal" />
                         </node>
                       </node>
                       <node concept="3cmrfG" id="2HYHa0W_yna" role="3uHU7w">
@@ -22363,11 +22317,9 @@
                 <node concept="3I6s7M" id="7AyqXCdDQrx" role="3I6sU7">
                   <node concept="3wWvb2" id="7AyqXCdDQry" role="3I6s78">
                     <node concept="3eOVzh" id="7AyqXCdDQrz" role="3wWo3s">
-                      <node concept="1TmgYN" id="7AyqXCdDQrD" role="3uHU7B">
-                        <node concept="1nq8_$" id="7AyqXCdDQrE" role="1Tms7$">
-                          <node concept="a7P8L" id="7AyqXCdDQuv" role="1nq8_t">
-                            <ref role="a7OzE" node="5TXeSYSHqo5" resolve="SVal" />
-                          </node>
+                      <node concept="1Ft4W6" id="7zIaaskbYHL" role="3uHU7B">
+                        <node concept="a7P8L" id="7AyqXCdDQuv" role="1FtiSR">
+                          <ref role="a7OzE" node="5TXeSYSHqo5" resolve="SVal" />
                         </node>
                       </node>
                       <node concept="3cmrfG" id="7AyqXCdDQr$" role="3uHU7w">
@@ -22629,11 +22581,9 @@
                   <node concept="3wWvb2" id="2HYHa0WI_yS" role="3I6s78">
                     <node concept="3y3z36" id="2HYHa0WNY3t" role="3wWo3s">
                       <node concept="10Nm6u" id="2HYHa0WNY3C" role="3uHU7w" />
-                      <node concept="1TmgYN" id="2HYHa0WI_zl" role="3uHU7B">
-                        <node concept="1nq8_$" id="2HYHa0WI_zm" role="1Tms7$">
-                          <node concept="a7P8L" id="2HYHa0WI_zn" role="1nq8_t">
-                            <ref role="a7OzE" node="19nQ_7UX__3" resolve="SValue" />
-                          </node>
+                      <node concept="1Ft4W6" id="7zIaaskbYHM" role="3uHU7B">
+                        <node concept="a7P8L" id="2HYHa0WI_zn" role="1FtiSR">
+                          <ref role="a7OzE" node="19nQ_7UX__3" resolve="SValue" />
                         </node>
                       </node>
                     </node>
@@ -22643,11 +22593,9 @@
                   <node concept="3wWvb2" id="7lt0LtQ3pUb" role="3I6s78">
                     <node concept="1Wc70l" id="2HYHa0WIzy3" role="3wWo3s">
                       <node concept="2d3UOw" id="2HYHa0WI$ox" role="3uHU7B">
-                        <node concept="1TmgYN" id="2HYHa0WI$oB" role="3uHU7B">
-                          <node concept="1nq8_$" id="2HYHa0WI$oC" role="1Tms7$">
-                            <node concept="a7P8L" id="2HYHa0WI$oD" role="1nq8_t">
-                              <ref role="a7OzE" node="19nQ_7UX__3" resolve="SValue" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHN" role="3uHU7B">
+                          <node concept="a7P8L" id="2HYHa0WI$oD" role="1FtiSR">
+                            <ref role="a7OzE" node="19nQ_7UX__3" resolve="SValue" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="2HYHa0WI$oy" role="3uHU7w">
@@ -22655,11 +22603,9 @@
                         </node>
                       </node>
                       <node concept="2dkUwp" id="2HYHa0WIAty" role="3uHU7w">
-                        <node concept="1TmgYN" id="2HYHa0WI$oK" role="3uHU7B">
-                          <node concept="1nq8_$" id="2HYHa0WI$oL" role="1Tms7$">
-                            <node concept="a7P8L" id="2HYHa0WI$oM" role="1nq8_t">
-                              <ref role="a7OzE" node="19nQ_7UX__3" resolve="SValue" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHO" role="3uHU7B">
+                          <node concept="a7P8L" id="2HYHa0WI$oM" role="1FtiSR">
+                            <ref role="a7OzE" node="19nQ_7UX__3" resolve="SValue" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="2HYHa0WI$oO" role="3uHU7w">
@@ -22741,11 +22687,9 @@
                   <node concept="3wWvb2" id="7AyqXCdDQz3" role="3I6s78">
                     <node concept="3y3z36" id="7AyqXCdDQz4" role="3wWo3s">
                       <node concept="10Nm6u" id="7AyqXCdDQz5" role="3uHU7w" />
-                      <node concept="1TmgYN" id="7AyqXCdDQz6" role="3uHU7B">
-                        <node concept="1nq8_$" id="7AyqXCdDQz7" role="1Tms7$">
-                          <node concept="a7P8L" id="7AyqXCdDQAM" role="1nq8_t">
-                            <ref role="a7OzE" node="5TXeSYSHo7C" resolve="SValue" />
-                          </node>
+                      <node concept="1Ft4W6" id="7zIaaskbYHP" role="3uHU7B">
+                        <node concept="a7P8L" id="7AyqXCdDQAM" role="1FtiSR">
+                          <ref role="a7OzE" node="5TXeSYSHo7C" resolve="SValue" />
                         </node>
                       </node>
                     </node>
@@ -22755,11 +22699,9 @@
                   <node concept="3wWvb2" id="7AyqXCdDQza" role="3I6s78">
                     <node concept="1Wc70l" id="7AyqXCdDQzb" role="3wWo3s">
                       <node concept="2d3UOw" id="7AyqXCdDQzc" role="3uHU7B">
-                        <node concept="1TmgYN" id="7AyqXCdDQzi" role="3uHU7B">
-                          <node concept="1nq8_$" id="7AyqXCdDQzj" role="1Tms7$">
-                            <node concept="a7P8L" id="7AyqXCdDQBf" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSHo7C" resolve="SValue" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHQ" role="3uHU7B">
+                          <node concept="a7P8L" id="7AyqXCdDQBf" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSHo7C" resolve="SValue" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="7AyqXCdDQzd" role="3uHU7w">
@@ -22767,11 +22709,9 @@
                         </node>
                       </node>
                       <node concept="2dkUwp" id="7AyqXCdDQzm" role="3uHU7w">
-                        <node concept="1TmgYN" id="7AyqXCdDQzr" role="3uHU7B">
-                          <node concept="1nq8_$" id="7AyqXCdDQzs" role="1Tms7$">
-                            <node concept="a7P8L" id="7AyqXCdDQBi" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSHo7C" resolve="SValue" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHR" role="3uHU7B">
+                          <node concept="a7P8L" id="7AyqXCdDQBi" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSHo7C" resolve="SValue" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="7AyqXCdDQzv" role="3uHU7w">
@@ -22849,11 +22789,9 @@
                   <node concept="3wWvb2" id="2HYHa0WI_hC" role="3I6s78">
                     <node concept="3y3z36" id="2HYHa0WI_ul" role="3wWo3s">
                       <node concept="10Nm6u" id="2HYHa0WI_w7" role="3uHU7w" />
-                      <node concept="1TmgYN" id="2HYHa0WI_i5" role="3uHU7B">
-                        <node concept="1nq8_$" id="2HYHa0WI_i6" role="1Tms7$">
-                          <node concept="a7P8L" id="2HYHa0WI_i7" role="1nq8_t">
-                            <ref role="a7OzE" node="euG2bFsyUU" resolve="SValue" />
-                          </node>
+                      <node concept="1Ft4W6" id="7zIaaskbYHS" role="3uHU7B">
+                        <node concept="a7P8L" id="2HYHa0WI_i7" role="1FtiSR">
+                          <ref role="a7OzE" node="euG2bFsyUU" resolve="SValue" />
                         </node>
                       </node>
                     </node>
@@ -22863,11 +22801,9 @@
                   <node concept="3wWvb2" id="7lt0LtQ4G1Z" role="3I6s78">
                     <node concept="1Wc70l" id="2HYHa0WI_cK" role="3wWo3s">
                       <node concept="2d3UOw" id="2HYHa0WI_fO" role="3uHU7B">
-                        <node concept="1TmgYN" id="2HYHa0WI_fT" role="3uHU7B">
-                          <node concept="1nq8_$" id="2HYHa0WI_fU" role="1Tms7$">
-                            <node concept="a7P8L" id="2HYHa0WI_fV" role="1nq8_t">
-                              <ref role="a7OzE" node="euG2bFsyUU" resolve="SValue" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHT" role="3uHU7B">
+                          <node concept="a7P8L" id="2HYHa0WI_fV" role="1FtiSR">
+                            <ref role="a7OzE" node="euG2bFsyUU" resolve="SValue" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="2HYHa0WI_fX" role="3uHU7w">
@@ -22875,11 +22811,9 @@
                         </node>
                       </node>
                       <node concept="2dkUwp" id="2HYHa0WIAui" role="3uHU7w">
-                        <node concept="1TmgYN" id="2HYHa0WI_g3" role="3uHU7B">
-                          <node concept="1nq8_$" id="2HYHa0WI_g4" role="1Tms7$">
-                            <node concept="a7P8L" id="2HYHa0WI_g5" role="1nq8_t">
-                              <ref role="a7OzE" node="euG2bFsyUU" resolve="SValue" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHU" role="3uHU7B">
+                          <node concept="a7P8L" id="2HYHa0WI_g5" role="1FtiSR">
+                            <ref role="a7OzE" node="euG2bFsyUU" resolve="SValue" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="2HYHa0WI_g7" role="3uHU7w">
@@ -22961,11 +22895,9 @@
                   <node concept="3wWvb2" id="7AyqXCdDQBG" role="3I6s78">
                     <node concept="3y3z36" id="7AyqXCdDQBH" role="3wWo3s">
                       <node concept="10Nm6u" id="7AyqXCdDQBI" role="3uHU7w" />
-                      <node concept="1TmgYN" id="7AyqXCdDQBJ" role="3uHU7B">
-                        <node concept="1nq8_$" id="7AyqXCdDQBK" role="1Tms7$">
-                          <node concept="a7P8L" id="7AyqXCdDQFr" role="1nq8_t">
-                            <ref role="a7OzE" node="5TXeSYSHoxH" resolve="SValue" />
-                          </node>
+                      <node concept="1Ft4W6" id="7zIaaskbYHV" role="3uHU7B">
+                        <node concept="a7P8L" id="7AyqXCdDQFr" role="1FtiSR">
+                          <ref role="a7OzE" node="5TXeSYSHoxH" resolve="SValue" />
                         </node>
                       </node>
                     </node>
@@ -22975,11 +22907,9 @@
                   <node concept="3wWvb2" id="7AyqXCdDQBN" role="3I6s78">
                     <node concept="1Wc70l" id="7AyqXCdDQBO" role="3wWo3s">
                       <node concept="2d3UOw" id="7AyqXCdDQBP" role="3uHU7B">
-                        <node concept="1TmgYN" id="7AyqXCdDQBU" role="3uHU7B">
-                          <node concept="1nq8_$" id="7AyqXCdDQBV" role="1Tms7$">
-                            <node concept="a7P8L" id="7AyqXCdDQFP" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSHoxH" resolve="SValue" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHW" role="3uHU7B">
+                          <node concept="a7P8L" id="7AyqXCdDQFP" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSHoxH" resolve="SValue" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="7AyqXCdDQBY" role="3uHU7w">
@@ -22987,11 +22917,9 @@
                         </node>
                       </node>
                       <node concept="2dkUwp" id="7AyqXCdDQBZ" role="3uHU7w">
-                        <node concept="1TmgYN" id="7AyqXCdDQC4" role="3uHU7B">
-                          <node concept="1nq8_$" id="7AyqXCdDQC5" role="1Tms7$">
-                            <node concept="a7P8L" id="7AyqXCdDQFS" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSHoxH" resolve="SValue" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHX" role="3uHU7B">
+                          <node concept="a7P8L" id="7AyqXCdDQFS" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSHoxH" resolve="SValue" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="7AyqXCdDQC8" role="3uHU7w">
@@ -23069,11 +22997,9 @@
                   <node concept="3wWvb2" id="2HYHa0WIAwV" role="3I6s78">
                     <node concept="3y3z36" id="2HYHa0WIAwW" role="3wWo3s">
                       <node concept="10Nm6u" id="2HYHa0WIAwX" role="3uHU7w" />
-                      <node concept="1TmgYN" id="2HYHa0WIAwZ" role="3uHU7B">
-                        <node concept="1nq8_$" id="2HYHa0WIAx0" role="1Tms7$">
-                          <node concept="a7P8L" id="2HYHa0WIAx1" role="1nq8_t">
-                            <ref role="a7OzE" node="2HYHa0WIAwE" resolve="SValue" />
-                          </node>
+                      <node concept="1Ft4W6" id="7zIaaskbYHY" role="3uHU7B">
+                        <node concept="a7P8L" id="2HYHa0WIAx1" role="1FtiSR">
+                          <ref role="a7OzE" node="2HYHa0WIAwE" resolve="SValue" />
                         </node>
                       </node>
                     </node>
@@ -23083,11 +23009,9 @@
                   <node concept="3wWvb2" id="2HYHa0WIAx4" role="3I6s78">
                     <node concept="1Wc70l" id="2HYHa0WIAx5" role="3wWo3s">
                       <node concept="2d3UOw" id="2HYHa0WIAx6" role="3uHU7B">
-                        <node concept="1TmgYN" id="2HYHa0WIAxb" role="3uHU7B">
-                          <node concept="1nq8_$" id="2HYHa0WIAxc" role="1Tms7$">
-                            <node concept="a7P8L" id="2HYHa0WIAxd" role="1nq8_t">
-                              <ref role="a7OzE" node="2HYHa0WIAwE" resolve="SValue" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYHZ" role="3uHU7B">
+                          <node concept="a7P8L" id="2HYHa0WIAxd" role="1FtiSR">
+                            <ref role="a7OzE" node="2HYHa0WIAwE" resolve="SValue" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="2HYHa0WIAEx" role="3uHU7w">
@@ -23095,11 +23019,9 @@
                         </node>
                       </node>
                       <node concept="2dkUwp" id="2HYHa0WIAxg" role="3uHU7w">
-                        <node concept="1TmgYN" id="2HYHa0WIAxl" role="3uHU7B">
-                          <node concept="1nq8_$" id="2HYHa0WIAxm" role="1Tms7$">
-                            <node concept="a7P8L" id="2HYHa0WIAxn" role="1nq8_t">
-                              <ref role="a7OzE" node="2HYHa0WIAwE" resolve="SValue" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYI0" role="3uHU7B">
+                          <node concept="a7P8L" id="2HYHa0WIAxn" role="1FtiSR">
+                            <ref role="a7OzE" node="2HYHa0WIAwE" resolve="SValue" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="2HYHa0WIAxp" role="3uHU7w">
@@ -23181,11 +23103,9 @@
                   <node concept="3wWvb2" id="7AyqXCdDQGi" role="3I6s78">
                     <node concept="3y3z36" id="7AyqXCdDQGj" role="3wWo3s">
                       <node concept="10Nm6u" id="7AyqXCdDQGk" role="3uHU7w" />
-                      <node concept="1TmgYN" id="7AyqXCdDQGl" role="3uHU7B">
-                        <node concept="1nq8_$" id="7AyqXCdDQGm" role="1Tms7$">
-                          <node concept="a7P8L" id="7AyqXCdDQK1" role="1nq8_t">
-                            <ref role="a7OzE" node="5TXeSYSHoVW" resolve="SValue" />
-                          </node>
+                      <node concept="1Ft4W6" id="7zIaaskbYI1" role="3uHU7B">
+                        <node concept="a7P8L" id="7AyqXCdDQK1" role="1FtiSR">
+                          <ref role="a7OzE" node="5TXeSYSHoVW" resolve="SValue" />
                         </node>
                       </node>
                     </node>
@@ -23195,11 +23115,9 @@
                   <node concept="3wWvb2" id="7AyqXCdDQGp" role="3I6s78">
                     <node concept="1Wc70l" id="7AyqXCdDQGq" role="3wWo3s">
                       <node concept="2d3UOw" id="7AyqXCdDQGr" role="3uHU7B">
-                        <node concept="1TmgYN" id="7AyqXCdDQGw" role="3uHU7B">
-                          <node concept="1nq8_$" id="7AyqXCdDQGx" role="1Tms7$">
-                            <node concept="a7P8L" id="7AyqXCdDQKu" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSHoVW" resolve="SValue" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYI2" role="3uHU7B">
+                          <node concept="a7P8L" id="7AyqXCdDQKu" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSHoVW" resolve="SValue" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="7AyqXCdDQG$" role="3uHU7w">
@@ -23207,11 +23125,9 @@
                         </node>
                       </node>
                       <node concept="2dkUwp" id="7AyqXCdDQG_" role="3uHU7w">
-                        <node concept="1TmgYN" id="7AyqXCdDQGE" role="3uHU7B">
-                          <node concept="1nq8_$" id="7AyqXCdDQGF" role="1Tms7$">
-                            <node concept="a7P8L" id="7AyqXCdDQKx" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSHoVW" resolve="SValue" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYI3" role="3uHU7B">
+                          <node concept="a7P8L" id="7AyqXCdDQKx" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSHoVW" resolve="SValue" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="7AyqXCdDQGI" role="3uHU7w">
@@ -23289,11 +23205,9 @@
                   <node concept="3wWvb2" id="1Py6iKBvzV" role="3I6s78">
                     <node concept="3y3z36" id="1Py6iKBwm0" role="3wWo3s">
                       <node concept="10Nm6u" id="1Py6iKBwmb" role="3uHU7w" />
-                      <node concept="1TmgYN" id="1Py6iKBv$c" role="3uHU7B">
-                        <node concept="1nq8_$" id="1Py6iKBv$i" role="1Tms7$">
-                          <node concept="a7P8L" id="1Py6iKBv$g" role="1nq8_t">
-                            <ref role="a7OzE" node="19nQ_7UTXff" resolve="SValue" />
-                          </node>
+                      <node concept="1Ft4W6" id="7zIaaskbYI4" role="3uHU7B">
+                        <node concept="a7P8L" id="1Py6iKBv$g" role="1FtiSR">
+                          <ref role="a7OzE" node="19nQ_7UTXff" resolve="SValue" />
                         </node>
                       </node>
                     </node>
@@ -23303,11 +23217,9 @@
                   <node concept="3wWvb2" id="7lt0LtQ4F5O" role="3I6s78">
                     <node concept="1Wc70l" id="2HYHa0WIAp3" role="3wWo3s">
                       <node concept="2d3UOw" id="2HYHa0WIAv2" role="3uHU7B">
-                        <node concept="1TmgYN" id="2HYHa0WIAsc" role="3uHU7B">
-                          <node concept="1nq8_$" id="2HYHa0WIAsd" role="1Tms7$">
-                            <node concept="a7P8L" id="2HYHa0WIAse" role="1nq8_t">
-                              <ref role="a7OzE" node="19nQ_7UTXff" resolve="SValue" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYI5" role="3uHU7B">
+                          <node concept="a7P8L" id="2HYHa0WIAse" role="1FtiSR">
+                            <ref role="a7OzE" node="19nQ_7UTXff" resolve="SValue" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="2HYHa0WIAsg" role="3uHU7w">
@@ -23315,11 +23227,9 @@
                         </node>
                       </node>
                       <node concept="2dkUwp" id="2HYHa0WIAvM" role="3uHU7w">
-                        <node concept="1TmgYN" id="2HYHa0WIAsm" role="3uHU7B">
-                          <node concept="1nq8_$" id="2HYHa0WIAsn" role="1Tms7$">
-                            <node concept="a7P8L" id="2HYHa0WIAso" role="1nq8_t">
-                              <ref role="a7OzE" node="19nQ_7UTXff" resolve="SValue" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYI6" role="3uHU7B">
+                          <node concept="a7P8L" id="2HYHa0WIAso" role="1FtiSR">
+                            <ref role="a7OzE" node="19nQ_7UTXff" resolve="SValue" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="2HYHa0WIAsq" role="3uHU7w">
@@ -23401,11 +23311,9 @@
                   <node concept="3wWvb2" id="7AyqXCdDQKV" role="3I6s78">
                     <node concept="3y3z36" id="7AyqXCdDQKW" role="3wWo3s">
                       <node concept="10Nm6u" id="7AyqXCdDQKX" role="3uHU7w" />
-                      <node concept="1TmgYN" id="7AyqXCdDQKY" role="3uHU7B">
-                        <node concept="1nq8_$" id="7AyqXCdDQKZ" role="1Tms7$">
-                          <node concept="a7P8L" id="7AyqXCdDQOE" role="1nq8_t">
-                            <ref role="a7OzE" node="5TXeSYSHpeA" resolve="SValue" />
-                          </node>
+                      <node concept="1Ft4W6" id="7zIaaskbYI7" role="3uHU7B">
+                        <node concept="a7P8L" id="7AyqXCdDQOE" role="1FtiSR">
+                          <ref role="a7OzE" node="5TXeSYSHpeA" resolve="SValue" />
                         </node>
                       </node>
                     </node>
@@ -23415,11 +23323,9 @@
                   <node concept="3wWvb2" id="7AyqXCdDQL2" role="3I6s78">
                     <node concept="1Wc70l" id="7AyqXCdDQL3" role="3wWo3s">
                       <node concept="2d3UOw" id="7AyqXCdDQL4" role="3uHU7B">
-                        <node concept="1TmgYN" id="7AyqXCdDQL9" role="3uHU7B">
-                          <node concept="1nq8_$" id="7AyqXCdDQLa" role="1Tms7$">
-                            <node concept="a7P8L" id="7AyqXCdDQP1" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSHpeA" resolve="SValue" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYI8" role="3uHU7B">
+                          <node concept="a7P8L" id="7AyqXCdDQP1" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSHpeA" resolve="SValue" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="7AyqXCdDQLd" role="3uHU7w">
@@ -23427,11 +23333,9 @@
                         </node>
                       </node>
                       <node concept="2dkUwp" id="7AyqXCdDQLe" role="3uHU7w">
-                        <node concept="1TmgYN" id="7AyqXCdDQLj" role="3uHU7B">
-                          <node concept="1nq8_$" id="7AyqXCdDQLk" role="1Tms7$">
-                            <node concept="a7P8L" id="7AyqXCdDQP4" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSHpeA" resolve="SValue" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYI9" role="3uHU7B">
+                          <node concept="a7P8L" id="7AyqXCdDQP4" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSHpeA" resolve="SValue" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="7AyqXCdDQLn" role="3uHU7w">
@@ -23806,11 +23710,9 @@
                             <node concept="Xl_RD" id="4WwvXRZ9Mu9" role="3uHU7B">
                               <property role="Xl_RC" value="type " />
                             </node>
-                            <node concept="1TmgYN" id="4WwvXRZbtBr" role="3uHU7w">
-                              <node concept="1nq8_$" id="4WwvXRZbtC0" role="1Tms7$">
-                                <node concept="a7P8L" id="4WwvXRZbtBY" role="1nq8_t">
-                                  <ref role="a7OzE" node="19nQ_7UPXpg" resolve="S" />
-                                </node>
+                            <node concept="1Ft4W6" id="7zIaaskbYIa" role="3uHU7w">
+                              <node concept="a7P8L" id="4WwvXRZbtBY" role="1FtiSR">
+                                <ref role="a7OzE" node="19nQ_7UPXpg" resolve="S" />
                               </node>
                             </node>
                           </node>
@@ -23818,11 +23720,9 @@
                             <property role="Xl_RC" value=" can't be converted to " />
                           </node>
                         </node>
-                        <node concept="1TmgYN" id="4WwvXRZbtLI" role="3uHU7w">
-                          <node concept="1nq8_$" id="4WwvXRZbtQD" role="1Tms7$">
-                            <node concept="a7P8L" id="4WwvXRZbtQB" role="1nq8_t">
-                              <ref role="a7OzE" node="19nQ_7UPXpp" resolve="T" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYIb" role="3uHU7w">
+                          <node concept="a7P8L" id="4WwvXRZbtQB" role="1FtiSR">
+                            <ref role="a7OzE" node="19nQ_7UPXpp" resolve="T" />
                           </node>
                         </node>
                       </node>
@@ -23875,11 +23775,9 @@
                             <node concept="Xl_RD" id="2i6cuYQD6rl" role="3uHU7B">
                               <property role="Xl_RC" value="type " />
                             </node>
-                            <node concept="1TmgYN" id="2i6cuYQD6rm" role="3uHU7w">
-                              <node concept="1nq8_$" id="2i6cuYQD6rn" role="1Tms7$">
-                                <node concept="a7P8L" id="2i6cuYQD6ro" role="1nq8_t">
-                                  <ref role="a7OzE" node="2i6cuYQD6r6" resolve="S" />
-                                </node>
+                            <node concept="1Ft4W6" id="7zIaaskbYIc" role="3uHU7w">
+                              <node concept="a7P8L" id="2i6cuYQD6ro" role="1FtiSR">
+                                <ref role="a7OzE" node="2i6cuYQD6r6" resolve="S" />
                               </node>
                             </node>
                           </node>
@@ -23887,11 +23785,9 @@
                             <property role="Xl_RC" value=" can't be converted to " />
                           </node>
                         </node>
-                        <node concept="1TmgYN" id="2i6cuYQD6rq" role="3uHU7w">
-                          <node concept="1nq8_$" id="2i6cuYQD6rr" role="1Tms7$">
-                            <node concept="a7P8L" id="2i6cuYQD6rs" role="1nq8_t">
-                              <ref role="a7OzE" node="2i6cuYQD6r7" resolve="T" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYId" role="3uHU7w">
+                          <node concept="a7P8L" id="2i6cuYQD6rs" role="1FtiSR">
+                            <ref role="a7OzE" node="2i6cuYQD6r7" resolve="T" />
                           </node>
                         </node>
                       </node>
@@ -24996,11 +24892,9 @@
                   <node concept="3I6s7M" id="4WwvXRZ581j" role="3I6sU7">
                     <node concept="1lpGmL" id="4WwvXRZ581f" role="3I6s78">
                       <node concept="3cpWs3" id="4WwvXRZ58$j" role="1lp$hM">
-                        <node concept="1TmgYN" id="4WwvXRZ58$v" role="3uHU7w">
-                          <node concept="1nq8_$" id="4WwvXRZ58$J" role="1Tms7$">
-                            <node concept="a7P8L" id="4WwvXRZ58$H" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSGrQQ" resolve="Type" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYIe" role="3uHU7w">
+                          <node concept="a7P8L" id="4WwvXRZ58$H" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSGrQQ" resolve="Type" />
                           </node>
                         </node>
                         <node concept="Xl_RD" id="4WwvXRZ581q" role="3uHU7B">
@@ -25633,11 +25527,9 @@
                   <node concept="3I6s7M" id="2i6cuYQOG1M" role="3I6sU7">
                     <node concept="1lpGmL" id="2i6cuYQOG1N" role="3I6s78">
                       <node concept="3cpWs3" id="2i6cuYQOG1O" role="1lp$hM">
-                        <node concept="1TmgYN" id="2i6cuYQOG1P" role="3uHU7w">
-                          <node concept="1nq8_$" id="2i6cuYQOG1Q" role="1Tms7$">
-                            <node concept="a7P8L" id="2i6cuYQOGi3" role="1nq8_t">
-                              <ref role="a7OzE" node="2i6cuYQOECC" resolve="T" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYIf" role="3uHU7w">
+                          <node concept="a7P8L" id="2i6cuYQOGi3" role="1FtiSR">
+                            <ref role="a7OzE" node="2i6cuYQOECC" resolve="T" />
                           </node>
                         </node>
                         <node concept="Xl_RD" id="2i6cuYQOG1S" role="3uHU7B">
@@ -25818,11 +25710,9 @@
                       </node>
                       <node concept="HKQnh" id="RZQG98wSaN" role="3A8w4Q">
                         <node concept="2Sg_IR" id="RZQG98wSaO" role="HKQng">
-                          <node concept="1TmgYN" id="RZQG98wSaP" role="2SgHGx">
-                            <node concept="1nq8_$" id="RZQG98wSaQ" role="1Tms7$">
-                              <node concept="a7P8L" id="RZQG98wSaR" role="1nq8_t">
-                                <ref role="a7OzE" node="uhKQGLiZC_" resolve="Cls" />
-                              </node>
+                          <node concept="1Ft4W6" id="7zIaaskbYIg" role="2SgHGx">
+                            <node concept="a7P8L" id="RZQG98wSaR" role="1FtiSR">
+                              <ref role="a7OzE" node="uhKQGLiZC_" resolve="Cls" />
                             </node>
                           </node>
                           <node concept="1bVj0M" id="RZQG98wSaV" role="2SgG2M">
@@ -26008,18 +25898,14 @@
                       </node>
                       <node concept="HKQnh" id="uhKQGLiP1d" role="3A8w4Q">
                         <node concept="2Sg_IR" id="RZQG98wzLK" role="HKQng">
-                          <node concept="1TmgYN" id="RZQG98wCG$" role="2SgHGx">
-                            <node concept="1nq8_$" id="RZQG98wCII" role="1Tms7$">
-                              <node concept="a7P8L" id="RZQG98wCIG" role="1nq8_t">
-                                <ref role="a7OzE" node="uhKQGLiRRo" resolve="Cls" />
-                              </node>
+                          <node concept="1Ft4W6" id="7zIaaskbYIh" role="2SgHGx">
+                            <node concept="a7P8L" id="RZQG98wCIG" role="1FtiSR">
+                              <ref role="a7OzE" node="uhKQGLiRRo" resolve="Cls" />
                             </node>
                           </node>
-                          <node concept="1TmgYN" id="RZQG98wQUm" role="2SgHGx">
-                            <node concept="1nq8_$" id="RZQG98wRSf" role="1Tms7$">
-                              <node concept="a7P8L" id="RZQG98wRSd" role="1nq8_t">
-                                <ref role="a7OzE" node="uhKQGLiP0S" resolve="Args" />
-                              </node>
+                          <node concept="1Ft4W6" id="7zIaaskbYIi" role="2SgHGx">
+                            <node concept="a7P8L" id="RZQG98wRSd" role="1FtiSR">
+                              <ref role="a7OzE" node="uhKQGLiP0S" resolve="Args" />
                             </node>
                           </node>
                           <node concept="1bVj0M" id="RZQG98wzLL" role="2SgG2M">
@@ -26171,11 +26057,9 @@
                       </node>
                       <node concept="HKQnh" id="RZQG98__C9" role="3A8w4Q">
                         <node concept="2Sg_IR" id="RZQG98__Ca" role="HKQng">
-                          <node concept="1TmgYN" id="RZQG98__Cb" role="2SgHGx">
-                            <node concept="1nq8_$" id="RZQG98__Cc" role="1Tms7$">
-                              <node concept="a7P8L" id="RZQG98__Cd" role="1nq8_t">
-                                <ref role="a7OzE" node="RZQG98__BS" resolve="Cls" />
-                              </node>
+                          <node concept="1Ft4W6" id="7zIaaskbYIj" role="2SgHGx">
+                            <node concept="a7P8L" id="RZQG98__Cd" role="1FtiSR">
+                              <ref role="a7OzE" node="RZQG98__BS" resolve="Cls" />
                             </node>
                           </node>
                           <node concept="1bVj0M" id="RZQG98__Ce" role="2SgG2M">
@@ -26774,11 +26658,9 @@
                             <node concept="3uibUv" id="5WBVN_MAoPD" role="10Q1$1">
                               <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                               <node concept="2c44te" id="5WBVN_MAoPE" role="lGtFl">
-                                <node concept="1TmgYN" id="49obaclIRJ1" role="2c44t1">
-                                  <node concept="1nq8_$" id="49obaclIRLr" role="1Tms7$">
-                                    <node concept="a7P8L" id="49obaclIRLp" role="1nq8_t">
-                                      <ref role="a7OzE" node="euG2bFdq0X" resolve="ElementNode" />
-                                    </node>
+                                <node concept="1Ft4W6" id="7zIaaskbYIk" role="2c44t1">
+                                  <node concept="a7P8L" id="49obaclIRLp" role="1FtiSR">
+                                    <ref role="a7OzE" node="euG2bFdq0X" resolve="ElementNode" />
                                   </node>
                                 </node>
                               </node>
@@ -26875,11 +26757,9 @@
                             <node concept="3uibUv" id="5WBVN_MAnCr" role="8Xvag">
                               <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                               <node concept="2c44te" id="5WBVN_MAnCs" role="lGtFl">
-                                <node concept="1TmgYN" id="49obaclIRPL" role="2c44t1">
-                                  <node concept="1nq8_$" id="49obaclIRSb" role="1Tms7$">
-                                    <node concept="a7P8L" id="49obaclIRS9" role="1nq8_t">
-                                      <ref role="a7OzE" node="euG2bFds1W" resolve="ElementNode" />
-                                    </node>
+                                <node concept="1Ft4W6" id="7zIaaskbYIl" role="2c44t1">
+                                  <node concept="a7P8L" id="49obaclIRS9" role="1FtiSR">
+                                    <ref role="a7OzE" node="euG2bFds1W" resolve="ElementNode" />
                                   </node>
                                 </node>
                               </node>
@@ -26976,11 +26856,9 @@
                             <node concept="3uibUv" id="5WBVN_MAmrW" role="3qUE_r">
                               <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                               <node concept="2c44te" id="5WBVN_MAmrX" role="lGtFl">
-                                <node concept="1TmgYN" id="49obaclIRUo" role="2c44t1">
-                                  <node concept="1nq8_$" id="49obaclIRWW" role="1Tms7$">
-                                    <node concept="a7P8L" id="49obaclIRWU" role="1nq8_t">
-                                      <ref role="a7OzE" node="euG2bFdunq" resolve="BoundNode" />
-                                    </node>
+                                <node concept="1Ft4W6" id="7zIaaskbYIm" role="2c44t1">
+                                  <node concept="a7P8L" id="49obaclIRWU" role="1FtiSR">
+                                    <ref role="a7OzE" node="euG2bFdunq" resolve="BoundNode" />
                                   </node>
                                 </node>
                               </node>
@@ -27077,11 +26955,9 @@
                             <node concept="3uibUv" id="5WBVN_Mr$TH" role="3qUvdb">
                               <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                               <node concept="2c44te" id="5WBVN_Mr$TI" role="lGtFl">
-                                <node concept="1TmgYN" id="49obaclIRZ9" role="2c44t1">
-                                  <node concept="1nq8_$" id="49obaclIS1z" role="1Tms7$">
-                                    <node concept="a7P8L" id="49obaclIS1x" role="1nq8_t">
-                                      <ref role="a7OzE" node="euG2bFdwIa" resolve="BoundNode" />
-                                    </node>
+                                <node concept="1Ft4W6" id="7zIaaskbYIn" role="2c44t1">
+                                  <node concept="a7P8L" id="49obaclIS1x" role="1FtiSR">
+                                    <ref role="a7OzE" node="euG2bFdwIa" resolve="BoundNode" />
                                   </node>
                                 </node>
                               </node>
@@ -27850,11 +27726,9 @@
                           <node concept="2QyH0A" id="6N2bvv_rCkN" role="2c44tc">
                             <node concept="2a1RnH" id="6N2bvv_rClg" role="2QyKkv">
                               <node concept="2c44t8" id="6N2bvv_rClH" role="lGtFl">
-                                <node concept="1TmgYN" id="6N2bvv_rCmc" role="2c44t1">
-                                  <node concept="1nq8_$" id="6N2bvv_rCmJ" role="1Tms7$">
-                                    <node concept="a7P8L" id="6N2bvv_rCmH" role="1nq8_t">
-                                      <ref role="a7OzE" node="6N2bvv_l9_z" resolve="Args" />
-                                    </node>
+                                <node concept="1Ft4W6" id="7zIaaskbYIo" role="2c44t1">
+                                  <node concept="a7P8L" id="6N2bvv_rCmH" role="1FtiSR">
+                                    <ref role="a7OzE" node="6N2bvv_l9_z" resolve="Args" />
                                   </node>
                                 </node>
                               </node>
@@ -28007,19 +27881,15 @@
                       <node concept="3Aqczg" id="6N2bvv_pZZZ" role="3cqZAp">
                         <node concept="3wWvb2" id="6N2bvv_pZZX" role="3Aqpz8">
                           <node concept="2OqwBi" id="6N2bvv_q03k" role="3wWo3s">
-                            <node concept="1TmgYN" id="6N2bvv_q03l" role="2Oq$k0">
-                              <node concept="1nq8_$" id="6N2bvv_q03m" role="1Tms7$">
-                                <node concept="a7P8L" id="6N2bvv_q03n" role="1nq8_t">
-                                  <ref role="a7OzE" node="5TXeSYSHy4s" resolve="Nodes" />
-                                </node>
+                            <node concept="1Ft4W6" id="7zIaaskbYIp" role="2Oq$k0">
+                              <node concept="a7P8L" id="6N2bvv_q03n" role="1FtiSR">
+                                <ref role="a7OzE" node="5TXeSYSHy4s" resolve="Nodes" />
                               </node>
                             </node>
                             <node concept="TSZUe" id="6N2bvv_q03o" role="2OqNvi">
-                              <node concept="1TmgYN" id="6N2bvv_q03p" role="25WWJ7">
-                                <node concept="1nq8_$" id="6N2bvv_q03q" role="1Tms7$">
-                                  <node concept="a7P8L" id="2J$kxDHrgG4" role="1nq8_t">
-                                    <ref role="a7OzE" node="2J$kxDHrgzl" resolve="Node" />
-                                  </node>
+                              <node concept="1Ft4W6" id="7zIaaskbYIq" role="25WWJ7">
+                                <node concept="a7P8L" id="2J$kxDHrgG4" role="1FtiSR">
+                                  <ref role="a7OzE" node="2J$kxDHrgzl" resolve="Node" />
                                 </node>
                               </node>
                             </node>
@@ -28217,11 +28087,9 @@
                                   <node concept="Xl_RD" id="27bTNFf1_H4" role="3uHU7B">
                                     <property role="Xl_RC" value="unreifiable type [" />
                                   </node>
-                                  <node concept="1TmgYN" id="27bTNFf1_H5" role="3uHU7w">
-                                    <node concept="1nq8_$" id="27bTNFf1_H6" role="1Tms7$">
-                                      <node concept="a7P8L" id="27bTNFf1_Un" role="1nq8_t">
-                                        <ref role="a7OzE" node="5TXeSYSHyVq" resolve="Type" />
-                                      </node>
+                                  <node concept="1Ft4W6" id="7zIaaskbYIr" role="3uHU7w">
+                                    <node concept="a7P8L" id="27bTNFf1_Un" role="1FtiSR">
+                                      <ref role="a7OzE" node="5TXeSYSHyVq" resolve="Type" />
                                     </node>
                                   </node>
                                 </node>
@@ -39929,11 +39797,9 @@
                     <node concept="1lHd6T" id="PltxfHBerA" role="3I6s78">
                       <property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
                       <node concept="3cpWs3" id="geDLM4Thmu" role="1ljv2e">
-                        <node concept="1TmgYN" id="geDLM4Thqt" role="3uHU7w">
-                          <node concept="1nq8_$" id="geDLM4ThA6" role="1Tms7$">
-                            <node concept="a7P8L" id="geDLM4ThA4" role="1nq8_t">
-                              <ref role="a7OzE" node="geDLM4TaW4" resolve="NonArrayT" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYIs" role="3uHU7w">
+                          <node concept="a7P8L" id="geDLM4ThA4" role="1FtiSR">
+                            <ref role="a7OzE" node="geDLM4TaW4" resolve="NonArrayT" />
                           </node>
                         </node>
                         <node concept="Xl_RD" id="geDLM4TgiQ" role="3uHU7B">
@@ -39941,11 +39807,9 @@
                         </node>
                       </node>
                       <node concept="3G3gwz" id="PltxfHBes0" role="3Gvizk">
-                        <node concept="1TmgYN" id="PltxfHBes4" role="3G3gzb">
-                          <node concept="1nq8_$" id="PltxfHBesf" role="1Tms7$">
-                            <node concept="a7P8L" id="PltxfHBesd" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSGbxs" resolve="ArrayLiteralNode" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYIt" role="3G3gzb">
+                          <node concept="a7P8L" id="PltxfHBesd" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSGbxs" resolve="ArrayLiteralNode" />
                           </node>
                         </node>
                       </node>
@@ -40105,11 +39969,9 @@
                     <node concept="1lHd6T" id="PltxfHBesw" role="3I6s78">
                       <property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
                       <node concept="3cpWs3" id="PltxfHBesx" role="1ljv2e">
-                        <node concept="1TmgYN" id="PltxfHBesy" role="3uHU7w">
-                          <node concept="1nq8_$" id="PltxfHBesz" role="1Tms7$">
-                            <node concept="a7P8L" id="PltxfHBKkw" role="1nq8_t">
-                              <ref role="a7OzE" node="geDLM4SJAH" resolve="NonArrayT" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYIu" role="3uHU7w">
+                          <node concept="a7P8L" id="PltxfHBKkw" role="1FtiSR">
+                            <ref role="a7OzE" node="geDLM4SJAH" resolve="NonArrayT" />
                           </node>
                         </node>
                         <node concept="Xl_RD" id="PltxfHBes_" role="3uHU7B">
@@ -40117,11 +39979,9 @@
                         </node>
                       </node>
                       <node concept="3G3gwz" id="PltxfHBesA" role="3Gvizk">
-                        <node concept="1TmgYN" id="PltxfHBesB" role="3G3gzb">
-                          <node concept="1nq8_$" id="PltxfHBesC" role="1Tms7$">
-                            <node concept="a7P8L" id="PltxfHBKmv" role="1nq8_t">
-                              <ref role="a7OzE" node="5TXeSYSGbVy" resolve="ArrayLiteralNode" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYIv" role="3G3gzb">
+                          <node concept="a7P8L" id="PltxfHBKmv" role="1FtiSR">
+                            <ref role="a7OzE" node="5TXeSYSGbVy" resolve="ArrayLiteralNode" />
                           </node>
                         </node>
                       </node>
@@ -43565,11 +43425,9 @@
                   <node concept="3I6s7M" id="6QbNnfq3bZU" role="3I6sU7">
                     <node concept="3wWvb2" id="5fMWD6H$6lB" role="3I6s78">
                       <node concept="2OqwBi" id="5fMWD6Im8AZ" role="3wWo3s">
-                        <node concept="1TmgYN" id="5fMWD6H$6lO" role="2Oq$k0">
-                          <node concept="1nq8_$" id="5fMWD6H$6lZ" role="1Tms7$">
-                            <node concept="a7P8L" id="5fMWD6H$6lX" role="1nq8_t">
-                              <ref role="a7OzE" node="6QbNnfq3aCy" resolve="TypesUpdate" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYIw" role="2Oq$k0">
+                          <node concept="a7P8L" id="5fMWD6H$6lX" role="1FtiSR">
+                            <ref role="a7OzE" node="6QbNnfq3aCy" resolve="TypesUpdate" />
                           </node>
                         </node>
                         <node concept="liA8E" id="5fMWD6Im8XT" role="2OqNvi">
@@ -43580,11 +43438,9 @@
                             </node>
                             <node concept="iZEcu" id="5fMWD6Im95v" role="2OqNvi" />
                           </node>
-                          <node concept="1TmgYN" id="5fMWD6Im9qg" role="37wK5m">
-                            <node concept="1nq8_$" id="5fMWD6Im9qh" role="1Tms7$">
-                              <node concept="a7P8L" id="5fMWD6Im9qi" role="1nq8_t">
-                                <ref role="a7OzE" node="35YJGAJTRFu" resolve="Node" />
-                              </node>
+                          <node concept="1Ft4W6" id="7zIaaskbYIx" role="37wK5m">
+                            <node concept="a7P8L" id="5fMWD6Im9qi" role="1FtiSR">
+                              <ref role="a7OzE" node="35YJGAJTRFu" resolve="Node" />
                             </node>
                           </node>
                         </node>
@@ -43690,11 +43546,9 @@
                   <node concept="3I6s7M" id="6QbNnfq3c5y" role="3I6sU7">
                     <node concept="3wWvb2" id="6QbNnfq3c68" role="3I6s78">
                       <node concept="2OqwBi" id="6QbNnfq3c69" role="3wWo3s">
-                        <node concept="1TmgYN" id="6QbNnfq3c6a" role="2Oq$k0">
-                          <node concept="1nq8_$" id="6QbNnfq3c6b" role="1Tms7$">
-                            <node concept="a7P8L" id="6QbNnfq3c6c" role="1nq8_t">
-                              <ref role="a7OzE" node="6QbNnfq3aE8" resolve="TypesUpdate" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYIy" role="2Oq$k0">
+                          <node concept="a7P8L" id="6QbNnfq3c6c" role="1FtiSR">
+                            <ref role="a7OzE" node="6QbNnfq3aE8" resolve="TypesUpdate" />
                           </node>
                         </node>
                         <node concept="liA8E" id="6QbNnfq3c6d" role="2OqNvi">
@@ -43705,11 +43559,9 @@
                             </node>
                             <node concept="iZEcu" id="6QbNnfq3c6g" role="2OqNvi" />
                           </node>
-                          <node concept="1TmgYN" id="6QbNnfq3c6h" role="37wK5m">
-                            <node concept="1nq8_$" id="6QbNnfq3c6i" role="1Tms7$">
-                              <node concept="a7P8L" id="6QbNnfq3c6j" role="1nq8_t">
-                                <ref role="a7OzE" node="35YJGAJTSkG" resolve="Node" />
-                              </node>
+                          <node concept="1Ft4W6" id="7zIaaskbYIz" role="37wK5m">
+                            <node concept="a7P8L" id="6QbNnfq3c6j" role="1FtiSR">
+                              <ref role="a7OzE" node="35YJGAJTSkG" resolve="Node" />
                             </node>
                           </node>
                         </node>
@@ -43815,11 +43667,9 @@
                   <node concept="3I6s7M" id="6QbNnfq3chn" role="3I6sU7">
                     <node concept="3wWvb2" id="6QbNnfq3chZ" role="3I6s78">
                       <node concept="2OqwBi" id="6QbNnfq3ci0" role="3wWo3s">
-                        <node concept="1TmgYN" id="6QbNnfq3ci1" role="2Oq$k0">
-                          <node concept="1nq8_$" id="6QbNnfq3ci2" role="1Tms7$">
-                            <node concept="a7P8L" id="6QbNnfq3ci3" role="1nq8_t">
-                              <ref role="a7OzE" node="6QbNnfq3aFL" resolve="TypesUpdate" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYI$" role="2Oq$k0">
+                          <node concept="a7P8L" id="6QbNnfq3ci3" role="1FtiSR">
+                            <ref role="a7OzE" node="6QbNnfq3aFL" resolve="TypesUpdate" />
                           </node>
                         </node>
                         <node concept="liA8E" id="6QbNnfq3ci4" role="2OqNvi">
@@ -43830,11 +43680,9 @@
                               <ref role="3A2yKK" node="35YJGAJTTbE" resolve="vd" />
                             </node>
                           </node>
-                          <node concept="1TmgYN" id="6QbNnfq3ci8" role="37wK5m">
-                            <node concept="1nq8_$" id="6QbNnfq3ci9" role="1Tms7$">
-                              <node concept="a7P8L" id="6QbNnfq3cia" role="1nq8_t">
-                                <ref role="a7OzE" node="35YJGAJTTbc" resolve="Node" />
-                              </node>
+                          <node concept="1Ft4W6" id="7zIaaskbYI_" role="37wK5m">
+                            <node concept="a7P8L" id="6QbNnfq3cia" role="1FtiSR">
+                              <ref role="a7OzE" node="35YJGAJTTbc" resolve="Node" />
                             </node>
                           </node>
                         </node>
@@ -43940,11 +43788,9 @@
                   <node concept="3I6s7M" id="6QbNnfq3cDq" role="3I6sU7">
                     <node concept="3wWvb2" id="6QbNnfq3cDy" role="3I6s78">
                       <node concept="2OqwBi" id="6QbNnfq3cDz" role="3wWo3s">
-                        <node concept="1TmgYN" id="6QbNnfq3cD$" role="2Oq$k0">
-                          <node concept="1nq8_$" id="6QbNnfq3cD_" role="1Tms7$">
-                            <node concept="a7P8L" id="6QbNnfq3cDA" role="1nq8_t">
-                              <ref role="a7OzE" node="6QbNnfq3aHt" resolve="TypesUpdate" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYIA" role="2Oq$k0">
+                          <node concept="a7P8L" id="6QbNnfq3cDA" role="1FtiSR">
+                            <ref role="a7OzE" node="6QbNnfq3aHt" resolve="TypesUpdate" />
                           </node>
                         </node>
                         <node concept="liA8E" id="6QbNnfq3cDB" role="2OqNvi">
@@ -43955,11 +43801,9 @@
                               <ref role="3A2yKK" node="35YJGAJTTr1" resolve="ac" />
                             </node>
                           </node>
-                          <node concept="1TmgYN" id="6QbNnfq3cDF" role="37wK5m">
-                            <node concept="1nq8_$" id="6QbNnfq3cDG" role="1Tms7$">
-                              <node concept="a7P8L" id="6QbNnfq3cDH" role="1nq8_t">
-                                <ref role="a7OzE" node="35YJGAJTTqz" resolve="Node" />
-                              </node>
+                          <node concept="1Ft4W6" id="7zIaaskbYIB" role="37wK5m">
+                            <node concept="a7P8L" id="6QbNnfq3cDH" role="1FtiSR">
+                              <ref role="a7OzE" node="35YJGAJTTqz" resolve="Node" />
                             </node>
                           </node>
                         </node>
@@ -44127,11 +43971,9 @@
                   <node concept="3I6s7M" id="6QbNnfq3e2e" role="3I6sU7">
                     <node concept="3wWvb2" id="6QbNnfq3e2f" role="3I6s78">
                       <node concept="2OqwBi" id="6QbNnfq3e2g" role="3wWo3s">
-                        <node concept="1TmgYN" id="6QbNnfq3e2h" role="2Oq$k0">
-                          <node concept="1nq8_$" id="6QbNnfq3e2i" role="1Tms7$">
-                            <node concept="a7P8L" id="6QbNnfq3e2j" role="1nq8_t">
-                              <ref role="a7OzE" node="6QbNnfq3aKY" resolve="TypesUpdate" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYIC" role="2Oq$k0">
+                          <node concept="a7P8L" id="6QbNnfq3e2j" role="1FtiSR">
+                            <ref role="a7OzE" node="6QbNnfq3aKY" resolve="TypesUpdate" />
                           </node>
                         </node>
                         <node concept="liA8E" id="6QbNnfq3e2k" role="2OqNvi">
@@ -44142,11 +43984,9 @@
                               <ref role="3A2yKK" node="35YJGAJTUle" resolve="op" />
                             </node>
                           </node>
-                          <node concept="1TmgYN" id="6QbNnfq3e2o" role="37wK5m">
-                            <node concept="1nq8_$" id="6QbNnfq3e2p" role="1Tms7$">
-                              <node concept="a7P8L" id="6QbNnfq3e2q" role="1nq8_t">
-                                <ref role="a7OzE" node="35YJGAJTUkZ" resolve="Node" />
-                              </node>
+                          <node concept="1Ft4W6" id="7zIaaskbYID" role="37wK5m">
+                            <node concept="a7P8L" id="6QbNnfq3e2q" role="1FtiSR">
+                              <ref role="a7OzE" node="35YJGAJTUkZ" resolve="Node" />
                             </node>
                           </node>
                         </node>
@@ -44242,11 +44082,9 @@
                   <node concept="3I6s7M" id="6QbNnfq3evl" role="3I6sU7">
                     <node concept="3wWvb2" id="6QbNnfq3evm" role="3I6s78">
                       <node concept="2OqwBi" id="6QbNnfq3evn" role="3wWo3s">
-                        <node concept="1TmgYN" id="6QbNnfq3evo" role="2Oq$k0">
-                          <node concept="1nq8_$" id="6QbNnfq3evp" role="1Tms7$">
-                            <node concept="a7P8L" id="6QbNnfq3evq" role="1nq8_t">
-                              <ref role="a7OzE" node="6QbNnfq3aMN" resolve="TypesUpdate" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYIE" role="2Oq$k0">
+                          <node concept="a7P8L" id="6QbNnfq3evq" role="1FtiSR">
+                            <ref role="a7OzE" node="6QbNnfq3aMN" resolve="TypesUpdate" />
                           </node>
                         </node>
                         <node concept="liA8E" id="6QbNnfq3evr" role="2OqNvi">
@@ -44257,11 +44095,9 @@
                               <ref role="3A2yKK" node="35YJGAJTUkS" resolve="vd" />
                             </node>
                           </node>
-                          <node concept="1TmgYN" id="6QbNnfq3evv" role="37wK5m">
-                            <node concept="1nq8_$" id="6QbNnfq3evw" role="1Tms7$">
-                              <node concept="a7P8L" id="6QbNnfq3evx" role="1nq8_t">
-                                <ref role="a7OzE" node="35YJGAJTUkD" resolve="Node" />
-                              </node>
+                          <node concept="1Ft4W6" id="7zIaaskbYIF" role="37wK5m">
+                            <node concept="a7P8L" id="6QbNnfq3evx" role="1FtiSR">
+                              <ref role="a7OzE" node="35YJGAJTUkD" resolve="Node" />
                             </node>
                           </node>
                         </node>
@@ -44357,11 +44193,9 @@
                   <node concept="3I6s7M" id="6QbNnfq3eY8" role="3I6sU7">
                     <node concept="3wWvb2" id="6QbNnfq3eY9" role="3I6s78">
                       <node concept="2OqwBi" id="6QbNnfq3eYa" role="3wWo3s">
-                        <node concept="1TmgYN" id="6QbNnfq3eYb" role="2Oq$k0">
-                          <node concept="1nq8_$" id="6QbNnfq3eYc" role="1Tms7$">
-                            <node concept="a7P8L" id="6QbNnfq3eYd" role="1nq8_t">
-                              <ref role="a7OzE" node="6QbNnfq3aOF" resolve="TypesUpdate" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYIG" role="2Oq$k0">
+                          <node concept="a7P8L" id="6QbNnfq3eYd" role="1FtiSR">
+                            <ref role="a7OzE" node="6QbNnfq3aOF" resolve="TypesUpdate" />
                           </node>
                         </node>
                         <node concept="liA8E" id="6QbNnfq3eYe" role="2OqNvi">
@@ -44372,11 +44206,9 @@
                               <ref role="3A2yKK" node="35YJGAJTUky" resolve="ac" />
                             </node>
                           </node>
-                          <node concept="1TmgYN" id="6QbNnfq3eYi" role="37wK5m">
-                            <node concept="1nq8_$" id="6QbNnfq3eYj" role="1Tms7$">
-                              <node concept="a7P8L" id="6QbNnfq3eYk" role="1nq8_t">
-                                <ref role="a7OzE" node="35YJGAJTUkj" resolve="Node" />
-                              </node>
+                          <node concept="1Ft4W6" id="7zIaaskbYIH" role="37wK5m">
+                            <node concept="a7P8L" id="6QbNnfq3eYk" role="1FtiSR">
+                              <ref role="a7OzE" node="35YJGAJTUkj" resolve="Node" />
                             </node>
                           </node>
                         </node>
@@ -45600,19 +45432,15 @@
                   <node concept="3I6s7M" id="1laj_RT$1rL" role="3I6sU7">
                     <node concept="1lHd6T" id="1laj_RT$1rK" role="3I6s78">
                       <property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
-                      <node concept="1TmgYN" id="1laj_RT$1uw" role="1ljv2e">
-                        <node concept="1nq8_$" id="1laj_RT$1ux" role="1Tms7$">
-                          <node concept="a7P8L" id="1laj_RT$1uy" role="1nq8_t">
-                            <ref role="a7OzE" node="3MG3BxoG1mO" resolve="Msg" />
-                          </node>
+                      <node concept="1Ft4W6" id="7zIaaskbYII" role="1ljv2e">
+                        <node concept="a7P8L" id="1laj_RT$1uy" role="1FtiSR">
+                          <ref role="a7OzE" node="3MG3BxoG1mO" resolve="Msg" />
                         </node>
                       </node>
                       <node concept="3G3gwz" id="1laj_RT$1uO" role="3Gvizk">
-                        <node concept="1TmgYN" id="1laj_RT$1Wv" role="3G3gzb">
-                          <node concept="1nq8_$" id="1laj_RT$1Ww" role="1Tms7$">
-                            <node concept="a7P8L" id="1laj_RT$1Wx" role="1nq8_t">
-                              <ref role="a7OzE" node="3MG3BxoG1mB" resolve="Node" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYIJ" role="3G3gzb">
+                          <node concept="a7P8L" id="1laj_RT$1Wx" role="1FtiSR">
+                            <ref role="a7OzE" node="3MG3BxoG1mB" resolve="Node" />
                           </node>
                         </node>
                       </node>
@@ -46270,11 +46098,9 @@
                         <node concept="Xl_RD" id="2i6cuYQZodj" role="3uHU7B">
                           <property role="Xl_RC" value="cannot find conversion for type " />
                         </node>
-                        <node concept="1TmgYN" id="2i6cuYQZodk" role="3uHU7w">
-                          <node concept="1nq8_$" id="2i6cuYQZodl" role="1Tms7$">
-                            <node concept="a7P8L" id="2i6cuYQZodm" role="1nq8_t">
-                              <ref role="a7OzE" node="2i6cuYQZodd" resolve="T" />
-                            </node>
+                        <node concept="1Ft4W6" id="7zIaaskbYIK" role="3uHU7w">
+                          <node concept="a7P8L" id="2i6cuYQZodm" role="1FtiSR">
+                            <ref role="a7OzE" node="2i6cuYQZodd" resolve="T" />
                           </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 e406b58a..e2e90a9f 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="5" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="6" />
     <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 94ea2c1e..ededbca0 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="5" />
+    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="6" />
     <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>