diff --git a/code/languages/org.iets3.opensource/.mps/libraries.xml b/code/languages/org.iets3.opensource/.mps/libraries.xml
index 35bdd7c36a..50fa46dc17 100644
--- a/code/languages/org.iets3.opensource/.mps/libraries.xml
+++ b/code/languages/org.iets3.opensource/.mps/libraries.xml
@@ -7,15 +7,15 @@
           <value>
             <Library>
               <option name="name" value="mbeddr.plattform" />
-              <option name="path" value="${iets3.github.opensource.home}/build/dependencies/com.mbeddr.platform" />
-            </Library>
+              <option name='path' value='$PROJECT_DIR$/../../../build/dependencies/com.mbeddr.platform' />            
+   			</Library>
           </value>
         </entry>
-        <entry key="org.mpsqa.allInOne">
+        <entry key='org.mpsqa.allInOne'>
           <value>
             <Library>
-              <option name="name" value="org.mpsqa.allInOne" />
-              <option name="path" value="${iets3.github.opensource.home}/build/dependencies/org.mpsqa.allInOne" />
+              <option name='name' value='org.mpsqa.allInOne' />
+              <option name='path' value='$PROJECT_DIR$/../../../build/dependencies/org.mpsqa.allInOne' />
             </Library>
           </value>
         </entry>
diff --git a/code/languages/org.iets3.opensource/.mps/modules.xml b/code/languages/org.iets3.opensource/.mps/modules.xml
index 6847a8929d..c173d17b25 100644
--- a/code/languages/org.iets3.opensource/.mps/modules.xml
+++ b/code/languages/org.iets3.opensource/.mps/modules.xml
@@ -142,7 +142,6 @@
       <modulePath path="$PROJECT_DIR$/solutions/playground/playground.msd" folder="expr.tests" />
       <modulePath path="$PROJECT_DIR$/solutions/test.ex.core.expr.genjava/test.ex.core.expr.genjava.msd" folder="expr.genjava" />
       <modulePath path="$PROJECT_DIR$/solutions/test.iets3.core.assessment/test.iets3.core.tracequery.msd" folder="trace" />
-      <modulePath path="$PROJECT_DIR$/solutions/test.nixHandlers.expr.os/test.nixHandlers.expr.os.msd" folder="expr.tests" />
       <modulePath path="$PROJECT_DIR$/solutions/test.org.iets3.core.comments/test.org.iets3.core.comments.msd" folder="core" />
       <modulePath path="$PROJECT_DIR$/solutions/test.ts.components.core/test.ts.components.core.msd" folder="comp" />
       <modulePath path="$PROJECT_DIR$/tests/test.in.expr.os/test.in.expr.os.msd" folder="expr.tests" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
index 799a1c4e89..903a9a764e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
@@ -101,7 +101,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
@@ -178,7 +178,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -244,7 +244,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -273,7 +273,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -460,7 +460,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -14105,16 +14105,12 @@
     </node>
     <node concept="3Tm1VV" id="2O$zpZk7gkh" role="1B3o_S" />
   </node>
-  <node concept="3HP615" id="34s7_UnUH2A">
+  <node concept="vrV6u" id="3HxoqR_T8F2">
+    <property role="TrG5h" value="typesystemCustomization" />
     <property role="3GE5qa" value="typesystem" />
-    <property role="TrG5h" value="TypesystemCustomizer" />
-    <node concept="3clFb_" id="34s7_UnUH4e" role="jymVt">
-      <property role="TrG5h" value="checkDuplicateValuesInEnums" />
-      <node concept="10P_77" id="34s7_UnUH4f" role="3clF45" />
-      <node concept="3Tm1VV" id="34s7_UnUH4g" role="1B3o_S" />
-      <node concept="3clFbS" id="34s7_UnUH4h" role="3clF47" />
+    <node concept="3uibUv" id="3HxoqR_WS1J" role="luc8K">
+      <ref role="3uigEE" node="34s7_UnUH2A" resolve="TypesystemCustomizer" />
     </node>
-    <node concept="3Tm1VV" id="34s7_UnUH2B" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="34s7_UnROPW">
     <property role="3GE5qa" value="typesystem" />
@@ -14168,12 +14164,16 @@
       <ref role="3uigEE" node="34s7_UnUH2A" resolve="TypesystemCustomizer" />
     </node>
   </node>
-  <node concept="vrV6u" id="3HxoqR_T8F2">
-    <property role="TrG5h" value="typesystemCustomization" />
+  <node concept="3HP615" id="34s7_UnUH2A">
     <property role="3GE5qa" value="typesystem" />
-    <node concept="3uibUv" id="3HxoqR_WS1J" role="luc8K">
-      <ref role="3uigEE" node="34s7_UnUH2A" resolve="TypesystemCustomizer" />
+    <property role="TrG5h" value="TypesystemCustomizer" />
+    <node concept="3clFb_" id="34s7_UnUH4e" role="jymVt">
+      <property role="TrG5h" value="checkDuplicateValuesInEnums" />
+      <node concept="10P_77" id="34s7_UnUH4f" role="3clF45" />
+      <node concept="3Tm1VV" id="34s7_UnUH4g" role="1B3o_S" />
+      <node concept="3clFbS" id="34s7_UnUH4h" role="3clF47" />
     </node>
+    <node concept="3Tm1VV" id="34s7_UnUH2B" role="1B3o_S" />
   </node>
   <node concept="1lYeZD" id="x6l$aoyUxg">
     <property role="TrG5h" value="DefaultIdentifierConfiguratorExtension" />
@@ -14406,39 +14406,5 @@
     <node concept="2tJIrI" id="1_yOWEXeo3y" role="jymVt" />
     <node concept="3Tm1VV" id="3OrGkZCn9ZR" role="1B3o_S" />
   </node>
-  <node concept="1lYeZD" id="6UwMN4NTt5T">
-    <property role="3GE5qa" value="primitiveTypes" />
-    <property role="TrG5h" value="DefaultNixHandlerExtension" />
-    <ref role="1lYe$Y" node="26cjRACVLVs" resolve="nixHandler" />
-    <node concept="3Tm1VV" id="6UwMN4NTt5U" role="1B3o_S" />
-    <node concept="2tJIrI" id="6UwMN4NTt5V" role="jymVt" />
-    <node concept="3tTeZs" id="6UwMN4NTt5W" role="jymVt">
-      <property role="3tTeZt" value="activate" />
-      <ref role="3tTeZr" to="90d:3zLwYDe0CPy" resolve="activate" />
-    </node>
-    <node concept="3tTeZs" id="6UwMN4NTt5X" role="jymVt">
-      <property role="3tTeZt" value="deactivate" />
-      <ref role="3tTeZr" to="90d:3zLwYDe0BDO" resolve="deactivate" />
-    </node>
-    <node concept="2tJIrI" id="6UwMN4NTt5Y" role="jymVt" />
-    <node concept="q3mfD" id="6UwMN4NTt5Z" role="jymVt">
-      <property role="TrG5h" value="get" />
-      <ref role="2VtyIY" to="90d:3zLwYDe0svr" resolve="get" />
-      <node concept="3Tm1VV" id="6UwMN4NTt61" role="1B3o_S" />
-      <node concept="3clFbS" id="6UwMN4NTt63" role="3clF47">
-        <node concept="3cpWs6" id="6UwMN4NTwWM" role="3cqZAp">
-          <node concept="2ShNRf" id="6UwMN4NTwZb" role="3cqZAk">
-            <node concept="HV5vD" id="6UwMN4NTUCx" role="2ShVmc">
-              <ref role="HV5vE" node="26cjRACVR5c" resolve="DefaultNixHandler" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="q3mfm" id="6UwMN4NTt64" role="3clF45">
-        <ref role="q3mfh" to="90d:3zLwYDe0sv$" />
-        <ref role="1QQUv3" node="6UwMN4NTt5Z" resolve="get" />
-      </node>
-    </node>
-  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.behavior.mps
index 2588fc3327..e623174ee6 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.behavior.mps
@@ -124,7 +124,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -192,7 +192,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ">
@@ -274,7 +274,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -308,7 +308,7 @@
       <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
         <child id="1184953288404" name="expression" index="3$I4v7" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -406,7 +406,7 @@
       </concept>
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ngI" index="2c44t0">
+      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ng" index="2c44t0">
         <child id="1196350785111" name="expression" index="2c44t1" />
       </concept>
       <concept id="1196350785112" name="jetbrains.mps.lang.quotation.structure.Antiquotation" flags="ng" index="2c44te" />
@@ -575,7 +575,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
@@ -1874,6 +1874,19 @@
       <node concept="3clFbS" id="2hbaSyAVW8v" role="3clF47">
         <node concept="3clFbF" id="2hbaSyAVWQK" role="3cqZAp">
           <node concept="22lmx$" id="1eut2uSUzlG" role="3clFbG">
+            <node concept="2OqwBi" id="1eut2uSUzB5" role="3uHU7w">
+              <node concept="2OqwBi" id="1eut2uSUzB6" role="2Oq$k0">
+                <node concept="13iPFW" id="1eut2uSUzB7" role="2Oq$k0" />
+                <node concept="3TrcHB" id="1eut2uSUzB8" role="2OqNvi">
+                  <ref role="3TsBF5" to="i3ya:2hbaSyABN4s" resolve="scaling" />
+                </node>
+              </node>
+              <node concept="21noJN" id="1eut2uSUzB9" role="2OqNvi">
+                <node concept="21nZrQ" id="1eut2uSUzBa" role="21noJM">
+                  <ref role="21nZrZ" to="i3ya:6DczoUSGcZl" resolve="binary_memory" />
+                </node>
+              </node>
+            </node>
             <node concept="22lmx$" id="2hbaSyAVY1S" role="3uHU7B">
               <node concept="2OqwBi" id="2hbaSyAVXpv" role="3uHU7B">
                 <node concept="2OqwBi" id="2hbaSyAVXeP" role="2Oq$k0">
@@ -1902,19 +1915,6 @@
                 </node>
               </node>
             </node>
-            <node concept="2OqwBi" id="1eut2uSUzB5" role="3uHU7w">
-              <node concept="2OqwBi" id="1eut2uSUzB6" role="2Oq$k0">
-                <node concept="13iPFW" id="1eut2uSUzB7" role="2Oq$k0" />
-                <node concept="3TrcHB" id="1eut2uSUzB8" role="2OqNvi">
-                  <ref role="3TsBF5" to="i3ya:2hbaSyABN4s" resolve="scaling" />
-                </node>
-              </node>
-              <node concept="21noJN" id="1eut2uSUzB9" role="2OqNvi">
-                <node concept="21nZrQ" id="1eut2uSUzBa" role="21noJM">
-                  <ref role="21nZrZ" to="i3ya:6DczoUSGcZl" resolve="binary_memory" />
-                </node>
-              </node>
-            </node>
           </node>
         </node>
       </node>
@@ -20676,6 +20676,16 @@
               </node>
             </node>
           </node>
+          <node concept="9aQIb" id="5nqK_jUahoq" role="9aQIa">
+            <node concept="3clFbS" id="5nqK_jUahor" role="9aQI4">
+              <node concept="3cpWs6" id="FMy9me2vpp" role="3cqZAp">
+                <node concept="2YIFZM" id="FMy9me2vpq" role="3cqZAk">
+                  <ref role="37wK5l" node="6RONOaUhCcE" resolve="getInstance" />
+                  <ref role="1Pybhc" node="6RONOaUhCcy" resolve="BinaryMemoryPrefixManager" />
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="3eNFk2" id="FMy9me2us6" role="3eNLev">
             <node concept="3clFbS" id="FMy9me2us8" role="3eOfB_">
               <node concept="3cpWs6" id="5nqK_jUahtu" role="3cqZAp">
@@ -20696,16 +20706,6 @@
               </node>
             </node>
           </node>
-          <node concept="9aQIb" id="5nqK_jUahoq" role="9aQIa">
-            <node concept="3clFbS" id="5nqK_jUahor" role="9aQI4">
-              <node concept="3cpWs6" id="FMy9me2vpp" role="3cqZAp">
-                <node concept="2YIFZM" id="FMy9me2vpq" role="3cqZAk">
-                  <ref role="37wK5l" node="6RONOaUhCcE" resolve="getInstance" />
-                  <ref role="1Pybhc" node="6RONOaUhCcy" resolve="BinaryMemoryPrefixManager" />
-                </node>
-              </node>
-            </node>
-          </node>
         </node>
       </node>
       <node concept="3Tm1VV" id="5nqK_jUag0A" role="1B3o_S" />
@@ -21627,6 +21627,71 @@
       </node>
     </node>
   </node>
+  <node concept="2fD8I5" id="FMy9me2jvW">
+    <property role="3GE5qa" value="definition.unit.prefixes" />
+    <property role="TrG5h" value="BinaryMemoryUnitPrefix" />
+    <node concept="3Tm1VV" id="FMy9me2jvX" role="1B3o_S" />
+    <node concept="3clFb_" id="FMy9me2jvY" role="3MN40a">
+      <property role="TrG5h" value="toString" />
+      <node concept="17QB3L" id="FMy9me2jvZ" role="3clF45" />
+      <node concept="3Tm1VV" id="FMy9me2jw0" role="1B3o_S" />
+      <node concept="3clFbS" id="FMy9me2jw1" role="3clF47">
+        <node concept="3clFbF" id="FMy9me2jw2" role="3cqZAp">
+          <node concept="3cpWs3" id="FMy9me2jw3" role="3clFbG">
+            <node concept="Xl_RD" id="FMy9me2jw4" role="3uHU7w">
+              <property role="Xl_RC" value=")" />
+            </node>
+            <node concept="3cpWs3" id="FMy9me2jw5" role="3uHU7B">
+              <node concept="3cpWs3" id="FMy9me2jw6" role="3uHU7B">
+                <node concept="3cpWs3" id="FMy9me2jw7" role="3uHU7B">
+                  <node concept="3cpWs3" id="FMy9me2jw8" role="3uHU7B">
+                    <node concept="2OqwBi" id="FMy9me2jw9" role="3uHU7B">
+                      <node concept="Xjq3P" id="FMy9me2jwa" role="2Oq$k0" />
+                      <node concept="2sxana" id="FMy9me2jwb" role="2OqNvi">
+                        <ref role="2sxfKC" node="2hbaSyB0ITt" resolve="name" />
+                      </node>
+                    </node>
+                    <node concept="Xl_RD" id="FMy9me2jwc" role="3uHU7w">
+                      <property role="Xl_RC" value=" (" />
+                    </node>
+                  </node>
+                  <node concept="2YIFZM" id="FMy9me2jwd" role="3uHU7w">
+                    <ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
+                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                    <node concept="2OqwBi" id="FMy9me2jwe" role="37wK5m">
+                      <node concept="2YIFZM" id="FMy9me2jwf" role="2Oq$k0">
+                        <ref role="37wK5l" node="6RONOaUhCcE" resolve="getInstance" />
+                        <ref role="1Pybhc" node="6RONOaUhCcy" resolve="BinaryMemoryPrefixManager" />
+                      </node>
+                      <node concept="liA8E" id="FMy9me2jwg" role="2OqNvi">
+                        <ref role="37wK5l" node="6RONOaUhCcZ" resolve="getBase" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Xl_RD" id="FMy9me2jwh" role="3uHU7w">
+                  <property role="Xl_RC" value="^" />
+                </node>
+              </node>
+              <node concept="2YIFZM" id="FMy9me2jwi" role="3uHU7w">
+                <ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
+                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                <node concept="2OqwBi" id="FMy9me2jwj" role="37wK5m">
+                  <node concept="Xjq3P" id="FMy9me2jwk" role="2Oq$k0" />
+                  <node concept="2sxana" id="FMy9me2jwl" role="2OqNvi">
+                    <ref role="2sxfKC" node="2hbaSyB0ITv" resolve="factor" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2pR195" id="FMy9me2jwm" role="2d5$Xr">
+      <ref role="3uigEE" node="2hbaSyB0HRN" resolve="AbstractUnitPrefix" />
+    </node>
+  </node>
   <node concept="312cEu" id="FMy9me20la">
     <property role="3GE5qa" value="definition.unit.prefixes" />
     <property role="TrG5h" value="BinaryIECUnitPrefixManager" />
@@ -21934,70 +21999,5 @@
       </node>
     </node>
   </node>
-  <node concept="2fD8I5" id="FMy9me2jvW">
-    <property role="3GE5qa" value="definition.unit.prefixes" />
-    <property role="TrG5h" value="BinaryMemoryUnitPrefix" />
-    <node concept="3Tm1VV" id="FMy9me2jvX" role="1B3o_S" />
-    <node concept="3clFb_" id="FMy9me2jvY" role="3MN40a">
-      <property role="TrG5h" value="toString" />
-      <node concept="17QB3L" id="FMy9me2jvZ" role="3clF45" />
-      <node concept="3Tm1VV" id="FMy9me2jw0" role="1B3o_S" />
-      <node concept="3clFbS" id="FMy9me2jw1" role="3clF47">
-        <node concept="3clFbF" id="FMy9me2jw2" role="3cqZAp">
-          <node concept="3cpWs3" id="FMy9me2jw3" role="3clFbG">
-            <node concept="Xl_RD" id="FMy9me2jw4" role="3uHU7w">
-              <property role="Xl_RC" value=")" />
-            </node>
-            <node concept="3cpWs3" id="FMy9me2jw5" role="3uHU7B">
-              <node concept="3cpWs3" id="FMy9me2jw6" role="3uHU7B">
-                <node concept="3cpWs3" id="FMy9me2jw7" role="3uHU7B">
-                  <node concept="3cpWs3" id="FMy9me2jw8" role="3uHU7B">
-                    <node concept="2OqwBi" id="FMy9me2jw9" role="3uHU7B">
-                      <node concept="Xjq3P" id="FMy9me2jwa" role="2Oq$k0" />
-                      <node concept="2sxana" id="FMy9me2jwb" role="2OqNvi">
-                        <ref role="2sxfKC" node="2hbaSyB0ITt" resolve="name" />
-                      </node>
-                    </node>
-                    <node concept="Xl_RD" id="FMy9me2jwc" role="3uHU7w">
-                      <property role="Xl_RC" value=" (" />
-                    </node>
-                  </node>
-                  <node concept="2YIFZM" id="FMy9me2jwd" role="3uHU7w">
-                    <ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
-                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                    <node concept="2OqwBi" id="FMy9me2jwe" role="37wK5m">
-                      <node concept="2YIFZM" id="FMy9me2jwf" role="2Oq$k0">
-                        <ref role="37wK5l" node="6RONOaUhCcE" resolve="getInstance" />
-                        <ref role="1Pybhc" node="6RONOaUhCcy" resolve="BinaryMemoryPrefixManager" />
-                      </node>
-                      <node concept="liA8E" id="FMy9me2jwg" role="2OqNvi">
-                        <ref role="37wK5l" node="6RONOaUhCcZ" resolve="getBase" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="Xl_RD" id="FMy9me2jwh" role="3uHU7w">
-                  <property role="Xl_RC" value="^" />
-                </node>
-              </node>
-              <node concept="2YIFZM" id="FMy9me2jwi" role="3uHU7w">
-                <ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
-                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                <node concept="2OqwBi" id="FMy9me2jwj" role="37wK5m">
-                  <node concept="Xjq3P" id="FMy9me2jwk" role="2Oq$k0" />
-                  <node concept="2sxana" id="FMy9me2jwl" role="2OqNvi">
-                    <ref role="2sxfKC" node="2hbaSyB0ITv" resolve="factor" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2pR195" id="FMy9me2jwm" role="2d5$Xr">
-      <ref role="3uigEE" node="2hbaSyB0HRN" resolve="AbstractUnitPrefix" />
-    </node>
-  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.typesystem.mps
index 5ebe5620b7..d4aed15f32 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.typesystem.mps
@@ -69,7 +69,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -116,7 +116,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1092119917967" name="jetbrains.mps.baseLanguage.structure.MulExpression" flags="nn" index="17qRlL" />
@@ -180,7 +180,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -205,7 +205,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -530,7 +530,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
@@ -9545,12 +9545,12 @@
                       <property role="Xl_RC" value="This unit shadows the already defined unit " />
                     </node>
                     <node concept="2OqwBi" id="6b$yEOTmiRw" role="3uHU7w">
-                      <node concept="2qgKlT" id="6b$yEOTmiRy" role="2OqNvi">
-                        <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
-                      </node>
                       <node concept="37vLTw" id="6b$yEOTmiRx" role="2Oq$k0">
                         <ref role="3cqZAo" node="EsE2hyhvJ4" resolve="it" />
                       </node>
+                      <node concept="2qgKlT" id="6b$yEOTmiRy" role="2OqNvi">
+                        <ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
+                      </node>
                     </node>
                   </node>
                   <node concept="1YBJjd" id="6b$yEOTmiR$" role="1urrMF">
@@ -11038,6 +11038,44 @@
       <ref role="1YaFvo" to="i3ya:45a4DYZrLVu" resolve="QuantityExponentType" />
     </node>
   </node>
+  <node concept="Q5z_Y" id="3V2fk_c6GqN">
+    <property role="3GE5qa" value="definition.unit" />
+    <property role="TrG5h" value="fix_addAllowNameShadowingAnnotation" />
+    <node concept="Q6JDH" id="3V2fk_c6Gro" role="Q6Id_">
+      <property role="TrG5h" value="unit" />
+      <node concept="3Tqbb2" id="3V2fk_c6Gry" role="Q6QK4">
+        <ref role="ehGHo" to="i3ya:7eOyx9r3jsZ" resolve="Unit" />
+      </node>
+    </node>
+    <node concept="Q5ZZ6" id="3V2fk_c6GqO" role="Q6x$H">
+      <node concept="3clFbS" id="3V2fk_c6GqP" role="2VODD2">
+        <node concept="3clFbF" id="3V2fk_ca32d" role="3cqZAp">
+          <node concept="2OqwBi" id="3V2fk_ca4bB" role="3clFbG">
+            <node concept="2OqwBi" id="3V2fk_ca3oG" role="2Oq$k0">
+              <node concept="QwW4i" id="3V2fk_ca32c" role="2Oq$k0">
+                <ref role="QwW4h" node="3V2fk_c6Gro" resolve="unit" />
+              </node>
+              <node concept="3CFZ6_" id="3V2fk_ca3UP" role="2OqNvi">
+                <node concept="3CFYIy" id="3V2fk_ca3Zo" role="3CFYIz">
+                  <ref role="3CFYIx" to="i3ya:3V2fk_c6FtV" resolve="AllowNameShadowingAnnotation" />
+                </node>
+              </node>
+            </node>
+            <node concept="2DeJnY" id="3V2fk_ca4qM" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="QznSV" id="4iGVAJE9IwK" role="QzAvj">
+      <node concept="3clFbS" id="4iGVAJE9IwL" role="2VODD2">
+        <node concept="3clFbF" id="4iGVAJE9IB2" role="3cqZAp">
+          <node concept="Xl_RD" id="4iGVAJE9IB1" role="3clFbG">
+            <property role="Xl_RC" value="Allow Name Shadowing" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
   <node concept="1YbPZF" id="76ZhK6XYufT">
     <property role="TrG5h" value="typeof_TaggedExpression" />
     <node concept="3clFbS" id="76ZhK6XYufU" role="18ibNy">
@@ -11432,43 +11470,5 @@
       </node>
     </node>
   </node>
-  <node concept="Q5z_Y" id="3V2fk_c6GqN">
-    <property role="3GE5qa" value="definition.unit" />
-    <property role="TrG5h" value="fix_addAllowNameShadowingAnnotation" />
-    <node concept="Q6JDH" id="3V2fk_c6Gro" role="Q6Id_">
-      <property role="TrG5h" value="unit" />
-      <node concept="3Tqbb2" id="3V2fk_c6Gry" role="Q6QK4">
-        <ref role="ehGHo" to="i3ya:7eOyx9r3jsZ" resolve="Unit" />
-      </node>
-    </node>
-    <node concept="Q5ZZ6" id="3V2fk_c6GqO" role="Q6x$H">
-      <node concept="3clFbS" id="3V2fk_c6GqP" role="2VODD2">
-        <node concept="3clFbF" id="3V2fk_ca32d" role="3cqZAp">
-          <node concept="2OqwBi" id="3V2fk_ca4bB" role="3clFbG">
-            <node concept="2OqwBi" id="3V2fk_ca3oG" role="2Oq$k0">
-              <node concept="QwW4i" id="3V2fk_ca32c" role="2Oq$k0">
-                <ref role="QwW4h" node="3V2fk_c6Gro" resolve="unit" />
-              </node>
-              <node concept="3CFZ6_" id="3V2fk_ca3UP" role="2OqNvi">
-                <node concept="3CFYIy" id="3V2fk_ca3Zo" role="3CFYIz">
-                  <ref role="3CFYIx" to="i3ya:3V2fk_c6FtV" resolve="AllowNameShadowingAnnotation" />
-                </node>
-              </node>
-            </node>
-            <node concept="2DeJnY" id="3V2fk_ca4qM" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="QznSV" id="4iGVAJE9IwK" role="QzAvj">
-      <node concept="3clFbS" id="4iGVAJE9IwL" role="2VODD2">
-        <node concept="3clFbF" id="4iGVAJE9IB2" role="3cqZAp">
-          <node concept="Xl_RD" id="4iGVAJE9IB1" role="3clFbG">
-            <property role="Xl_RC" value="Allow Name Shadowing" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps
index f9e45b5cf4..d41e2949b8 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.runtime/models/runtime.mps
@@ -42,7 +42,7 @@
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
         <child id="1188214630783" name="value" index="2B76xF" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1188214545140" name="jetbrains.mps.baseLanguage.structure.AnnotationInstanceValue" flags="ng" index="2B6LJw">
@@ -161,7 +161,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -186,7 +186,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -239,19 +239,11 @@
       <concept id="5858074156537516430" name="jetbrains.mps.baseLanguage.javadoc.structure.ReturnBlockDocTag" flags="ng" index="x79VA">
         <property id="5858074156537516431" name="text" index="x79VB" />
       </concept>
-      <concept id="6832197706140518104" name="jetbrains.mps.baseLanguage.javadoc.structure.DocMethodParameterReference" flags="ng" index="zr_55" />
-      <concept id="6832197706140518103" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseParameterReference" flags="ng" index="zr_5a">
-        <reference id="6832197706140518108" name="param" index="zr_51" />
-      </concept>
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
         <child id="8465538089690331502" name="body" index="TZ5H$" />
         <child id="5383422241790532083" name="tags" index="3nqlJM" />
       </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690881930" name="jetbrains.mps.baseLanguage.javadoc.structure.ParameterBlockDocTag" flags="ng" index="TUZQ0">
-        <property id="8465538089690881934" name="text" index="TUZQ4" />
-        <child id="6832197706140518123" name="parameter" index="zr_5Q" />
-      </concept>
       <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
         <child id="8970989240999019149" name="part" index="1dT_Ay" />
       </concept>
@@ -284,7 +276,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -1634,6 +1626,7 @@
       <node concept="3Tm1VV" id="3NUSEp5yd90" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="6fmG8CYTYFr" role="jymVt" />
+    <node concept="3Tm1VV" id="6fmG8CYTWg2" role="1B3o_S" />
     <node concept="2YIFZL" id="2TlZyI4PJU1" role="jymVt">
       <property role="TrG5h" value="reset" />
       <node concept="3clFbS" id="2TlZyI4PJU4" role="3clF47">
@@ -1676,7 +1669,6 @@
         </node>
       </node>
     </node>
-    <node concept="3Tm1VV" id="6fmG8CYTWg2" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="3nVyItrYWd7">
     <property role="3GE5qa" value="nix" />
@@ -3388,29 +3380,11 @@
                   </node>
                 </node>
               </node>
-              <node concept="22lmx$" id="3NMMaaIDNfU" role="3clFbw">
-                <node concept="3eOVzh" id="3NMMaaIDP5R" role="3uHU7w">
-                  <node concept="3cmrfG" id="3NMMaaIDPaX" role="3uHU7w">
-                    <property role="3cmrfH" value="0" />
-                  </node>
-                  <node concept="2OqwBi" id="3NMMaaIDNZN" role="3uHU7B">
-                    <node concept="2OqwBi" id="3NMMaaIDNIF" role="2Oq$k0">
-                      <node concept="37vLTw" id="3NMMaaIDNtG" role="2Oq$k0">
-                        <ref role="3cqZAo" node="26cjRACVUHy" resolve="handlers" />
-                      </node>
-                      <node concept="1uHKPH" id="3NMMaaIDNQh" role="2OqNvi" />
-                    </node>
-                    <node concept="liA8E" id="3NMMaaIDOl$" role="2OqNvi">
-                      <ref role="37wK5l" to="oq0c:26cjRACVPUy" resolve="getPriorityLevel" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="26cjRACW2hY" role="3uHU7B">
-                  <node concept="37vLTw" id="26cjRACW24i" role="2Oq$k0">
-                    <ref role="3cqZAo" node="26cjRACVUHy" resolve="handlers" />
-                  </node>
-                  <node concept="1v1jN8" id="26cjRACW2EZ" role="2OqNvi" />
+              <node concept="2OqwBi" id="26cjRACW2hY" role="3clFbw">
+                <node concept="37vLTw" id="26cjRACW24i" role="2Oq$k0">
+                  <ref role="3cqZAo" node="26cjRACVUHy" resolve="handlers" />
                 </node>
+                <node concept="1v1jN8" id="26cjRACW2EZ" role="2OqNvi" />
               </node>
             </node>
           </node>
@@ -3432,91 +3406,6 @@
       </node>
       <node concept="3Tm1VV" id="26cjRACVUI8" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="31HAhmC_A0A" role="jymVt" />
-    <node concept="2YIFZL" id="3NMMaaIJODH" role="jymVt">
-      <property role="TrG5h" value="prioritizeTemporarily" />
-      <node concept="3clFbS" id="3NMMaaIJODJ" role="3clF47">
-        <node concept="3clFbF" id="3NMMaaIJODK" role="3cqZAp">
-          <node concept="37vLTI" id="3NMMaaIJODL" role="3clFbG">
-            <node concept="37vLTw" id="3NMMaaIJODM" role="37vLTx">
-              <ref role="3cqZAo" node="3NMMaaIJODQ" resolve="tmpHandler" />
-            </node>
-            <node concept="37vLTw" id="3NMMaaIJODN" role="37vLTJ">
-              <ref role="3cqZAo" node="26cjRACVUHk" resolve="handler" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="3NMMaaIJODP" role="3clF45" />
-      <node concept="37vLTG" id="3NMMaaIJODQ" role="3clF46">
-        <property role="TrG5h" value="tmpHandler" />
-        <node concept="3uibUv" id="3NMMaaIJODR" role="1tU5fm">
-          <ref role="3uigEE" to="oq0c:26cjRACVMdy" resolve="NixHandler" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="3NMMaaIJODO" role="1B3o_S" />
-      <node concept="P$JXv" id="1Y9gOWawczj" role="lGtFl">
-        <node concept="TZ5HA" id="1Y9gOWawczk" role="TZ5H$">
-          <node concept="1dT_AC" id="1Y9gOWawczl" role="1dT_Ay">
-            <property role="1dT_AB" value="This function should be used for testing purposes only. " />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="1Y9gOWawc_b" role="TZ5H$">
-          <node concept="1dT_AC" id="1Y9gOWawc_c" role="1dT_Ay">
-            <property role="1dT_AB" value="It is used to programmatically ret the NixHandler in the test NixHandlerShortCircuit." />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="1Y9gOWawcBa" role="TZ5H$">
-          <node concept="1dT_AC" id="1Y9gOWawcBb" role="1dT_Ay">
-            <property role="1dT_AB" value="Do not rely on this functionality in production code outside functionality tests." />
-          </node>
-        </node>
-        <node concept="TUZQ0" id="1Y9gOWawczm" role="3nqlJM">
-          <property role="TUZQ4" value="The handler to use temporarily, defined in the test solution." />
-          <node concept="zr_55" id="1Y9gOWawczo" role="zr_5Q">
-            <ref role="zr_51" node="3NMMaaIJODQ" resolve="tmpHandler" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3NMMaaIJGl6" role="jymVt" />
-    <node concept="2YIFZL" id="31HAhmC_A$8" role="jymVt">
-      <property role="TrG5h" value="reset" />
-      <node concept="3clFbS" id="31HAhmC_A$b" role="3clF47">
-        <node concept="3clFbF" id="31HAhmC_AAd" role="3cqZAp">
-          <node concept="37vLTI" id="31HAhmC_B67" role="3clFbG">
-            <node concept="10Nm6u" id="31HAhmC_B7x" role="37vLTx" />
-            <node concept="37vLTw" id="31HAhmC_Bfz" role="37vLTJ">
-              <ref role="3cqZAo" node="26cjRACVUHk" resolve="handler" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="31HAhmC_Cp1" role="3cqZAp">
-          <node concept="1rXfSq" id="31HAhmC_CoZ" role="3clFbG">
-            <ref role="37wK5l" node="26cjRACVUHp" resolve="resolveMapper" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="31HAhmC_Axr" role="1B3o_S" />
-      <node concept="3cqZAl" id="31HAhmC_AzD" role="3clF45" />
-      <node concept="P$JXv" id="1Y9gOWawcCP" role="lGtFl">
-        <node concept="TZ5HA" id="1Y9gOWawcDP" role="TZ5H$">
-          <node concept="1dT_AC" id="1Y9gOWawcDQ" role="1dT_Ay">
-            <property role="1dT_AB" value="This function should be used for testing purposes only. " />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="1Y9gOWawcDR" role="TZ5H$">
-          <node concept="1dT_AC" id="1Y9gOWawcDS" role="1dT_Ay">
-            <property role="1dT_AB" value="It is used to programmatically reset the NixHandler in the test NixHandlerShortCircuit." />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="1Y9gOWawcDT" role="TZ5H$">
-          <node concept="1dT_AC" id="1Y9gOWawcDU" role="1dT_Ay">
-            <property role="1dT_AB" value="Do not rely on this functionality in production code outside functionality tests." />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="26cjRACVUI9" role="jymVt" />
     <node concept="3Tm1VV" id="26cjRACVUN4" role="1B3o_S" />
   </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/models/plugin.mps
index 454c458690..3b46f4367f 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/models/plugin.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/models/plugin.mps
@@ -133,7 +133,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -234,9 +234,7 @@
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
-        <reference id="1138405853777" name="concept" index="ehGHo" />
-      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
         <reference id="1138056395725" name="property" index="3TsBF5" />
       </concept>
@@ -248,7 +246,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -2306,68 +2304,6 @@
       <node concept="3dA_Gj" id="26cjRACQHvl" role="3vQZUl">
         <node concept="9aQIb" id="26cjRACQHvm" role="3vcmbn">
           <node concept="3clFbS" id="26cjRACQHvn" role="9aQI4">
-            <node concept="3SKdUt" id="4UZwKZmdd7a" role="3cqZAp">
-              <node concept="1PaTwC" id="4UZwKZmdd7b" role="1aUNEU">
-                <node concept="3oM_SD" id="4UZwKZmddex" role="1PaTwD">
-                  <property role="3oM_SC" value="We" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmddez" role="1PaTwD">
-                  <property role="3oM_SC" value="want" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmddeA" role="1PaTwD">
-                  <property role="3oM_SC" value="to" />
-                </node>
-                <node concept="3oM_SD" id="3NMMaaIDxW1" role="1PaTwD">
-                  <property role="3oM_SC" value="support" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmddeE" role="1PaTwD">
-                  <property role="3oM_SC" value="short-circuit" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmddeJ" role="1PaTwD">
-                  <property role="3oM_SC" value="evaluation" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmddeP" role="1PaTwD">
-                  <property role="3oM_SC" value="of" />
-                </node>
-                <node concept="3oM_SD" id="3NMMaaIDxWm" role="1PaTwD">
-                  <property role="3oM_SC" value="logical" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmddf4" role="1PaTwD">
-                  <property role="3oM_SC" value="operations" />
-                </node>
-              </node>
-            </node>
-            <node concept="3SKdUt" id="4UZwKZmddn0" role="3cqZAp">
-              <node concept="1PaTwC" id="4UZwKZmddn1" role="1aUNEU">
-                <node concept="3oM_SD" id="4UZwKZmddqs" role="1PaTwD">
-                  <property role="3oM_SC" value="Therefore" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmddqu" role="1PaTwD">
-                  <property role="3oM_SC" value="we" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmddqx" role="1PaTwD">
-                  <property role="3oM_SC" value="start" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmddq_" role="1PaTwD">
-                  <property role="3oM_SC" value="by" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmddqE" role="1PaTwD">
-                  <property role="3oM_SC" value="evaluating" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmddqK" role="1PaTwD">
-                  <property role="3oM_SC" value="only" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmddqR" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmddqZ" role="1PaTwD">
-                  <property role="3oM_SC" value="left-hand" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmddr8" role="1PaTwD">
-                  <property role="3oM_SC" value="side" />
-                </node>
-              </node>
-            </node>
             <node concept="3cpWs8" id="4EEJFuvbYxq" role="3cqZAp">
               <node concept="3cpWsn" id="4EEJFuvbYxr" role="3cpWs9">
                 <property role="TrG5h" value="left" />
@@ -2384,482 +2320,197 @@
                 </node>
               </node>
             </node>
-            <node concept="3SKdUt" id="4UZwKZmdhaV" role="3cqZAp">
-              <node concept="1PaTwC" id="4UZwKZmdhaW" role="1aUNEU">
-                <node concept="3oM_SD" id="4UZwKZmdhfI" role="1PaTwD">
-                  <property role="3oM_SC" value="Define" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhfK" role="1PaTwD">
-                  <property role="3oM_SC" value="a" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhfN" role="1PaTwD">
-                  <property role="3oM_SC" value="NixSupport" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhfR" role="1PaTwD">
-                  <property role="3oM_SC" value="calculator" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhfW" role="1PaTwD">
-                  <property role="3oM_SC" value="that" />
-                </node>
-                <node concept="3oM_SD" id="3NMMaaIDxX2" role="1PaTwD">
-                  <property role="3oM_SC" value="may" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhg2" role="1PaTwD">
-                  <property role="3oM_SC" value="short-circuit" />
-                </node>
-              </node>
-            </node>
-            <node concept="3SKdUt" id="4UZwKZmdhqw" role="3cqZAp">
-              <node concept="1PaTwC" id="4UZwKZmdhqx" role="1aUNEU">
-                <node concept="3oM_SD" id="4UZwKZmdhvI" role="1PaTwD">
-                  <property role="3oM_SC" value="The" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhvK" role="1PaTwD">
-                  <property role="3oM_SC" value="evaluator" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhvN" role="1PaTwD">
-                  <property role="3oM_SC" value="relies" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhvR" role="1PaTwD">
-                  <property role="3oM_SC" value="on" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhvW" role="1PaTwD">
-                  <property role="3oM_SC" value="us" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhw2" role="1PaTwD">
-                  <property role="3oM_SC" value="storing" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhw9" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhwh" role="1PaTwD">
-                  <property role="3oM_SC" value="evaluation" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhwq" role="1PaTwD">
-                  <property role="3oM_SC" value="result" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhw$" role="1PaTwD">
-                  <property role="3oM_SC" value="for" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhwJ" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhwV" role="1PaTwD">
-                  <property role="3oM_SC" value="left-hand" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhx8" role="1PaTwD">
-                  <property role="3oM_SC" value="side" />
-                </node>
-              </node>
-            </node>
-            <node concept="3SKdUt" id="4UZwKZmdhzZ" role="3cqZAp">
-              <node concept="1PaTwC" id="4UZwKZmdh$0" role="1aUNEU">
-                <node concept="3oM_SD" id="4UZwKZmdhIH" role="1PaTwD">
-                  <property role="3oM_SC" value="and" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhIJ" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhIM" role="1PaTwD">
-                  <property role="3oM_SC" value="full" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhIQ" role="1PaTwD">
-                  <property role="3oM_SC" value="unevaluated" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhIV" role="1PaTwD">
-                  <property role="3oM_SC" value="node" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhJ1" role="1PaTwD">
-                  <property role="3oM_SC" value="for" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhJ8" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhJg" role="1PaTwD">
-                  <property role="3oM_SC" value="right-hand" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhJp" role="1PaTwD">
-                  <property role="3oM_SC" value="side" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhJz" role="1PaTwD">
-                  <property role="3oM_SC" value="in" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhJI" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhKl" role="1PaTwD">
-                  <property role="3oM_SC" value="NixSupport" />
-                </node>
-                <node concept="3oM_SD" id="4UZwKZmdhKy" role="1PaTwD">
-                  <property role="3oM_SC" value="object" />
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="4UZwKZmdgE6" role="3cqZAp">
-              <node concept="3cpWsn" id="4UZwKZmdgE9" role="3cpWs9">
+            <node concept="3cpWs8" id="2pRaEpcR5l$" role="3cqZAp">
+              <node concept="3cpWsn" id="2pRaEpcR5l_" role="3cpWs9">
                 <property role="TrG5h" value="andCalculator" />
-                <node concept="1bVj0M" id="4UZwKZmdgSQ" role="33vP2m">
-                  <node concept="3clFbS" id="4UZwKZmdgSS" role="1bW5cS">
-                    <node concept="3SKdUt" id="4UZwKZmdjq4" role="3cqZAp">
-                      <node concept="1PaTwC" id="4UZwKZmdjq5" role="1aUNEU">
-                        <node concept="3oM_SD" id="4UZwKZmdjrC" role="1PaTwD">
-                          <property role="3oM_SC" value="Short-circuiting" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdjx3" role="1PaTwD">
-                          <property role="3oM_SC" value="has" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdjzN" role="1PaTwD">
-                          <property role="3oM_SC" value="already" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdj_d" role="1PaTwD">
-                          <property role="3oM_SC" value="happened" />
-                        </node>
-                        <node concept="3oM_SD" id="3NMMaaIDxXa" role="1PaTwD">
-                          <property role="3oM_SC" value="if" />
-                        </node>
-                        <node concept="3oM_SD" id="3NMMaaIDy8p" role="1PaTwD">
-                          <property role="3oM_SC" value="we" />
-                        </node>
-                        <node concept="3oM_SD" id="3NMMaaIDy8w" role="1PaTwD">
-                          <property role="3oM_SC" value="enter" />
-                        </node>
-                        <node concept="3oM_SD" id="3NMMaaIDy8C" role="1PaTwD">
-                          <property role="3oM_SC" value="this" />
-                        </node>
-                        <node concept="3oM_SD" id="3NMMaaIDy8L" role="1PaTwD">
-                          <property role="3oM_SC" value="closure" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3SKdUt" id="4UZwKZmdjDA" role="3cqZAp">
-                      <node concept="1PaTwC" id="4UZwKZmdjDB" role="1aUNEU">
-                        <node concept="3oM_SD" id="4UZwKZmdjGB" role="1PaTwD">
-                          <property role="3oM_SC" value="If" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdjHZ" role="1PaTwD">
-                          <property role="3oM_SC" value="this" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdjJo" role="1PaTwD">
-                          <property role="3oM_SC" value="calculator" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdjM9" role="1PaTwD">
-                          <property role="3oM_SC" value="runs," />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdjNz" role="1PaTwD">
-                          <property role="3oM_SC" value="the" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdjND" role="1PaTwD">
-                          <property role="3oM_SC" value="process" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdjNK" role="1PaTwD">
-                          <property role="3oM_SC" value="function" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdjPe" role="1PaTwD">
-                          <property role="3oM_SC" value="of" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdjPn" role="1PaTwD">
-                          <property role="3oM_SC" value="an" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdjQR" role="1PaTwD">
-                          <property role="3oM_SC" value="NixHandler" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdjV5" role="1PaTwD">
-                          <property role="3oM_SC" value="from" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdjVh" role="1PaTwD">
-                          <property role="3oM_SC" value="the" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdjVu" role="1PaTwD">
-                          <property role="3oM_SC" value="extension" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdjVG" role="1PaTwD">
-                          <property role="3oM_SC" value="point" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdjYB" role="1PaTwD">
-                          <property role="3oM_SC" value="has" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdk1z" role="1PaTwD">
-                          <property role="3oM_SC" value="not" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdkdN" role="1PaTwD">
-                          <property role="3oM_SC" value="changed" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdkgC" role="1PaTwD">
-                          <property role="3oM_SC" value="the" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdkjC" role="1PaTwD">
-                          <property role="3oM_SC" value="result" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdkjW" role="1PaTwD">
-                          <property role="3oM_SC" value="--&gt;" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdkmX" role="1PaTwD">
-                          <property role="3oM_SC" value="We" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdkoD" role="1PaTwD">
-                          <property role="3oM_SC" value="do" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdkp0" role="1PaTwD">
-                          <property role="3oM_SC" value="a" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdkpo" role="1PaTwD">
-                          <property role="3oM_SC" value="full" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdkpL" role="1PaTwD">
-                          <property role="3oM_SC" value="evaluation" />
-                        </node>
-                      </node>
+                <node concept="1ajhzC" id="2pRaEpcR5lx" role="1tU5fm">
+                  <node concept="3uibUv" id="2pRaEpcR5ly" role="1ajw0F">
+                    <ref role="3uigEE" to="xfg9:3nVyItrYOkv" resolve="NixSupport" />
+                  </node>
+                  <node concept="10P_77" id="2pRaEpcR5lz" role="1ajl9A" />
+                </node>
+                <node concept="1bVj0M" id="2pRaEpcR5lA" role="33vP2m">
+                  <node concept="37vLTG" id="2pRaEpcR5lB" role="1bW2Oz">
+                    <property role="TrG5h" value="s" />
+                    <node concept="3uibUv" id="2pRaEpcR5lC" role="1tU5fm">
+                      <ref role="3uigEE" to="xfg9:3nVyItrYOkv" resolve="NixSupport" />
                     </node>
-                    <node concept="3SKdUt" id="4UZwKZmexy4" role="3cqZAp">
-                      <node concept="1PaTwC" id="4UZwKZmexy5" role="1aUNEU">
-                        <node concept="3oM_SD" id="4UZwKZmexI8" role="1PaTwD">
-                          <property role="3oM_SC" value="Casting" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmexMQ" role="1PaTwD">
-                          <property role="3oM_SC" value="is" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmexMT" role="1PaTwD">
-                          <property role="3oM_SC" value="safe," />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmexU0" role="1PaTwD">
-                          <property role="3oM_SC" value="because" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmey2l" role="1PaTwD">
-                          <property role="3oM_SC" value="we" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmeyxt" role="1PaTwD">
-                          <property role="3oM_SC" value="will" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmeyAG" role="1PaTwD">
-                          <property role="3oM_SC" value="store" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmeyAO" role="1PaTwD">
-                          <property role="3oM_SC" value="the" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmeyL$" role="1PaTwD">
-                          <property role="3oM_SC" value="full" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmeyLI" role="1PaTwD">
-                          <property role="3oM_SC" value="node" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmeyLT" role="1PaTwD">
-                          <property role="3oM_SC" value="(see" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmeyWG" role="1PaTwD">
-                          <property role="3oM_SC" value="variable" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmezcC" role="1PaTwD">
-                          <property role="3oM_SC" value="&quot;result&quot;" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmeznt" role="1PaTwD">
-                          <property role="3oM_SC" value="below)" />
+                  </node>
+                  <node concept="3clFbS" id="2pRaEpcR5lD" role="1bW5cS">
+                    <node concept="3cpWs8" id="2pRaEpcR5lE" role="3cqZAp">
+                      <node concept="3cpWsn" id="2pRaEpcR5lF" role="3cpWs9">
+                        <property role="TrG5h" value="l" />
+                        <node concept="10P_77" id="2pRaEpcR5lG" role="1tU5fm" />
+                        <node concept="2OqwBi" id="2pRaEpcR5lH" role="33vP2m">
+                          <node concept="37vLTw" id="2pRaEpcR5lI" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2pRaEpcR5lB" resolve="s" />
+                          </node>
+                          <node concept="liA8E" id="2pRaEpcR5lJ" role="2OqNvi">
+                            <ref role="37wK5l" to="xfg9:26cjRACQf5B" resolve="getBool" />
+                            <node concept="3cmrfG" id="2pRaEpcR5lK" role="37wK5m">
+                              <property role="3cmrfH" value="0" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3cpWs8" id="4UZwKZmdiuB" role="3cqZAp">
-                      <node concept="3cpWsn" id="4UZwKZmdiuC" role="3cpWs9">
-                        <property role="TrG5h" value="right" />
-                        <node concept="3uibUv" id="4UZwKZmdiuD" role="1tU5fm">
-                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                        </node>
-                        <node concept="qpA2v" id="4UZwKZmdiDM" role="33vP2m">
-                          <node concept="1eOMI4" id="4UZwKZmezMP" role="3SLO0q">
-                            <node concept="10QFUN" id="4UZwKZmezMO" role="1eOMHV">
-                              <node concept="2OqwBi" id="4UZwKZmezMK" role="10QFUP">
-                                <node concept="37vLTw" id="4UZwKZmezML" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4UZwKZmdgTC" resolve="s" />
-                                </node>
-                                <node concept="liA8E" id="4UZwKZmezMM" role="2OqNvi">
-                                  <ref role="37wK5l" to="xfg9:3nVyIts6HwG" resolve="get" />
-                                  <node concept="3cmrfG" id="4UZwKZmezMN" role="37wK5m">
-                                    <property role="3cmrfH" value="1" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3Tqbb2" id="4UZwKZmezV8" role="10QFUM">
-                                <ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
-                              </node>
+                    <node concept="3cpWs8" id="2pRaEpcR5lL" role="3cqZAp">
+                      <node concept="3cpWsn" id="2pRaEpcR5lM" role="3cpWs9">
+                        <property role="TrG5h" value="r" />
+                        <node concept="10P_77" id="2pRaEpcR5lN" role="1tU5fm" />
+                        <node concept="2OqwBi" id="2pRaEpcR5lO" role="33vP2m">
+                          <node concept="37vLTw" id="2pRaEpcR5lP" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2pRaEpcR5lB" resolve="s" />
+                          </node>
+                          <node concept="liA8E" id="2pRaEpcR5lQ" role="2OqNvi">
+                            <ref role="37wK5l" to="xfg9:26cjRACQf5B" resolve="getBool" />
+                            <node concept="3cmrfG" id="2pRaEpcR5lR" role="37wK5m">
+                              <property role="3cmrfH" value="1" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3SKdUt" id="4UZwKZmdoO_" role="3cqZAp">
-                      <node concept="1PaTwC" id="4UZwKZmdoOA" role="1aUNEU">
-                        <node concept="3oM_SD" id="4UZwKZmdoTJ" role="1PaTwD">
-                          <property role="3oM_SC" value="package" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdoXN" role="1PaTwD">
-                          <property role="3oM_SC" value="the" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdp3D" role="1PaTwD">
-                          <property role="3oM_SC" value="result" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdpbn" role="1PaTwD">
-                          <property role="3oM_SC" value="into" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdpbs" role="1PaTwD">
-                          <property role="3oM_SC" value="a" />
+                    <node concept="3cpWs6" id="2pRaEpcR5lS" role="3cqZAp">
+                      <node concept="1Wc70l" id="2pRaEpcR5lT" role="3cqZAk">
+                        <node concept="37vLTw" id="2pRaEpcR5lU" role="3uHU7B">
+                          <ref role="3cqZAo" node="2pRaEpcR5lF" resolve="l" />
                         </node>
-                        <node concept="3oM_SD" id="4UZwKZmdphH" role="1PaTwD">
-                          <property role="3oM_SC" value="new" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdplQ" role="1PaTwD">
-                          <property role="3oM_SC" value="NixSupport" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdpqM" role="1PaTwD">
-                          <property role="3oM_SC" value="and" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdpwQ" role="1PaTwD">
-                          <property role="3oM_SC" value="run" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdpx0" role="1PaTwD">
-                          <property role="3oM_SC" value="it" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdpxb" role="1PaTwD">
-                          <property role="3oM_SC" value="to" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdpxn" role="1PaTwD">
-                          <property role="3oM_SC" value="allow" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdpAm" role="1PaTwD">
-                          <property role="3oM_SC" value="handling" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdpA$" role="1PaTwD">
-                          <property role="3oM_SC" value="of" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdpAN" role="1PaTwD">
-                          <property role="3oM_SC" value="NixValues" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdpM2" role="1PaTwD">
-                          <property role="3oM_SC" value="on" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdqkc" role="1PaTwD">
-                          <property role="3oM_SC" value="the" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdqBm" role="1PaTwD">
-                          <property role="3oM_SC" value="right-hand" />
-                        </node>
-                        <node concept="3oM_SD" id="4UZwKZmdqBD" role="1PaTwD">
-                          <property role="3oM_SC" value="side" />
+                        <node concept="37vLTw" id="2pRaEpcR5lV" role="3uHU7w">
+                          <ref role="3cqZAo" node="2pRaEpcR5lM" resolve="r" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3cpWs6" id="4UZwKZmdkx_" role="3cqZAp">
-                      <node concept="2OqwBi" id="4UZwKZmdok0" role="3cqZAk">
-                        <node concept="2ShNRf" id="4UZwKZmdkA0" role="2Oq$k0">
-                          <node concept="1pGfFk" id="4UZwKZmdkOh" role="2ShVmc">
-                            <ref role="37wK5l" to="xfg9:3nVyItrYQU_" resolve="NixSupport" />
-                            <node concept="2OqwBi" id="4UZwKZmdl67" role="37wK5m">
-                              <node concept="37vLTw" id="4UZwKZmdkVR" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4UZwKZmdgTC" resolve="s" />
-                              </node>
-                              <node concept="liA8E" id="4UZwKZmdlen" role="2OqNvi">
-                                <ref role="37wK5l" to="xfg9:3nVyIts6HwG" resolve="get" />
-                                <node concept="3cmrfG" id="4UZwKZmdlj5" role="37wK5m">
-                                  <property role="3cmrfH" value="0" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="4UZwKZmdlng" role="37wK5m">
-                              <ref role="3cqZAo" node="4UZwKZmdiuC" resolve="right" />
-                            </node>
-                            <node concept="oxGPV" id="4UZwKZmdlwz" role="37wK5m" />
-                            <node concept="1bVj0M" id="4UZwKZmdlD3" role="37wK5m">
-                              <node concept="3clFbS" id="4UZwKZmdlD5" role="1bW5cS">
-                                <node concept="3clFbF" id="4UZwKZmdlQb" role="3cqZAp">
-                                  <node concept="1Wc70l" id="4UZwKZmdnyS" role="3clFbG">
-                                    <node concept="2OqwBi" id="4UZwKZmdnPA" role="3uHU7w">
-                                      <node concept="37vLTw" id="4UZwKZmdnDg" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4UZwKZmdlFQ" resolve="s" />
-                                      </node>
-                                      <node concept="liA8E" id="4UZwKZmdo2u" role="2OqNvi">
-                                        <ref role="37wK5l" to="xfg9:26cjRACQf5B" resolve="getBool" />
-                                        <node concept="3cmrfG" id="4UZwKZmdo9y" role="37wK5m">
-                                          <property role="3cmrfH" value="1" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="2OqwBi" id="4UZwKZmdm1X" role="3uHU7B">
-                                      <node concept="37vLTw" id="4UZwKZmdlQa" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4UZwKZmdlFQ" resolve="s" />
-                                      </node>
-                                      <node concept="liA8E" id="4UZwKZmdmce" role="2OqNvi">
-                                        <ref role="37wK5l" to="xfg9:26cjRACQf5B" resolve="getBool" />
-                                        <node concept="3cmrfG" id="4UZwKZmdmmh" role="37wK5m">
-                                          <property role="3cmrfH" value="0" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="37vLTG" id="4UZwKZmdlFQ" role="1bW2Oz">
-                                <property role="TrG5h" value="s" />
-                                <node concept="3uibUv" id="4UZwKZmdlFP" role="1tU5fm">
-                                  <ref role="3uigEE" to="xfg9:3nVyItrYOkv" resolve="NixSupport" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="4UZwKZmdoAg" role="2OqNvi">
-                          <ref role="37wK5l" to="xfg9:26cjRABQZG3" resolve="run" />
-                        </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="2pRaEpcR4No" role="3cqZAp" />
+            <node concept="3cpWs8" id="4EEJFuvbYxx" role="3cqZAp">
+              <node concept="3cpWsn" id="4EEJFuvbYxy" role="3cpWs9">
+                <property role="TrG5h" value="leftNixEvaluated" />
+                <node concept="3uibUv" id="4EEJFuvbYxz" role="1tU5fm">
+                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                </node>
+                <node concept="2OqwBi" id="4EEJFuvbYx$" role="33vP2m">
+                  <node concept="2ShNRf" id="4EEJFuvbYx_" role="2Oq$k0">
+                    <node concept="1pGfFk" id="4EEJFuvbYxA" role="2ShVmc">
+                      <ref role="37wK5l" to="xfg9:3nVyItrYQU_" resolve="NixSupport" />
+                      <node concept="37vLTw" id="4EEJFuvbYxB" role="37wK5m">
+                        <ref role="3cqZAo" node="4EEJFuvbYxr" resolve="left" />
+                      </node>
+                      <node concept="3clFbT" id="2pRaEpcQgsm" role="37wK5m">
+                        <property role="3clFbU" value="true" />
+                      </node>
+                      <node concept="oxGPV" id="4EEJFuvbYxC" role="37wK5m" />
+                      <node concept="37vLTw" id="2pRaEpcR6sE" role="37wK5m">
+                        <ref role="3cqZAo" node="2pRaEpcR5l_" resolve="andCalculator" />
                       </node>
                     </node>
                   </node>
-                  <node concept="37vLTG" id="4UZwKZmdgTC" role="1bW2Oz">
-                    <property role="TrG5h" value="s" />
-                    <node concept="3uibUv" id="4UZwKZmdgTB" role="1tU5fm">
-                      <ref role="3uigEE" to="xfg9:3nVyItrYOkv" resolve="NixSupport" />
+                  <node concept="liA8E" id="4EEJFuvbYxM" role="2OqNvi">
+                    <ref role="37wK5l" to="xfg9:26cjRABQZG3" resolve="run" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="4EEJFuvbYxN" role="3cqZAp">
+              <node concept="3clFbS" id="4EEJFuvbYxO" role="3clFbx">
+                <node concept="3cpWs6" id="4EEJFuvbYxP" role="3cqZAp">
+                  <node concept="3clFbT" id="4EEJFuvbYxQ" role="3cqZAk" />
+                </node>
+              </node>
+              <node concept="1Wc70l" id="4EEJFuvbYxR" role="3clFbw">
+                <node concept="3fqX7Q" id="4EEJFuvbYxS" role="3uHU7w">
+                  <node concept="1eOMI4" id="4EEJFuvbYxT" role="3fr31v">
+                    <node concept="10QFUN" id="4EEJFuvbYxU" role="1eOMHV">
+                      <node concept="10P_77" id="4EEJFuvbYxV" role="10QFUM" />
+                      <node concept="37vLTw" id="4EEJFuvbYxW" role="10QFUP">
+                        <ref role="3cqZAo" node="4EEJFuvbYxy" resolve="leftNixEvaluated" />
+                      </node>
                     </node>
                   </node>
                 </node>
-                <node concept="1ajhzC" id="4UZwKZmdgOH" role="1tU5fm">
-                  <node concept="3uibUv" id="4UZwKZmdgOS" role="1ajw0F">
-                    <ref role="3uigEE" to="xfg9:3nVyItrYOkv" resolve="NixSupport" />
+                <node concept="2ZW3vV" id="4EEJFuvbYxX" role="3uHU7B">
+                  <node concept="3uibUv" id="4EEJFuvbYxY" role="2ZW6by">
+                    <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
                   </node>
-                  <node concept="3uibUv" id="4UZwKZmdtea" role="1ajl9A">
-                    <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                  <node concept="37vLTw" id="4EEJFuvbYxZ" role="2ZW6bz">
+                    <ref role="3cqZAo" node="4EEJFuvbYxy" resolve="leftNixEvaluated" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="4UZwKZmdgib" role="3cqZAp" />
-            <node concept="3cpWs8" id="4UZwKZmddHX" role="3cqZAp">
-              <node concept="3cpWsn" id="4UZwKZmddHY" role="3cpWs9">
-                <property role="TrG5h" value="result" />
-                <node concept="3uibUv" id="4UZwKZmddHZ" role="1tU5fm">
-                  <ref role="3uigEE" to="xfg9:3nVyItrYOkv" resolve="NixSupport" />
-                </node>
-                <node concept="2ShNRf" id="4UZwKZmddOA" role="33vP2m">
-                  <node concept="1pGfFk" id="4UZwKZmdf4W" role="2ShVmc">
-                    <ref role="37wK5l" to="xfg9:3nVyItrYQU_" resolve="NixSupport" />
-                    <node concept="37vLTw" id="4UZwKZmdfaC" role="37wK5m">
-                      <ref role="3cqZAo" node="4EEJFuvbYxr" resolve="left" />
+            <node concept="3cpWs8" id="skNXYt0e7f" role="3cqZAp">
+              <node concept="3cpWsn" id="skNXYt0e7g" role="3cpWs9">
+                <property role="TrG5h" value="right" />
+                <node concept="3uibUv" id="skNXYt0e7h" role="1tU5fm">
+                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                </node>
+                <node concept="qpA2v" id="skNXYt0e7i" role="33vP2m">
+                  <node concept="2OqwBi" id="skNXYt0e7j" role="3SLO0q">
+                    <node concept="oxGPV" id="skNXYt0e7k" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="skNXYt0e7l" role="2OqNvi">
+                      <ref role="3Tt5mk" to="hm2y:4rZeNQ6MpKo" resolve="right" />
                     </node>
-                    <node concept="2OqwBi" id="4UZwKZmdfrA" role="37wK5m">
-                      <node concept="oxGPV" id="4UZwKZmdfbj" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="4UZwKZmdfU$" role="2OqNvi">
-                        <ref role="3Tt5mk" to="hm2y:4rZeNQ6MpKo" resolve="right" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="skNXYt0e7m" role="3cqZAp">
+              <node concept="3clFbS" id="skNXYt0e7n" role="3clFbx">
+                <node concept="3cpWs6" id="skNXYt0e7o" role="3cqZAp">
+                  <node concept="2OqwBi" id="skNXYt0e7p" role="3cqZAk">
+                    <node concept="2ShNRf" id="skNXYt0e7q" role="2Oq$k0">
+                      <node concept="1pGfFk" id="skNXYt0e7r" role="2ShVmc">
+                        <ref role="37wK5l" to="xfg9:3nVyItrYQU_" resolve="NixSupport" />
+                        <node concept="3clFbT" id="skNXYt0e7s" role="37wK5m">
+                          <property role="3clFbU" value="true" />
+                        </node>
+                        <node concept="37vLTw" id="skNXYt0e7t" role="37wK5m">
+                          <ref role="3cqZAo" node="skNXYt0e7g" resolve="right" />
+                        </node>
+                        <node concept="oxGPV" id="skNXYt0e7u" role="37wK5m" />
+                        <node concept="37vLTw" id="skNXYt0f5w" role="37wK5m">
+                          <ref role="3cqZAo" node="2pRaEpcR5l_" resolve="andCalculator" />
+                        </node>
                       </node>
                     </node>
-                    <node concept="oxGPV" id="4UZwKZmdg4N" role="37wK5m" />
-                    <node concept="37vLTw" id="4UZwKZmdqMm" role="37wK5m">
-                      <ref role="3cqZAo" node="4UZwKZmdgE9" resolve="andCalculator" />
+                    <node concept="liA8E" id="skNXYt0e7w" role="2OqNvi">
+                      <ref role="37wK5l" to="xfg9:26cjRABQZG3" resolve="run" />
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="2ZW3vV" id="skNXYt0e7x" role="3clFbw">
+                <node concept="3uibUv" id="skNXYt0e7y" role="2ZW6by">
+                  <ref role="3uigEE" to="ppzb:3nVyItrYNyp" resolve="INixValue" />
+                </node>
+                <node concept="37vLTw" id="skNXYt0e7z" role="2ZW6bz">
+                  <ref role="3cqZAo" node="4EEJFuvbYxy" resolve="leftNixEvaluated" />
+                </node>
+              </node>
             </node>
-            <node concept="3cpWs6" id="4UZwKZmdr44" role="3cqZAp">
-              <node concept="2OqwBi" id="4UZwKZmdroA" role="3cqZAk">
-                <node concept="liA8E" id="4UZwKZmdrz1" role="2OqNvi">
+            <node concept="3clFbH" id="4EEJFuvbZoo" role="3cqZAp" />
+            <node concept="3cpWs6" id="26cjRACQHvo" role="3cqZAp">
+              <node concept="2OqwBi" id="26cjRACS1W8" role="3cqZAk">
+                <node concept="liA8E" id="26cjRACS2eo" role="2OqNvi">
                   <ref role="37wK5l" to="xfg9:26cjRABQZG3" resolve="run" />
                 </node>
-                <node concept="37vLTw" id="4UZwKZmdrj0" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4UZwKZmddHY" resolve="result" />
+                <node concept="2ShNRf" id="26cjRACQHvp" role="2Oq$k0">
+                  <node concept="1pGfFk" id="26cjRACQHvq" role="2ShVmc">
+                    <ref role="37wK5l" to="xfg9:3nVyItrYQU_" resolve="NixSupport" />
+                    <node concept="37vLTw" id="4EEJFuvbZRP" role="37wK5m">
+                      <ref role="3cqZAo" node="4EEJFuvbYxr" resolve="left" />
+                    </node>
+                    <node concept="37vLTw" id="skNXYt0fho" role="37wK5m">
+                      <ref role="3cqZAo" node="skNXYt0e7g" resolve="right" />
+                    </node>
+                    <node concept="oxGPV" id="26cjRACQHvz" role="37wK5m" />
+                    <node concept="37vLTw" id="2pRaEpcR714" role="37wK5m">
+                      <ref role="3cqZAo" node="2pRaEpcR5l_" resolve="andCalculator" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -2885,44 +2536,6 @@
       <node concept="3dA_Gj" id="26cjRACQxIv" role="3vQZUl">
         <node concept="9aQIb" id="26cjRACQxIx" role="3vcmbn">
           <node concept="3clFbS" id="26cjRACQxIz" role="9aQI4">
-            <node concept="3SKdUt" id="3NMMaaID$mc" role="3cqZAp">
-              <node concept="1PaTwC" id="3NMMaaID$md" role="1aUNEU">
-                <node concept="3oM_SD" id="3NMMaaID$ta" role="1PaTwD">
-                  <property role="3oM_SC" value="Also" />
-                </node>
-                <node concept="3oM_SD" id="3NMMaaID$tc" role="1PaTwD">
-                  <property role="3oM_SC" value="supports" />
-                </node>
-                <node concept="3oM_SD" id="3NMMaaID$tf" role="1PaTwD">
-                  <property role="3oM_SC" value="short-circuit" />
-                </node>
-                <node concept="3oM_SD" id="3NMMaaID$tj" role="1PaTwD">
-                  <property role="3oM_SC" value="evaluation" />
-                </node>
-              </node>
-            </node>
-            <node concept="3SKdUt" id="3NMMaaID$$p" role="3cqZAp">
-              <node concept="1PaTwC" id="3NMMaaID$$q" role="1aUNEU">
-                <node concept="3oM_SD" id="3NMMaaID$BN" role="1PaTwD">
-                  <property role="3oM_SC" value="see" />
-                </node>
-                <node concept="3oM_SD" id="3NMMaaID$A3" role="1PaTwD">
-                  <property role="3oM_SC" value="&amp;&amp;" />
-                </node>
-                <node concept="3oM_SD" id="3NMMaaID$BQ" role="1PaTwD">
-                  <property role="3oM_SC" value="operator" />
-                </node>
-                <node concept="3oM_SD" id="3NMMaaID$BU" role="1PaTwD">
-                  <property role="3oM_SC" value="above" />
-                </node>
-                <node concept="3oM_SD" id="3NMMaaID$BZ" role="1PaTwD">
-                  <property role="3oM_SC" value="for" />
-                </node>
-                <node concept="3oM_SD" id="3NMMaaID$C5" role="1PaTwD">
-                  <property role="3oM_SC" value="documentation" />
-                </node>
-              </node>
-            </node>
             <node concept="3cpWs8" id="4EEJFuvcpCH" role="3cqZAp">
               <node concept="3cpWsn" id="4EEJFuvcpCI" role="3cpWs9">
                 <property role="TrG5h" value="left" />
@@ -2939,153 +2552,193 @@
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="3NMMaaID_ua" role="3cqZAp">
-              <node concept="3cpWsn" id="3NMMaaID_ub" role="3cpWs9">
+            <node concept="3cpWs8" id="2pRaEpcR7Hc" role="3cqZAp">
+              <node concept="3cpWsn" id="2pRaEpcR7Hd" role="3cpWs9">
                 <property role="TrG5h" value="orCalculator" />
-                <node concept="1bVj0M" id="3NMMaaID_uc" role="33vP2m">
-                  <node concept="3clFbS" id="3NMMaaID_ud" role="1bW5cS">
-                    <node concept="3cpWs8" id="3NMMaaID_v4" role="3cqZAp">
-                      <node concept="3cpWsn" id="3NMMaaID_v5" role="3cpWs9">
-                        <property role="TrG5h" value="right" />
-                        <node concept="3uibUv" id="3NMMaaID_v6" role="1tU5fm">
-                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                        </node>
-                        <node concept="qpA2v" id="3NMMaaID_v7" role="33vP2m">
-                          <node concept="1eOMI4" id="3NMMaaID_v8" role="3SLO0q">
-                            <node concept="10QFUN" id="3NMMaaID_v9" role="1eOMHV">
-                              <node concept="2OqwBi" id="3NMMaaID_va" role="10QFUP">
-                                <node concept="37vLTw" id="3NMMaaID_vb" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3NMMaaID_vX" resolve="s" />
-                                </node>
-                                <node concept="liA8E" id="3NMMaaID_vc" role="2OqNvi">
-                                  <ref role="37wK5l" to="xfg9:3nVyIts6HwG" resolve="get" />
-                                  <node concept="3cmrfG" id="3NMMaaID_vd" role="37wK5m">
-                                    <property role="3cmrfH" value="1" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3Tqbb2" id="3NMMaaID_ve" role="10QFUM">
-                                <ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
-                              </node>
+                <node concept="1ajhzC" id="2pRaEpcR7H9" role="1tU5fm">
+                  <node concept="3uibUv" id="2pRaEpcR7Ha" role="1ajw0F">
+                    <ref role="3uigEE" to="xfg9:3nVyItrYOkv" resolve="NixSupport" />
+                  </node>
+                  <node concept="10P_77" id="2pRaEpcR7Hb" role="1ajl9A" />
+                </node>
+                <node concept="1bVj0M" id="2pRaEpcR7He" role="33vP2m">
+                  <node concept="37vLTG" id="2pRaEpcR7Hf" role="1bW2Oz">
+                    <property role="TrG5h" value="s" />
+                    <node concept="3uibUv" id="2pRaEpcR7Hg" role="1tU5fm">
+                      <ref role="3uigEE" to="xfg9:3nVyItrYOkv" resolve="NixSupport" />
+                    </node>
+                  </node>
+                  <node concept="3clFbS" id="2pRaEpcR7Hh" role="1bW5cS">
+                    <node concept="3cpWs8" id="2pRaEpcR7Hi" role="3cqZAp">
+                      <node concept="3cpWsn" id="2pRaEpcR7Hj" role="3cpWs9">
+                        <property role="TrG5h" value="l" />
+                        <node concept="10P_77" id="2pRaEpcR7Hk" role="1tU5fm" />
+                        <node concept="2OqwBi" id="2pRaEpcR7Hl" role="33vP2m">
+                          <node concept="37vLTw" id="2pRaEpcR7Hm" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2pRaEpcR7Hf" resolve="s" />
+                          </node>
+                          <node concept="liA8E" id="2pRaEpcR7Hn" role="2OqNvi">
+                            <ref role="37wK5l" to="xfg9:26cjRACQf5B" resolve="getBool" />
+                            <node concept="3cmrfG" id="2pRaEpcR7Ho" role="37wK5m">
+                              <property role="3cmrfH" value="0" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3cpWs6" id="3NMMaaID_v$" role="3cqZAp">
-                      <node concept="2OqwBi" id="3NMMaaID_v_" role="3cqZAk">
-                        <node concept="2ShNRf" id="3NMMaaID_vA" role="2Oq$k0">
-                          <node concept="1pGfFk" id="3NMMaaID_vB" role="2ShVmc">
-                            <ref role="37wK5l" to="xfg9:3nVyItrYQU_" resolve="NixSupport" />
-                            <node concept="2OqwBi" id="3NMMaaID_vC" role="37wK5m">
-                              <node concept="37vLTw" id="3NMMaaID_vD" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3NMMaaID_vX" resolve="s" />
-                              </node>
-                              <node concept="liA8E" id="3NMMaaID_vE" role="2OqNvi">
-                                <ref role="37wK5l" to="xfg9:3nVyIts6HwG" resolve="get" />
-                                <node concept="3cmrfG" id="3NMMaaID_vF" role="37wK5m">
-                                  <property role="3cmrfH" value="0" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="3NMMaaID_vG" role="37wK5m">
-                              <ref role="3cqZAo" node="3NMMaaID_v5" resolve="right" />
-                            </node>
-                            <node concept="oxGPV" id="3NMMaaID_vH" role="37wK5m" />
-                            <node concept="1bVj0M" id="3NMMaaID_vI" role="37wK5m">
-                              <node concept="3clFbS" id="3NMMaaID_vJ" role="1bW5cS">
-                                <node concept="3clFbF" id="3NMMaaID_vK" role="3cqZAp">
-                                  <node concept="22lmx$" id="3NMMaaIDAOh" role="3clFbG">
-                                    <node concept="2OqwBi" id="3NMMaaID_vQ" role="3uHU7B">
-                                      <node concept="37vLTw" id="3NMMaaID_vR" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3NMMaaID_vU" resolve="s" />
-                                      </node>
-                                      <node concept="liA8E" id="3NMMaaID_vS" role="2OqNvi">
-                                        <ref role="37wK5l" to="xfg9:26cjRACQf5B" resolve="getBool" />
-                                        <node concept="3cmrfG" id="3NMMaaID_vT" role="37wK5m">
-                                          <property role="3cmrfH" value="0" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="2OqwBi" id="3NMMaaID_vM" role="3uHU7w">
-                                      <node concept="37vLTw" id="3NMMaaID_vN" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3NMMaaID_vU" resolve="s" />
-                                      </node>
-                                      <node concept="liA8E" id="3NMMaaID_vO" role="2OqNvi">
-                                        <ref role="37wK5l" to="xfg9:26cjRACQf5B" resolve="getBool" />
-                                        <node concept="3cmrfG" id="3NMMaaID_vP" role="37wK5m">
-                                          <property role="3cmrfH" value="1" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="37vLTG" id="3NMMaaID_vU" role="1bW2Oz">
-                                <property role="TrG5h" value="s" />
-                                <node concept="3uibUv" id="3NMMaaID_vV" role="1tU5fm">
-                                  <ref role="3uigEE" to="xfg9:3nVyItrYOkv" resolve="NixSupport" />
-                                </node>
-                              </node>
+                    <node concept="3cpWs8" id="2pRaEpcR7Hp" role="3cqZAp">
+                      <node concept="3cpWsn" id="2pRaEpcR7Hq" role="3cpWs9">
+                        <property role="TrG5h" value="r" />
+                        <node concept="10P_77" id="2pRaEpcR7Hr" role="1tU5fm" />
+                        <node concept="2OqwBi" id="2pRaEpcR7Hs" role="33vP2m">
+                          <node concept="37vLTw" id="2pRaEpcR7Ht" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2pRaEpcR7Hf" resolve="s" />
+                          </node>
+                          <node concept="liA8E" id="2pRaEpcR7Hu" role="2OqNvi">
+                            <ref role="37wK5l" to="xfg9:26cjRACQf5B" resolve="getBool" />
+                            <node concept="3cmrfG" id="2pRaEpcR7Hv" role="37wK5m">
+                              <property role="3cmrfH" value="1" />
                             </node>
                           </node>
                         </node>
-                        <node concept="liA8E" id="3NMMaaID_vW" role="2OqNvi">
-                          <ref role="37wK5l" to="xfg9:26cjRABQZG3" resolve="run" />
+                      </node>
+                    </node>
+                    <node concept="3cpWs6" id="2pRaEpcR7Hw" role="3cqZAp">
+                      <node concept="22lmx$" id="2pRaEpcR7Hx" role="3cqZAk">
+                        <node concept="37vLTw" id="2pRaEpcR7Hy" role="3uHU7w">
+                          <ref role="3cqZAo" node="2pRaEpcR7Hq" resolve="r" />
+                        </node>
+                        <node concept="37vLTw" id="2pRaEpcR7Hz" role="3uHU7B">
+                          <ref role="3cqZAo" node="2pRaEpcR7Hj" resolve="l" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="37vLTG" id="3NMMaaID_vX" role="1bW2Oz">
-                    <property role="TrG5h" value="s" />
-                    <node concept="3uibUv" id="3NMMaaID_vY" role="1tU5fm">
-                      <ref role="3uigEE" to="xfg9:3nVyItrYOkv" resolve="NixSupport" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="2pRaEpcRcZt" role="3cqZAp" />
+            <node concept="3cpWs8" id="4EEJFuvcs$O" role="3cqZAp">
+              <node concept="3cpWsn" id="4EEJFuvcs$P" role="3cpWs9">
+                <property role="TrG5h" value="leftNixEvaluated" />
+                <node concept="3uibUv" id="4EEJFuvcs$Q" role="1tU5fm">
+                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                </node>
+                <node concept="2OqwBi" id="4EEJFuvctIG" role="33vP2m">
+                  <node concept="2ShNRf" id="4EEJFuvctIH" role="2Oq$k0">
+                    <node concept="1pGfFk" id="4EEJFuvctII" role="2ShVmc">
+                      <ref role="37wK5l" to="xfg9:3nVyItrYQU_" resolve="NixSupport" />
+                      <node concept="37vLTw" id="4EEJFuvctIJ" role="37wK5m">
+                        <ref role="3cqZAo" node="4EEJFuvcpCI" resolve="left" />
+                      </node>
+                      <node concept="3clFbT" id="2pRaEpcQh2P" role="37wK5m" />
+                      <node concept="oxGPV" id="4EEJFuvctIK" role="37wK5m" />
+                      <node concept="37vLTw" id="2pRaEpcR8gf" role="37wK5m">
+                        <ref role="3cqZAo" node="2pRaEpcR7Hd" resolve="orCalculator" />
+                      </node>
                     </node>
                   </node>
+                  <node concept="liA8E" id="4EEJFuvctIU" role="2OqNvi">
+                    <ref role="37wK5l" to="xfg9:26cjRABQZG3" resolve="run" />
+                  </node>
                 </node>
-                <node concept="1ajhzC" id="3NMMaaID_vZ" role="1tU5fm">
-                  <node concept="3uibUv" id="3NMMaaID_w0" role="1ajw0F">
-                    <ref role="3uigEE" to="xfg9:3nVyItrYOkv" resolve="NixSupport" />
+              </node>
+            </node>
+            <node concept="3clFbJ" id="4EEJFuvcv2e" role="3cqZAp">
+              <node concept="3clFbS" id="4EEJFuvcv2g" role="3clFbx">
+                <node concept="3cpWs6" id="4EEJFuvcvGC" role="3cqZAp">
+                  <node concept="3clFbT" id="4EEJFuvcvGL" role="3cqZAk">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                </node>
+              </node>
+              <node concept="1Wc70l" id="4EEJFuvcvC6" role="3clFbw">
+                <node concept="1eOMI4" id="4EEJFuvcvDl" role="3uHU7w">
+                  <node concept="10QFUN" id="4EEJFuvcvDi" role="1eOMHV">
+                    <node concept="10P_77" id="4EEJFuvcvDV" role="10QFUM" />
+                    <node concept="37vLTw" id="4EEJFuvcvEt" role="10QFUP">
+                      <ref role="3cqZAo" node="4EEJFuvcs$P" resolve="leftNixEvaluated" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2ZW3vV" id="4EEJFuvcvgT" role="3uHU7B">
+                  <node concept="3uibUv" id="4EEJFuvcvhZ" role="2ZW6by">
+                    <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
                   </node>
-                  <node concept="3uibUv" id="3NMMaaID_w1" role="1ajl9A">
-                    <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                  <node concept="37vLTw" id="4EEJFuvcvbQ" role="2ZW6bz">
+                    <ref role="3cqZAo" node="4EEJFuvcs$P" resolve="leftNixEvaluated" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="3NMMaaIDBge" role="3cqZAp">
-              <node concept="3cpWsn" id="3NMMaaIDBgf" role="3cpWs9">
-                <property role="TrG5h" value="result" />
-                <node concept="3uibUv" id="3NMMaaIDBgg" role="1tU5fm">
-                  <ref role="3uigEE" to="xfg9:3nVyItrYOkv" resolve="NixSupport" />
-                </node>
-                <node concept="2ShNRf" id="3NMMaaIDBgh" role="33vP2m">
-                  <node concept="1pGfFk" id="3NMMaaIDBgi" role="2ShVmc">
-                    <ref role="37wK5l" to="xfg9:3nVyItrYQU_" resolve="NixSupport" />
-                    <node concept="37vLTw" id="3NMMaaIDBgj" role="37wK5m">
-                      <ref role="3cqZAo" node="4EEJFuvcpCI" resolve="left" />
+            <node concept="3cpWs8" id="4EEJFuvlB5$" role="3cqZAp">
+              <node concept="3cpWsn" id="4EEJFuvlB5_" role="3cpWs9">
+                <property role="TrG5h" value="right" />
+                <node concept="3uibUv" id="4EEJFuvlAWo" role="1tU5fm">
+                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                </node>
+                <node concept="qpA2v" id="4EEJFuvlB5A" role="33vP2m">
+                  <node concept="2OqwBi" id="4EEJFuvlB5B" role="3SLO0q">
+                    <node concept="oxGPV" id="4EEJFuvlB5C" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="4EEJFuvlB5D" role="2OqNvi">
+                      <ref role="3Tt5mk" to="hm2y:4rZeNQ6MpKo" resolve="right" />
                     </node>
-                    <node concept="2OqwBi" id="3NMMaaIDBgk" role="37wK5m">
-                      <node concept="oxGPV" id="3NMMaaIDBgl" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="3NMMaaIDBgm" role="2OqNvi">
-                        <ref role="3Tt5mk" to="hm2y:4rZeNQ6MpKo" resolve="right" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="4EEJFuvlAPp" role="3cqZAp">
+              <node concept="3clFbS" id="4EEJFuvlAPr" role="3clFbx">
+                <node concept="3cpWs6" id="4EEJFuvlIid" role="3cqZAp">
+                  <node concept="2OqwBi" id="4EEJFuvlEDC" role="3cqZAk">
+                    <node concept="2ShNRf" id="4EEJFuvlEDD" role="2Oq$k0">
+                      <node concept="1pGfFk" id="4EEJFuvlEDE" role="2ShVmc">
+                        <ref role="37wK5l" to="xfg9:3nVyItrYQU_" resolve="NixSupport" />
+                        <node concept="3clFbT" id="2pRaEpcQhkD" role="37wK5m" />
+                        <node concept="37vLTw" id="4EEJFuvlIa1" role="37wK5m">
+                          <ref role="3cqZAo" node="4EEJFuvlB5_" resolve="right" />
+                        </node>
+                        <node concept="oxGPV" id="4EEJFuvlEDG" role="37wK5m" />
+                        <node concept="37vLTw" id="2pRaEpcR8ue" role="37wK5m">
+                          <ref role="3cqZAo" node="2pRaEpcR7Hd" resolve="orCalculator" />
+                        </node>
                       </node>
                     </node>
-                    <node concept="oxGPV" id="3NMMaaIDBgn" role="37wK5m" />
-                    <node concept="37vLTw" id="3NMMaaIDBgo" role="37wK5m">
-                      <ref role="3cqZAo" node="3NMMaaID_ub" resolve="orCalculator" />
+                    <node concept="liA8E" id="4EEJFuvlEDQ" role="2OqNvi">
+                      <ref role="37wK5l" to="xfg9:26cjRABQZG3" resolve="run" />
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="2ZW3vV" id="4EEJFuvlB4h" role="3clFbw">
+                <node concept="3uibUv" id="4EEJFuvlB5n" role="2ZW6by">
+                  <ref role="3uigEE" to="ppzb:3nVyItrYNyp" resolve="INixValue" />
+                </node>
+                <node concept="37vLTw" id="4EEJFuvlB0y" role="2ZW6bz">
+                  <ref role="3cqZAo" node="4EEJFuvcs$P" resolve="leftNixEvaluated" />
+                </node>
+              </node>
             </node>
-            <node concept="3cpWs6" id="3NMMaaIDBgp" role="3cqZAp">
-              <node concept="2OqwBi" id="3NMMaaIDBgq" role="3cqZAk">
-                <node concept="liA8E" id="3NMMaaIDBgs" role="2OqNvi">
+            <node concept="3clFbH" id="4EEJFuvcxup" role="3cqZAp" />
+            <node concept="3cpWs6" id="26cjRACQxZW" role="3cqZAp">
+              <node concept="2OqwBi" id="26cjRACS2q1" role="3cqZAk">
+                <node concept="liA8E" id="26cjRACS2Be" role="2OqNvi">
                   <ref role="37wK5l" to="xfg9:26cjRABQZG3" resolve="run" />
                 </node>
-                <node concept="37vLTw" id="3NMMaaIDBgr" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3NMMaaIDBgf" resolve="result" />
+                <node concept="2ShNRf" id="26cjRACQxZX" role="2Oq$k0">
+                  <node concept="1pGfFk" id="26cjRACQxZY" role="2ShVmc">
+                    <ref role="37wK5l" to="xfg9:3nVyItrYQU_" resolve="NixSupport" />
+                    <node concept="37vLTw" id="4EEJFuvcyug" role="37wK5m">
+                      <ref role="3cqZAo" node="4EEJFuvcpCI" resolve="left" />
+                    </node>
+                    <node concept="37vLTw" id="4EEJFuvlB5E" role="37wK5m">
+                      <ref role="3cqZAo" node="4EEJFuvlB5_" resolve="right" />
+                    </node>
+                    <node concept="oxGPV" id="26cjRACQy07" role="37wK5m" />
+                    <node concept="37vLTw" id="2pRaEpcR8BZ" role="37wK5m">
+                      <ref role="3cqZAo" node="2pRaEpcR7Hd" resolve="orCalculator" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.phyunits.si/models/org.iets3.core.expr.typetags.phyunits.si.units.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.phyunits.si/models/org.iets3.core.expr.typetags.phyunits.si.units.mps
index 2fa6cd2b52..bde328c4c0 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.phyunits.si/models/org.iets3.core.expr.typetags.phyunits.si.units.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.phyunits.si/models/org.iets3.core.expr.typetags.phyunits.si.units.mps
@@ -9,7 +9,7 @@
   <imports />
   <registry>
     <language id="7ee265bd-5986-4709-86ed-2c6daa33cd8c" name="org.iets3.core.expr.typetags.physunits">
-      <concept id="7387055326543332204" name="org.iets3.core.expr.typetags.physunits.structure.IHaveIUnitSpecification" flags="ngI" index="4gtj2">
+      <concept id="7387055326543332204" name="org.iets3.core.expr.typetags.physunits.structure.IHaveIUnitSpecification" flags="ng" index="4gtj2">
         <child id="7387055326543333921" name="specification" index="4gtQf" />
       </concept>
       <concept id="1741902046311368052" name="org.iets3.core.expr.typetags.physunits.structure.ConversionSpecifier" flags="ng" index="27LzZq">
@@ -137,7 +137,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
index b2d6a3cbbf..9f64389923 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
@@ -90,7 +90,7 @@
       <concept id="8654221991637384182" name="jetbrains.mps.build.structure.BuildFileIncludesSelector" flags="ng" index="3qWCbU">
         <property id="8654221991637384184" name="pattern" index="3qWCbO" />
       </concept>
-      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ngI" index="1y1bJS">
+      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ng" index="1y1bJS">
         <child id="7389400916848037006" name="children" index="39821P" />
       </concept>
       <concept id="5610619299013057363" name="jetbrains.mps.build.structure.BuildLayout_ImportContent" flags="ng" index="3ygNvl">
@@ -113,7 +113,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -13218,9 +13218,6 @@
         <node concept="L2wRC" id="5IOlOc8vtrg" role="39821P">
           <ref role="L2wRA" node="5IOlOc8uq2z" resolve="test.ts.expr.os" />
         </node>
-        <node concept="L2wRC" id="4qxhWwxUVap" role="39821P">
-          <ref role="L2wRA" node="4qxhWwxUpI5" resolve="test.nixHandlers.expr.os" />
-        </node>
         <node concept="L2wRC" id="7Yul2TvQ4xO" role="39821P">
           <ref role="L2wRA" node="7Yul2TvQ2N5" resolve="test.ts.expr.os.validNameConcept" />
         </node>
@@ -13609,8 +13606,8 @@
           <ref role="3bR37D" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
         </node>
       </node>
-      <node concept="1SiIV0" id="1Fk7ztngwkY" role="3bR37C">
-        <node concept="3bR9La" id="1Fk7ztngwkZ" role="1SiIV1">
+      <node concept="1SiIV0" id="4kTTOmLtRe" role="3bR37C">
+        <node concept="3bR9La" id="4kTTOmLtRf" role="1SiIV1">
           <ref role="3bR37D" node="6n8rWbyXz_9" resolve="org.iets3.core.expr.typetags.units.si" />
         </node>
       </node>
@@ -13620,71 +13617,6 @@
         </node>
       </node>
     </node>
-    <node concept="1E1JtA" id="4qxhWwxUpI5" role="3989C9">
-      <property role="BnDLt" value="true" />
-      <property role="TrG5h" value="test.nixHandlers.expr.os" />
-      <property role="3LESm3" value="dfbe64e8-4da4-4fad-a171-e31934e6cdae" />
-      <property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
-      <node concept="398BVA" id="4qxhWwxUpL7" role="3LF7KH">
-        <ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
-        <node concept="2Ry0Ak" id="4qxhWwxUpLj" role="iGT6I">
-          <property role="2Ry0Am" value="solutions" />
-          <node concept="2Ry0Ak" id="4qxhWwxUpLo" role="2Ry0An">
-            <property role="2Ry0Am" value="test.nixHandlers.expr.os" />
-            <node concept="2Ry0Ak" id="4qxhWwxUpLt" role="2Ry0An">
-              <property role="2Ry0Am" value="test.nixHandlers.expr.os.msd" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1BupzO" id="4qxhWwxUpMn" role="3bR31x">
-        <property role="3ZfqAx" value="models" />
-        <property role="1Hdu6h" value="true" />
-        <property role="1HemKv" value="true" />
-        <node concept="3LXTmp" id="4qxhWwxUpMo" role="1HemKq">
-          <node concept="398BVA" id="4qxhWwxUpM5" role="3LXTmr">
-            <ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
-            <node concept="2Ry0Ak" id="4qxhWwxUpM6" role="iGT6I">
-              <property role="2Ry0Am" value="solutions" />
-              <node concept="2Ry0Ak" id="4qxhWwxUpM7" role="2Ry0An">
-                <property role="2Ry0Am" value="test.nixHandlers.expr.os" />
-                <node concept="2Ry0Ak" id="4qxhWwxUpM8" role="2Ry0An">
-                  <property role="2Ry0Am" value="models" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3qWCbU" id="4qxhWwxUpMp" role="3LXTna">
-            <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-          </node>
-        </node>
-      </node>
-      <node concept="1SiIV0" id="6UwMN4NRUxI" role="3bR37C">
-        <node concept="3bR9La" id="6UwMN4NRUxJ" role="1SiIV1">
-          <ref role="3bR37D" node="5wLtKNeSRPD" resolve="org.iets3.core.expr.base" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="6UwMN4NRUxK" role="3bR37C">
-        <node concept="3bR9La" id="6UwMN4NRUxL" role="1SiIV1">
-          <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="6UwMN4NRUxO" role="3bR37C">
-        <node concept="3bR9La" id="6UwMN4NRUxP" role="1SiIV1">
-          <ref role="3bR37D" node="4C_RnzfEE1P" resolve="org.iets3.core.expr.base.runtime" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="6UwMN4NRUxQ" role="3bR37C">
-        <node concept="3bR9La" id="6UwMN4NRUxR" role="1SiIV1">
-          <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
-        </node>
-      </node>
-      <node concept="1SiIV0" id="3MNhq2UOm0z" role="3bR37C">
-        <node concept="3bR9La" id="3MNhq2UOm0$" role="1SiIV1">
-          <ref role="3bR37D" to="ffeo:7Kfy9QB6L5O" resolve="jetbrains.mps.lang.extension" />
-        </node>
-      </node>
-    </node>
     <node concept="1E1JtA" id="5kwEgmAh8J_" role="3989C9">
       <property role="BnDLt" value="true" />
       <property role="TrG5h" value="test.org.iets3.core.comments" />
@@ -13973,9 +13905,6 @@
       <node concept="22LTRM" id="5IOlOc8vuMy" role="22LTRK">
         <ref role="22LTRN" node="5IOlOc8uq2z" resolve="test.ts.expr.os" />
       </node>
-      <node concept="22LTRM" id="4qxhWwxUpNQ" role="22LTRK">
-        <ref role="22LTRN" node="4qxhWwxUpI5" resolve="test.nixHandlers.expr.os" />
-      </node>
       <node concept="22LTRM" id="5kwEgmAh92W" role="22LTRK">
         <ref role="22LTRN" node="5kwEgmAh8J_" resolve="test.org.iets3.core.comments" />
       </node>
diff --git a/code/languages/org.iets3.opensource/solutions/test.nixHandlers.expr.os/models/test.nixHandler.expr.os.shortcircuit.mps b/code/languages/org.iets3.opensource/solutions/test.nixHandlers.expr.os/models/test.nixHandler.expr.os.shortcircuit.mps
index 70028a0903..e69de29bb2 100644
--- a/code/languages/org.iets3.opensource/solutions/test.nixHandlers.expr.os/models/test.nixHandler.expr.os.shortcircuit.mps
+++ b/code/languages/org.iets3.opensource/solutions/test.nixHandlers.expr.os/models/test.nixHandler.expr.os.shortcircuit.mps
@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:4aec2398-127d-4103-a988-e8ae795c16d8(test.nixHandler.expr.os.shortcircuit)">
-  <persistence version="9" />
-  <languages>
-    <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
-    <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-  </languages>
-  <imports>
-    <import index="oq0c" ref="r:6c6155f0-4bbe-4af5-8c26-244d570e21e4(org.iets3.core.expr.base.plugin)" />
-    <import index="90d" ref="r:421d64ed-8024-497f-aeab-8bddeb389dd2(jetbrains.mps.lang.extension.methods)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
-    <import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
-  </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
-      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
-        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
-      </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
-        <child id="1188208488637" name="annotation" index="2AJF6D" />
-      </concept>
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
-      <concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
-        <child id="1081256993305" name="classType" index="2ZW6by" />
-        <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
-      </concept>
-      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
-      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <child id="1165602531693" name="superclass" index="1zkMxy" />
-      </concept>
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1068580123160" name="condition" index="3clFbw" />
-        <child id="1068580123161" name="ifTrue" index="3clFbx" />
-        <child id="1206060520071" name="elsifClauses" index="3eNLev" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </concept>
-      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
-        <property id="1068580320021" name="value" index="3cmrfH" />
-      </concept>
-      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
-        <child id="1068581517676" name="expression" index="3cqZAk" />
-      </concept>
-      <concept id="1206060495898" name="jetbrains.mps.baseLanguage.structure.ElsifClause" flags="ng" index="3eNFk2">
-        <child id="1206060619838" name="condition" index="3eO9$A" />
-        <child id="1206060644605" name="statementList" index="3eOfB_" />
-      </concept>
-      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
-        <child id="1079359253376" name="expression" index="1eOMHV" />
-      </concept>
-      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
-        <child id="1081516765348" name="expression" index="3fr31v" />
-      </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1073063089578" name="jetbrains.mps.baseLanguage.structure.SuperMethodCall" flags="nn" index="3nyPlj" />
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
-      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
-        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
-        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
-        <child id="8356039341262087992" name="line" index="1aUNEU" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
-      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
-        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-    <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
-      <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
-        <property id="155656958578482949" name="value" index="3oM_SC" />
-      </concept>
-      <concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
-        <child id="2535923850359271783" name="elements" index="1PaTwD" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="312cEu" id="5Dc_HmSYPqL">
-    <property role="TrG5h" value="ShortCircuitNixHandler" />
-    <node concept="2tJIrI" id="6UwMN4NRz5b" role="jymVt" />
-    <node concept="Wx3nA" id="6UwMN4NRHah" role="jymVt">
-      <property role="TrG5h" value="priorityLevel" />
-      <node concept="3Tm1VV" id="6UwMN4NRGrN" role="1B3o_S" />
-      <node concept="10Oyi0" id="6UwMN4NRH1y" role="1tU5fm" />
-      <node concept="3cmrfG" id="6UwMN4NRHrr" role="33vP2m">
-        <property role="3cmrfH" value="-1" />
-      </node>
-    </node>
-    <node concept="3clFb_" id="5Dc_HmSYLi0" role="jymVt">
-      <property role="TrG5h" value="getPriorityLevel" />
-      <node concept="10Oyi0" id="5Dc_HmSYLi1" role="3clF45" />
-      <node concept="3Tm1VV" id="5Dc_HmSYLi2" role="1B3o_S" />
-      <node concept="2AHcQZ" id="5Dc_HmSYLi6" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-      <node concept="3clFbS" id="5Dc_HmSYLi7" role="3clF47">
-        <node concept="3cpWs6" id="62nr1EUu37" role="3cqZAp">
-          <node concept="37vLTw" id="6UwMN4NRIdC" role="3cqZAk">
-            <ref role="3cqZAo" node="6UwMN4NRHah" resolve="priorityLevel" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3clFb_" id="5Dc_HmSYLia" role="jymVt">
-      <property role="TrG5h" value="allowNix" />
-      <node concept="10P_77" id="5Dc_HmSYLib" role="3clF45" />
-      <node concept="3Tm1VV" id="5Dc_HmSYLic" role="1B3o_S" />
-      <node concept="2AHcQZ" id="5Dc_HmSYLig" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-      <node concept="3clFbS" id="5Dc_HmSYLih" role="3clF47">
-        <node concept="3clFbF" id="5Dc_HmSYLij" role="3cqZAp">
-          <node concept="3nyPlj" id="5Dc_HmSYLii" role="3clFbG">
-            <ref role="37wK5l" to="oq0c:26cjRACVRCY" resolve="allowNix" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3clFb_" id="5Dc_HmSYLik" role="jymVt">
-      <property role="TrG5h" value="process" />
-      <node concept="3uibUv" id="5Dc_HmSYLil" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-      </node>
-      <node concept="3Tm1VV" id="5Dc_HmSYLim" role="1B3o_S" />
-      <node concept="37vLTG" id="5Dc_HmSYLin" role="3clF46">
-        <property role="TrG5h" value="s" />
-        <node concept="3uibUv" id="5Dc_HmSYLio" role="1tU5fm">
-          <ref role="3uigEE" to="xfg9:3nVyItrYOkv" resolve="NixSupport" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5Dc_HmSYLld" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-      <node concept="3clFbS" id="5Dc_HmSYLle" role="3clF47">
-        <node concept="3clFbJ" id="gg2AyaDcRi" role="3cqZAp">
-          <node concept="3clFbS" id="gg2AyaDcRk" role="3clFbx">
-            <node concept="3clFbJ" id="gg2AyaDkIE" role="3cqZAp">
-              <node concept="3clFbS" id="gg2AyaDkIG" role="3clFbx">
-                <node concept="3SKdUt" id="gg2AyaDsFq" role="3cqZAp">
-                  <node concept="1PaTwC" id="gg2AyaDsFr" role="1aUNEU">
-                    <node concept="3oM_SD" id="gg2AyaDt66" role="1PaTwD">
-                      <property role="3oM_SC" value="short-circuit," />
-                    </node>
-                    <node concept="3oM_SD" id="gg2AyaDt68" role="1PaTwD">
-                      <property role="3oM_SC" value="ignore" />
-                    </node>
-                    <node concept="3oM_SD" id="gg2AyaDt6b" role="1PaTwD">
-                      <property role="3oM_SC" value="nix" />
-                    </node>
-                    <node concept="3oM_SD" id="gg2AyaDt6f" role="1PaTwD">
-                      <property role="3oM_SC" value="semantics" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="gg2AyaDrbK" role="3cqZAp">
-                  <node concept="2OqwBi" id="gg2AyaDrg4" role="3clFbG">
-                    <node concept="37vLTw" id="gg2AyaDrbI" role="2Oq$k0">
-                      <ref role="3cqZAo" node="5Dc_HmSYLin" resolve="s" />
-                    </node>
-                    <node concept="liA8E" id="gg2AyaDrNa" role="2OqNvi">
-                      <ref role="37wK5l" to="xfg9:26cjRACMHvv" resolve="overrideResult" />
-                      <node concept="3clFbT" id="gg2AyaDs3D" role="37wK5m" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1Wc70l" id="gg2AyaDotX" role="3clFbw">
-                <node concept="3fqX7Q" id="gg2AyaDoI0" role="3uHU7w">
-                  <node concept="1eOMI4" id="gg2AyaDoI2" role="3fr31v">
-                    <node concept="2OqwBi" id="gg2AyaDq4i" role="1eOMHV">
-                      <node concept="37vLTw" id="gg2AyaDpSI" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5Dc_HmSYLin" resolve="s" />
-                      </node>
-                      <node concept="liA8E" id="gg2AyaDq_X" role="2OqNvi">
-                        <ref role="37wK5l" to="xfg9:26cjRACQf5B" resolve="getBool" />
-                        <node concept="3cmrfG" id="gg2AyaDqQ8" role="37wK5m">
-                          <property role="3cmrfH" value="0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2ZW3vV" id="gg2AyaDmSW" role="3uHU7B">
-                  <node concept="3uibUv" id="gg2AyaDnK7" role="2ZW6by">
-                    <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                  </node>
-                  <node concept="2OqwBi" id="gg2AyaDl2E" role="2ZW6bz">
-                    <node concept="37vLTw" id="gg2AyaDkXY" role="2Oq$k0">
-                      <ref role="3cqZAo" node="5Dc_HmSYLin" resolve="s" />
-                    </node>
-                    <node concept="liA8E" id="gg2AyaDl$D" role="2OqNvi">
-                      <ref role="37wK5l" to="xfg9:3nVyIts6HwG" resolve="get" />
-                      <node concept="3cmrfG" id="gg2AyaDm_N" role="37wK5m">
-                        <property role="3cmrfH" value="0" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="gg2AyaDeZq" role="3clFbw">
-            <node concept="2OqwBi" id="gg2AyaDdyx" role="2Oq$k0">
-              <node concept="37vLTw" id="gg2AyaDdbo" role="2Oq$k0">
-                <ref role="3cqZAo" node="5Dc_HmSYLin" resolve="s" />
-              </node>
-              <node concept="liA8E" id="gg2AyaDeCD" role="2OqNvi">
-                <ref role="37wK5l" to="xfg9:26cjRACWAaf" resolve="node" />
-              </node>
-            </node>
-            <node concept="1mIQ4w" id="gg2AyaDfw_" role="2OqNvi">
-              <node concept="chp4Y" id="gg2AyaDfK$" role="cj9EA">
-                <ref role="cht4Q" to="hm2y:4rZeNQ6MXOT" resolve="LogicalAndExpression" />
-              </node>
-            </node>
-          </node>
-          <node concept="3eNFk2" id="3NMMaaIJzOG" role="3eNLev">
-            <node concept="2OqwBi" id="3NMMaaIJ$YB" role="3eO9$A">
-              <node concept="2OqwBi" id="3NMMaaIJ$mx" role="2Oq$k0">
-                <node concept="37vLTw" id="3NMMaaIJ$9k" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5Dc_HmSYLin" resolve="s" />
-                </node>
-                <node concept="liA8E" id="3NMMaaIJ$xl" role="2OqNvi">
-                  <ref role="37wK5l" to="xfg9:26cjRACWAaf" resolve="node" />
-                </node>
-              </node>
-              <node concept="1mIQ4w" id="3NMMaaIJ__6" role="2OqNvi">
-                <node concept="chp4Y" id="3NMMaaIJ_U0" role="cj9EA">
-                  <ref role="cht4Q" to="hm2y:4rZeNQ6MXMV" resolve="LogicalOrExpression" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbS" id="3NMMaaIJzOI" role="3eOfB_">
-              <node concept="3clFbJ" id="3NMMaaIJAfO" role="3cqZAp">
-                <node concept="1Wc70l" id="3NMMaaIJCWd" role="3clFbw">
-                  <node concept="2OqwBi" id="3NMMaaIJDu9" role="3uHU7w">
-                    <node concept="37vLTw" id="3NMMaaIJDc_" role="2Oq$k0">
-                      <ref role="3cqZAo" node="5Dc_HmSYLin" resolve="s" />
-                    </node>
-                    <node concept="liA8E" id="3NMMaaIJDZA" role="2OqNvi">
-                      <ref role="37wK5l" to="xfg9:26cjRACQf5B" resolve="getBool" />
-                      <node concept="3cmrfG" id="3NMMaaIJEg6" role="37wK5m">
-                        <property role="3cmrfH" value="0" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2ZW3vV" id="3NMMaaIJBQs" role="3uHU7B">
-                    <node concept="3uibUv" id="3NMMaaIJCjl" role="2ZW6by">
-                      <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                    </node>
-                    <node concept="2OqwBi" id="3NMMaaIJATq" role="2ZW6bz">
-                      <node concept="37vLTw" id="3NMMaaIJACn" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5Dc_HmSYLin" resolve="s" />
-                      </node>
-                      <node concept="liA8E" id="3NMMaaIJBhd" role="2OqNvi">
-                        <ref role="37wK5l" to="xfg9:3nVyIts6HwG" resolve="get" />
-                        <node concept="3cmrfG" id="3NMMaaIJBxF" role="37wK5m">
-                          <property role="3cmrfH" value="0" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbS" id="3NMMaaIJAfQ" role="3clFbx">
-                  <node concept="3clFbF" id="3NMMaaIJEzJ" role="3cqZAp">
-                    <node concept="2OqwBi" id="3NMMaaIJEOi" role="3clFbG">
-                      <node concept="37vLTw" id="3NMMaaIJEzI" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5Dc_HmSYLin" resolve="s" />
-                      </node>
-                      <node concept="liA8E" id="3NMMaaIJFm8" role="2OqNvi">
-                        <ref role="37wK5l" to="xfg9:26cjRACMHvv" resolve="overrideResult" />
-                        <node concept="3clFbT" id="3NMMaaIJFAO" role="37wK5m">
-                          <property role="3clFbU" value="true" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5Dc_HmSYLlh" role="3cqZAp">
-          <node concept="3nyPlj" id="5Dc_HmSYLlg" role="3clFbG">
-            <ref role="37wK5l" to="oq0c:26cjRACVSf0" resolve="process" />
-            <node concept="37vLTw" id="5Dc_HmSYLlf" role="37wK5m">
-              <ref role="3cqZAo" node="5Dc_HmSYLin" resolve="s" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3Tm1VV" id="5Dc_HmSYPqM" role="1B3o_S" />
-    <node concept="3uibUv" id="5Dc_HmSYQGK" role="1zkMxy">
-      <ref role="3uigEE" to="oq0c:26cjRACVR5c" resolve="DefaultNixHandler" />
-    </node>
-  </node>
-</model>
-
diff --git a/code/languages/org.iets3.opensource/solutions/test.nixHandlers.expr.os/models/test.nixHandler.expr.os.shortcircuit@tests.mps b/code/languages/org.iets3.opensource/solutions/test.nixHandlers.expr.os/models/test.nixHandler.expr.os.shortcircuit@tests.mps
index 7191916512..e69de29bb2 100644
--- a/code/languages/org.iets3.opensource/solutions/test.nixHandlers.expr.os/models/test.nixHandler.expr.os.shortcircuit@tests.mps
+++ b/code/languages/org.iets3.opensource/solutions/test.nixHandlers.expr.os/models/test.nixHandler.expr.os.shortcircuit@tests.mps
@@ -1,367 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:b1d5d1fb-c08e-4ad4-ad15-50e8bc8ef598(test.nixHandler.expr.os.shortcircuit@tests)">
-  <persistence version="9" />
-  <attribute name="doNotGenerate" value="false" />
-  <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
-    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-    <devkit ref="c4e521ab-b605-4ef9-a7c3-68075da058f0(org.iets3.core.expr.core.devkit)" />
-  </languages>
-  <imports>
-    <import index="bmr5" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.structure(MPS.Core/)" />
-    <import index="oq0c" ref="r:6c6155f0-4bbe-4af5-8c26-244d570e21e4(org.iets3.core.expr.base.plugin)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
-    <import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" />
-    <import index="2i99" ref="r:4aec2398-127d-4103-a988-e8ae795c16d8(test.nixHandler.expr.os.shortcircuit)" />
-  </imports>
-  <registry>
-    <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
-      <concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
-        <property id="5097124989038916363" name="projectPath" index="2XOHcw" />
-      </concept>
-      <concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
-        <property id="2616911529524314943" name="accessMode" index="3DII0k" />
-        <child id="1217501822150" name="nodesToCheck" index="1SKRRt" />
-        <child id="1217501895093" name="testMethods" index="1SL9yI" />
-      </concept>
-      <concept id="1216989428737" name="jetbrains.mps.lang.test.structure.TestNode" flags="ng" index="1qefOq">
-        <child id="1216989461394" name="nodeToCheck" index="1qenE9" />
-      </concept>
-      <concept id="1210673684636" name="jetbrains.mps.lang.test.structure.TestNodeAnnotation" flags="ng" index="3xLA65" />
-      <concept id="1210674524691" name="jetbrains.mps.lang.test.structure.TestNodeReference" flags="nn" index="3xONca">
-        <reference id="1210674534086" name="declaration" index="3xOPvv" />
-      </concept>
-      <concept id="1225978065297" name="jetbrains.mps.lang.test.structure.SimpleNodeTest" flags="ng" index="1LZb2c" />
-    </language>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
-        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
-      </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
-        <child id="1188208488637" name="annotation" index="2AJF6D" />
-      </concept>
-      <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
-        <reference id="2820489544401957798" name="classifier" index="HV5vE" />
-      </concept>
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
-        <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
-      </concept>
-      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
-        <child id="1145553007750" name="creator" index="2ShVmc" />
-      </concept>
-      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
-        <property id="1070475926801" name="value" index="Xl_RC" />
-      </concept>
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </concept>
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <child id="1095933932569" name="implementedInterface" index="EKbjA" />
-      </concept>
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
-        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </concept>
-      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
-        <child id="1068581517676" name="expression" index="3cqZAk" />
-      </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-        <child id="1109201940907" name="parameter" index="11_B2D" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-    </language>
-    <language id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base">
-      <concept id="5115872837156724025" name="org.iets3.core.expr.base.structure.LogicalAndExpression" flags="ng" index="30deo4" />
-      <concept id="5115872837156723899" name="org.iets3.core.expr.base.structure.LogicalOrExpression" flags="ng" index="30deu6" />
-      <concept id="5115872837156576277" name="org.iets3.core.expr.base.structure.BinaryExpression" flags="ng" index="30dEsC">
-        <child id="5115872837156576280" name="right" index="30dEs_" />
-        <child id="5115872837156576278" name="left" index="30dEsF" />
-      </concept>
-      <concept id="3889855429450038473" name="org.iets3.core.expr.base.structure.EmptyValue" flags="ng" index="1I1voI" />
-      <concept id="5955298286257997823" name="org.iets3.core.expr.base.structure.ColonCast" flags="ng" index="1LgZZ2">
-        <child id="5955298286257997833" name="type" index="1LgZ0O" />
-        <child id="5955298286257997830" name="expr" index="1LgZ0V" />
-      </concept>
-    </language>
-    <language id="6b277d9a-d52d-416f-a209-1919bd737f50" name="org.iets3.core.expr.simpleTypes">
-      <concept id="7425695345928358745" name="org.iets3.core.expr.simpleTypes.structure.TrueLiteral" flags="ng" index="2vmpnb" />
-      <concept id="7425695345928358774" name="org.iets3.core.expr.simpleTypes.structure.FalseLiteral" flags="ng" index="2vmpn$" />
-      <concept id="7425695345928349207" name="org.iets3.core.expr.simpleTypes.structure.BooleanType" flags="ng" index="2vmvy5" />
-    </language>
-    <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="8427750732757990717" name="jetbrains.mps.baseLanguage.unitTest.structure.BinaryAssert" flags="nn" index="3tpDYu">
-        <child id="8427750732757990725" name="actual" index="3tpDZA" />
-        <child id="8427750732757990724" name="expected" index="3tpDZB" />
-      </concept>
-      <concept id="1171978097730" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertEquals" flags="nn" index="3vlDli" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="2XOHcx" id="5Dc_HmSXvSC">
-    <property role="2XOHcw" value="${iets3.github.opensource.home}/code/languages/org.iets3.opensource" />
-  </node>
-  <node concept="1lH9Xt" id="62nr1ERfbg">
-    <property role="TrG5h" value="NixHandlerCanShortCircuit" />
-    <property role="3DII0k" value="2hh8MJdVwqX/command" />
-    <node concept="1LZb2c" id="62nr1ERfiB" role="1SL9yI">
-      <property role="TrG5h" value="logAnd_can_shortcircuit" />
-      <node concept="3cqZAl" id="62nr1ERfiC" role="3clF45" />
-      <node concept="3clFbS" id="62nr1ERfiG" role="3clF47">
-        <node concept="3clFbF" id="3NMMaaIJOnE" role="3cqZAp">
-          <node concept="2YIFZM" id="3NMMaaIJW8q" role="3clFbG">
-            <ref role="37wK5l" to="xfg9:3NMMaaIJODH" resolve="prioritizeTemporarily" />
-            <ref role="1Pybhc" to="xfg9:26cjRACVUHi" resolve="NSF" />
-            <node concept="2ShNRf" id="3NMMaaIJWdR" role="37wK5m">
-              <node concept="HV5vD" id="3NMMaaIJWF5" role="2ShVmc">
-                <ref role="HV5vE" to="2i99:5Dc_HmSYPqL" resolve="ShortCircuitNixHandler" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="55jgfXqmtHt" role="3cqZAp">
-          <node concept="3cpWsn" id="55jgfXqmtHu" role="3cpWs9">
-            <property role="TrG5h" value="evaluate" />
-            <node concept="3uibUv" id="55jgfXqmtFY" role="1tU5fm">
-              <ref role="3uigEE" to="pbu6:4Pi6J8Cccqb" resolve="ValueAndTraceAndEnv" />
-            </node>
-            <node concept="2OqwBi" id="55jgfXqmtHv" role="33vP2m">
-              <node concept="2ShNRf" id="55jgfXqmtHw" role="2Oq$k0">
-                <node concept="HV5vD" id="55jgfXqmtHx" role="2ShVmc">
-                  <property role="373rjd" value="true" />
-                  <ref role="HV5vE" to="pbu6:2nydsCfyYD0" resolve="IETS3ExprEvaluator" />
-                </node>
-              </node>
-              <node concept="liA8E" id="55jgfXqmtHy" role="2OqNvi">
-                <ref role="37wK5l" to="pbu6:2nydsCfz7eH" resolve="evaluate" />
-                <node concept="3xONca" id="55jgfXqmtHz" role="37wK5m">
-                  <ref role="3xOPvv" node="62nr1ERfhf" resolve="false_empty" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3foEyWS3ugb" role="3cqZAp">
-          <node concept="2YIFZM" id="3foEyWS3uun" role="3clFbG">
-            <ref role="37wK5l" to="xfg9:31HAhmC_A$8" resolve="reset" />
-            <ref role="1Pybhc" to="xfg9:26cjRACVUHi" resolve="NSF" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="3NMMaaIDYun" role="3cqZAp" />
-        <node concept="3vlDli" id="3NMMaaIDXsj" role="3cqZAp">
-          <node concept="3clFbT" id="3NMMaaIDXzn" role="3tpDZA" />
-          <node concept="2OqwBi" id="55jgfXqmuAo" role="3tpDZB">
-            <node concept="37vLTw" id="55jgfXqmuvi" role="2Oq$k0">
-              <ref role="3cqZAo" node="55jgfXqmtHu" resolve="evaluate" />
-            </node>
-            <node concept="2OwXpG" id="55jgfXqmuI9" role="2OqNvi">
-              <ref role="2Oxat5" to="pbu6:7lHetQyBz3x" resolve="value" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="62nr1EUbP6" role="3cqZAp" />
-      </node>
-    </node>
-    <node concept="1LZb2c" id="3NMMaaIE29V" role="1SL9yI">
-      <property role="TrG5h" value="logOr_can_shortcircuit" />
-      <node concept="3cqZAl" id="3NMMaaIE29W" role="3clF45" />
-      <node concept="3clFbS" id="3NMMaaIE2a0" role="3clF47">
-        <node concept="3clFbF" id="3NMMaaIJX07" role="3cqZAp">
-          <node concept="2YIFZM" id="3NMMaaIJX1z" role="3clFbG">
-            <ref role="37wK5l" to="xfg9:3NMMaaIJODH" resolve="prioritizeTemporarily" />
-            <ref role="1Pybhc" to="xfg9:26cjRACVUHi" resolve="NSF" />
-            <node concept="2ShNRf" id="3NMMaaIJX2F" role="37wK5m">
-              <node concept="HV5vD" id="3NMMaaIJXwK" role="2ShVmc">
-                <ref role="HV5vE" to="2i99:5Dc_HmSYPqL" resolve="ShortCircuitNixHandler" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="55jgfXqmzrN" role="3cqZAp">
-          <node concept="3cpWsn" id="55jgfXqmzrO" role="3cpWs9">
-            <property role="TrG5h" value="evaluate" />
-            <node concept="3uibUv" id="55jgfXqmzqn" role="1tU5fm">
-              <ref role="3uigEE" to="pbu6:4Pi6J8Cccqb" resolve="ValueAndTraceAndEnv" />
-            </node>
-            <node concept="2OqwBi" id="55jgfXqmzrP" role="33vP2m">
-              <node concept="2ShNRf" id="55jgfXqmzrQ" role="2Oq$k0">
-                <node concept="HV5vD" id="55jgfXqmzrR" role="2ShVmc">
-                  <property role="373rjd" value="true" />
-                  <ref role="HV5vE" to="pbu6:2nydsCfyYD0" resolve="IETS3ExprEvaluator" />
-                </node>
-              </node>
-              <node concept="liA8E" id="55jgfXqmzrS" role="2OqNvi">
-                <ref role="37wK5l" to="pbu6:2nydsCfz7eH" resolve="evaluate" />
-                <node concept="3xONca" id="55jgfXqmzrT" role="37wK5m">
-                  <ref role="3xOPvv" node="3NMMaaIE2n4" resolve="true_empty" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3NMMaaIE2hY" role="3cqZAp">
-          <node concept="2YIFZM" id="3NMMaaIE2hZ" role="3clFbG">
-            <ref role="1Pybhc" to="xfg9:26cjRACVUHi" resolve="NSF" />
-            <ref role="37wK5l" to="xfg9:31HAhmC_A$8" resolve="reset" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="3NMMaaIE2i0" role="3cqZAp" />
-        <node concept="3vlDli" id="3NMMaaIE2i1" role="3cqZAp">
-          <node concept="2OqwBi" id="55jgfXqmzGt" role="3tpDZB">
-            <node concept="37vLTw" id="3NMMaaIE2i2" role="2Oq$k0">
-              <ref role="3cqZAo" node="55jgfXqmzrO" resolve="evaluate" />
-            </node>
-            <node concept="2OwXpG" id="55jgfXqm$4o" role="2OqNvi">
-              <ref role="2Oxat5" to="pbu6:7lHetQyBz3x" resolve="value" />
-            </node>
-          </node>
-          <node concept="3clFbT" id="3NMMaaIE2pI" role="3tpDZA">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1qefOq" id="62nr1ERffj" role="1SKRRt">
-      <node concept="30deo4" id="62nr1ERffn" role="1qenE9">
-        <node concept="1LgZZ2" id="62nr1ERfgq" role="30dEs_">
-          <node concept="2vmvy5" id="62nr1ERfgT" role="1LgZ0O" />
-          <node concept="1I1voI" id="62nr1ERfg7" role="1LgZ0V" />
-        </node>
-        <node concept="3xLA65" id="62nr1ERfhf" role="lGtFl">
-          <property role="TrG5h" value="false_empty" />
-        </node>
-        <node concept="2vmpn$" id="31HAhmCyQGu" role="30dEsF" />
-      </node>
-    </node>
-    <node concept="1qefOq" id="3NMMaaIE2lc" role="1SKRRt">
-      <node concept="30deu6" id="3NMMaaIE2lA" role="1qenE9">
-        <node concept="1LgZZ2" id="3NMMaaIE2mf" role="30dEs_">
-          <node concept="2vmvy5" id="3NMMaaIE2mI" role="1LgZ0O" />
-          <node concept="1I1voI" id="3NMMaaIE2lW" role="1LgZ0V" />
-        </node>
-        <node concept="2vmpnb" id="3NMMaaIE2lv" role="30dEsF" />
-        <node concept="3xLA65" id="3NMMaaIE2n4" role="lGtFl">
-          <property role="TrG5h" value="true_empty" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="312cEu" id="62nr1ESOUa">
-    <property role="TrG5h" value="ShortCircuitNixHandlerExtension" />
-    <node concept="3Tm1VV" id="62nr1ESOUb" role="1B3o_S" />
-    <node concept="3uibUv" id="62nr1ESOVs" role="EKbjA">
-      <ref role="3uigEE" to="bmr5:~Extension" resolve="Extension" />
-      <node concept="3uibUv" id="62nr1ESOVP" role="11_B2D">
-        <ref role="3uigEE" to="oq0c:26cjRACVMdy" resolve="NixHandler" />
-      </node>
-    </node>
-    <node concept="3clFb_" id="62nr1ESOWl" role="jymVt">
-      <property role="TrG5h" value="getExtensionPointId" />
-      <node concept="3Tm1VV" id="62nr1ESOWm" role="1B3o_S" />
-      <node concept="3uibUv" id="62nr1ESOWo" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-      </node>
-      <node concept="3clFbS" id="62nr1ESOWp" role="3clF47">
-        <node concept="3cpWs6" id="62nr1EUm7p" role="3cqZAp">
-          <node concept="Xl_RD" id="62nr1EUmgU" role="3cqZAk">
-            <property role="Xl_RC" value="org.iets3.core.expr.base.nixHandler" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="62nr1ESOWq" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="3clFb_" id="62nr1ESOWt" role="jymVt">
-      <property role="TrG5h" value="get" />
-      <node concept="3Tm1VV" id="62nr1ESOWu" role="1B3o_S" />
-      <node concept="3uibUv" id="62nr1ESOWx" role="3clF45">
-        <ref role="3uigEE" to="oq0c:26cjRACVMdy" resolve="NixHandler" />
-      </node>
-      <node concept="3clFbS" id="62nr1ESOWy" role="3clF47">
-        <node concept="3cpWs6" id="62nr1ESQgr" role="3cqZAp">
-          <node concept="2ShNRf" id="62nr1ESQm_" role="3cqZAk">
-            <node concept="HV5vD" id="62nr1ESQE$" role="2ShVmc">
-              <ref role="HV5vE" to="2i99:5Dc_HmSYPqL" resolve="ShortCircuitNixHandler" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="62nr1ESOWz" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="3clFb_" id="62nr1ESOW$" role="jymVt">
-      <property role="TrG5h" value="activate" />
-      <node concept="3Tm1VV" id="62nr1ESOW_" role="1B3o_S" />
-      <node concept="3cqZAl" id="62nr1ESOWB" role="3clF45" />
-      <node concept="3clFbS" id="62nr1ESOWC" role="3clF47" />
-      <node concept="2AHcQZ" id="62nr1ESOWD" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="3clFb_" id="62nr1ESOWE" role="jymVt">
-      <property role="TrG5h" value="deactivate" />
-      <node concept="3Tm1VV" id="62nr1ESOWF" role="1B3o_S" />
-      <node concept="3cqZAl" id="62nr1ESOWH" role="3clF45" />
-      <node concept="3clFbS" id="62nr1ESOWI" role="3clF47" />
-      <node concept="2AHcQZ" id="62nr1ESOWJ" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-  </node>
-</model>
-
diff --git a/code/languages/org.iets3.opensource/solutions/test.nixHandlers.expr.os/test.nixHandlers.expr.os.msd b/code/languages/org.iets3.opensource/solutions/test.nixHandlers.expr.os/test.nixHandlers.expr.os.msd
index f1605a8199..e69de29bb2 100644
--- a/code/languages/org.iets3.opensource/solutions/test.nixHandlers.expr.os/test.nixHandlers.expr.os.msd
+++ b/code/languages/org.iets3.opensource/solutions/test.nixHandlers.expr.os/test.nixHandlers.expr.os.msd
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<solution name="test.nixHandlers.expr.os" uuid="dfbe64e8-4da4-4fad-a171-e31934e6cdae" moduleVersion="0">
-  <models>
-    <modelRoot contentPath="${module}" type="default">
-      <sourceRoot location="models" />
-    </modelRoot>
-  </models>
-  <facets>
-    <facet type="java">
-      <classes generated="true" path="${module}/classes_gen" />
-    </facet>
-  </facets>
-  <dependencies>
-    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
-    <dependency reexport="false">cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</dependency>
-    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)</dependency>
-    <dependency reexport="false">c0080a47-7e37-4558-bee9-9ae18e690549(jetbrains.mps.lang.extension)</dependency>
-  </dependencies>
-  <languageVersions>
-    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
-    <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
-    <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
-    <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
-    <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
-    <language slang="l:3819ba36-98f4-49ac-b779-34f3a458c09b:com.mbeddr.mpsutil.varscope" version="0" />
-    <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
-    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-    <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
-    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
-    <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:db8bd035-3f51-41d8-8fed-954c202d18be:org.iets3.analysis.base" version="0" />
-    <language slang="l:7b68d745-a7b8-48b9-bd9c-05c0f8725a35:org.iets3.core.base" version="0" />
-    <language slang="l:cfaa4966-b7d5-4b69-b66a-309a6e1a7290:org.iets3.core.expr.base" version="3" />
-    <language slang="l:2f7e2e35-6e74-4c43-9fa5-2465d68f5996:org.iets3.core.expr.collections" version="5" />
-    <language slang="l:9464fa06-5ab9-409b-9274-64ab29588457:org.iets3.core.expr.lambda" version="1" />
-    <language slang="l:f3eafff0-30d2-46d6-9150-f0f3b880ce27:org.iets3.core.expr.path" version="0" />
-    <language slang="l:18001c94-33a7-4f68-a7c1-ffddc4b39be1:org.iets3.core.expr.repl" version="0" />
-    <language slang="l:089e75a3-0ccc-4e10-9aa3-dc4229925447:org.iets3.core.expr.shortcircuit" version="0" />
-    <language slang="l:6b277d9a-d52d-416f-a209-1919bd737f50:org.iets3.core.expr.simpleTypes" version="1" />
-    <language slang="l:7bcf9284-ca29-484f-a3b3-2855bdd813ad:org.iets3.core.expr.simpleTypes.tests" version="0" />
-    <language slang="l:d441fba0-f46b-43cd-b723-dad7b65da615:org.iets3.core.expr.tests" version="1" />
-    <language slang="l:71934284-d7d1-45ee-a054-8c072591085f:org.iets3.core.expr.toplevel" version="4" />
-    <language slang="l:63c1aad1-e2db-439c-a30a-02b5e0bc80f3:org.iets3.core.expr.tracing" version="0" />
-  </languageVersions>
-  <dependencyVersions>
-    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
-    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
-    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-    <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
-    <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
-    <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
-    <module reference="47f075a6-558e-4640-a606-7ce0236c8023(com.mbeddr.mpsutil.interpreter)" version="0" />
-    <module reference="735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)" version="0" />
-    <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
-    <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
-    <module reference="726886d1-ef90-4249-a08f-1e3ec23a7113(com.mbeddr.mpsutil.traceExplorer)" version="0" />
-    <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
-    <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
-    <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
-    <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
-    <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
-    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
-    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
-    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
-    <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
-    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
-    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-    <module reference="c0080a47-7e37-4558-bee9-9ae18e690549(jetbrains.mps.lang.extension)" version="0" />
-    <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
-    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
-    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
-    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)" version="1" />
-    <module reference="7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)" version="0" />
-    <module reference="cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)" version="1" />
-    <module reference="dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)" version="0" />
-    <module reference="089e75a3-0ccc-4e10-9aa3-dc4229925447(org.iets3.core.expr.shortcircuit)" version="2" />
-    <module reference="43feb85e-76cd-4fc3-9c84-9f9f876a07b2(org.iets3.core.expr.shortcircuit)" version="0" />
-    <module reference="b0e7c6a8-b47d-4637-b0e8-e5bfd486c4e8(org.iets3.core.expr.tracing.plugin)" version="0" />
-    <module reference="dfbe64e8-4da4-4fad-a171-e31934e6cdae(test.nixHandlers.expr.os)" version="0" />
-  </dependencyVersions>
-</solution>
-
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/operatorgroup@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/operatorgroup@tests.mps
index 90745acacf..981b6f88f3 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/operatorgroup@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/operatorgroup@tests.mps
@@ -23,7 +23,7 @@
       </concept>
       <concept id="8560722270289800014" name="org.iets3.core.expr.base.structure.PlusTag" flags="ng" index="zEY32" />
       <concept id="8560722270290706287" name="org.iets3.core.expr.base.structure.MulTag" flags="ng" index="zJzjz" />
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="8006404979729416973" name="org.iets3.core.expr.base.structure.OrTag" flags="ng" index="2BFbn_" />
@@ -71,7 +71,7 @@
       <concept id="543569365052765011" name="org.iets3.core.expr.toplevel.structure.EmptyToplevelContent" flags="ng" index="_ixoA" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -180,7 +180,7 @@
             <ref role="_emDf" node="1Z72MIc6zOc" resolve="nix" />
           </node>
         </node>
-        <node concept="1I1voI" id="9vzvxuuj$u" role="_fkuS" />
+        <node concept="2vmpn$" id="skNXYt2YZ2" role="_fkuS" />
       </node>
       <node concept="_fkuZ" id="1Z72MIc6xWE" role="_fkp5">
         <node concept="_fku$" id="1Z72MIc6xWF" role="_fkur" />
@@ -190,7 +190,7 @@
             <ref role="_emDf" node="1Z72MIc6zOc" resolve="nix" />
           </node>
         </node>
-        <node concept="1I1voI" id="9vzvxuujzP" role="_fkuS" />
+        <node concept="2vmpn$" id="1Z72MIc6$Bp" role="_fkuS" />
       </node>
       <node concept="_fkuZ" id="4EEJFuvaWda" role="_fkp5">
         <node concept="_fku$" id="4EEJFuvaWdb" role="_fkur" />
@@ -202,28 +202,6 @@
         </node>
         <node concept="1I1voI" id="4EEJFuvb1SV" role="_fkuS" />
       </node>
-      <node concept="_fkuZ" id="9vzvxuuiKy" role="_fkp5">
-        <node concept="_fku$" id="9vzvxuuiKz" role="_fkur" />
-        <node concept="30deo4" id="9vzvxuuiLr" role="_fkuY">
-          <node concept="2vmpnb" id="9vzvxuuiN1" role="30dEs_" />
-          <node concept="_emDc" id="9vzvxuuiLi" role="30dEsF">
-            <ref role="_emDf" node="1Z72MIc6zOc" resolve="nix" />
-          </node>
-        </node>
-        <node concept="1I1voI" id="9vzvxuuiOH" role="_fkuS" />
-      </node>
-      <node concept="_fkuZ" id="9vzvxuuj_0" role="_fkp5">
-        <node concept="_fku$" id="9vzvxuuj_1" role="_fkur" />
-        <node concept="30deo4" id="9vzvxuuj_N" role="_fkuY">
-          <node concept="_emDc" id="9vzvxuujBJ" role="30dEs_">
-            <ref role="_emDf" node="1Z72MIc6zOc" resolve="nix" />
-          </node>
-          <node concept="_emDc" id="9vzvxuuj_E" role="30dEsF">
-            <ref role="_emDf" node="1Z72MIc6zOc" resolve="nix" />
-          </node>
-        </node>
-        <node concept="1I1voI" id="9vzvxuujDM" role="_fkuS" />
-      </node>
     </node>
     <node concept="_ixoA" id="6WstIz8H_Uq" role="_iOnB" />
     <node concept="_fkuM" id="6WstIz8H_Nn" role="_iOnB">
@@ -312,7 +290,7 @@
             <ref role="_emDf" node="1Z72MIc6zOc" resolve="nix" />
           </node>
         </node>
-        <node concept="1I1voI" id="3Kn0W5CyVuL" role="_fkuS" />
+        <node concept="2vmpnb" id="1Z72MIcLNFS" role="_fkuS" />
       </node>
       <node concept="_fkuZ" id="4EEJFuvb98G" role="_fkp5">
         <node concept="_fku$" id="4EEJFuvb98H" role="_fkur" />
@@ -324,16 +302,6 @@
         </node>
         <node concept="1I1voI" id="4EEJFuvb99T" role="_fkuS" />
       </node>
-      <node concept="_fkuZ" id="9vzvxuuj1U" role="_fkp5">
-        <node concept="_fku$" id="9vzvxuuj1V" role="_fkur" />
-        <node concept="30deu6" id="9vzvxuuj2B" role="_fkuY">
-          <node concept="2vmpn$" id="9vzvxuuj4r" role="30dEs_" />
-          <node concept="_emDc" id="9vzvxuuj2u" role="30dEsF">
-            <ref role="_emDf" node="1Z72MIc6zOc" resolve="nix" />
-          </node>
-        </node>
-        <node concept="1I1voI" id="3Kn0W5CyVu9" role="_fkuS" />
-      </node>
       <node concept="_fkuZ" id="4EEJFuvb9a1" role="_fkp5">
         <node concept="_fku$" id="4EEJFuvb9a2" role="_fkur" />
         <node concept="30deu6" id="4EEJFuvmDD3" role="_fkuY">
@@ -342,19 +310,7 @@
           </node>
           <node concept="2vmpnb" id="4EEJFuvb9bm" role="30dEs_" />
         </node>
-        <node concept="1I1voI" id="3Kn0W5CyVut" role="_fkuS" />
-      </node>
-      <node concept="_fkuZ" id="3Kn0W5CyVvj" role="_fkp5">
-        <node concept="_fku$" id="3Kn0W5CyVvk" role="_fkur" />
-        <node concept="30deu6" id="3Kn0W5CyVwd" role="_fkuY">
-          <node concept="_emDc" id="3Kn0W5CyVyk" role="30dEs_">
-            <ref role="_emDf" node="1Z72MIc6zOc" resolve="nix" />
-          </node>
-          <node concept="_emDc" id="3Kn0W5CyVw4" role="30dEsF">
-            <ref role="_emDf" node="1Z72MIc6zOc" resolve="nix" />
-          </node>
-        </node>
-        <node concept="1I1voI" id="3Kn0W5CyV$y" role="_fkuS" />
+        <node concept="2vmpnb" id="4EEJFuvb9bJ" role="_fkuS" />
       </node>
     </node>
     <node concept="_ixoA" id="4EEJFuvb9lq" role="_iOnB" />
diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.nix@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.nix@tests.mps
index d6ddebcb7a..c6b4037dee 100644
--- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.nix@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.nix@tests.mps
@@ -19,7 +19,7 @@
       </concept>
     </language>
     <language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
-      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
+      <concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
         <property id="7831630342157089649" name="__hash" index="0Rz4W" />
       </concept>
     </language>
@@ -30,7 +30,7 @@
       <concept id="606861080870797309" name="org.iets3.core.expr.base.structure.IfElseSection" flags="ng" index="pf3Wd">
         <child id="606861080870797310" name="expr" index="pf3We" />
       </concept>
-      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
+      <concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
         <child id="7089558164905593725" name="type" index="2zM23F" />
       </concept>
       <concept id="5115872837156802409" name="org.iets3.core.expr.base.structure.UnaryExpression" flags="ng" index="30czhk">
@@ -43,8 +43,6 @@
       <concept id="5115872837156687891" name="org.iets3.core.expr.base.structure.LessEqualsExpression" flags="ng" index="30d6GI" />
       <concept id="5115872837156687890" name="org.iets3.core.expr.base.structure.LessExpression" flags="ng" index="30d6GJ" />
       <concept id="5115872837156687764" name="org.iets3.core.expr.base.structure.GreaterExpression" flags="ng" index="30d7iD" />
-      <concept id="5115872837156724025" name="org.iets3.core.expr.base.structure.LogicalAndExpression" flags="ng" index="30deo4" />
-      <concept id="5115872837156723899" name="org.iets3.core.expr.base.structure.LogicalOrExpression" flags="ng" index="30deu6" />
       <concept id="5115872837156652603" name="org.iets3.core.expr.base.structure.DivExpression" flags="ng" index="30dvO6" />
       <concept id="5115872837156652453" name="org.iets3.core.expr.base.structure.MinusExpression" flags="ng" index="30dvUo" />
       <concept id="5115872837156578671" name="org.iets3.core.expr.base.structure.MulExpression" flags="ng" index="30dDTi" />
@@ -145,7 +143,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -1855,119 +1853,6 @@
       </node>
     </node>
     <node concept="_ixoA" id="58wi_gLzyXE" role="_iOnB" />
-    <node concept="_fkuM" id="5cmHGck_VLS" role="_iOnB">
-      <property role="TrG5h" value="LogicAndBoolean" />
-      <node concept="_fkuZ" id="5cmHGck_VOa" role="_fkp5">
-        <node concept="_fku$" id="5cmHGck_VOb" role="_fkur" />
-        <node concept="30deo4" id="5cmHGck_YUj" role="_fkuY">
-          <node concept="_emDc" id="5cmHGck_YUA" role="30dEs_">
-            <ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
-          </node>
-          <node concept="2vmpnb" id="5cmHGck_YU9" role="30dEsF" />
-        </node>
-        <node concept="1I1voI" id="5cmHGck_YY8" role="_fkuS" />
-      </node>
-      <node concept="_fkuZ" id="5cmHGck_VOq" role="_fkp5">
-        <node concept="_fku$" id="5cmHGck_VOr" role="_fkur" />
-        <node concept="30deo4" id="5cmHGck_YYu" role="_fkuY">
-          <node concept="2vmpnb" id="5cmHGck_Z1J" role="30dEs_" />
-          <node concept="_emDc" id="5cmHGck_YYl" role="30dEsF">
-            <ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
-          </node>
-        </node>
-        <node concept="1I1voI" id="5cmHGck_Z57" role="_fkuS" />
-      </node>
-      <node concept="_fkuZ" id="5cmHGck_VOP" role="_fkp5">
-        <node concept="_fku$" id="5cmHGck_VOQ" role="_fkur" />
-        <node concept="30deo4" id="5cmHGck_Z5z" role="_fkuY">
-          <node concept="_emDc" id="5cmHGck_Z5Q" role="30dEs_">
-            <ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
-          </node>
-          <node concept="2vmpn$" id="5cmHGck_Z5o" role="30dEsF" />
-        </node>
-        <node concept="1I1voI" id="5cmHGck_Z6h" role="_fkuS" />
-      </node>
-      <node concept="_fkuZ" id="5cmHGck_VPo" role="_fkp5">
-        <node concept="_fku$" id="5cmHGck_VPp" role="_fkur" />
-        <node concept="30deo4" id="5cmHGck_Z6B" role="_fkuY">
-          <node concept="2vmpn$" id="5cmHGck_Zai" role="30dEs_" />
-          <node concept="_emDc" id="5cmHGck_Z6u" role="30dEsF">
-            <ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
-          </node>
-        </node>
-        <node concept="1I1voI" id="5cmHGck_Ze2" role="_fkuS" />
-      </node>
-      <node concept="_fkuZ" id="5cmHGck_VQ3" role="_fkp5">
-        <node concept="_fku$" id="5cmHGck_VQ4" role="_fkur" />
-        <node concept="30deo4" id="5cmHGck_Zes" role="_fkuY">
-          <node concept="_emDc" id="5cmHGck_Zif" role="30dEs_">
-            <ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
-          </node>
-          <node concept="_emDc" id="5cmHGck_Zef" role="30dEsF">
-            <ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
-          </node>
-        </node>
-        <node concept="1I1voI" id="5cmHGck_ZF2" role="_fkuS" />
-      </node>
-    </node>
-    <node concept="_ixoA" id="5cmHGck_VJB" role="_iOnB" />
-    <node concept="_fkuM" id="5cmHGckA0ii" role="_iOnB">
-      <property role="TrG5h" value="LogicOrBoolean" />
-      <node concept="_fkuZ" id="5cmHGck_ZmG" role="_fkp5">
-        <node concept="_fku$" id="5cmHGck_ZmH" role="_fkur" />
-        <node concept="30deu6" id="5cmHGck_Z_W" role="_fkuY">
-          <node concept="_emDc" id="5cmHGck_ZAf" role="30dEs_">
-            <ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
-          </node>
-          <node concept="2vmpnb" id="5cmHGck_Z_M" role="30dEsF" />
-        </node>
-        <node concept="1I1voI" id="5cmHGck_ZJt" role="_fkuS" />
-      </node>
-      <node concept="_fkuZ" id="5cmHGck_ZnV" role="_fkp5">
-        <node concept="_fku$" id="5cmHGck_ZnW" role="_fkur" />
-        <node concept="30deu6" id="5cmHGck_ZMs" role="_fkuY">
-          <node concept="2vmpnb" id="5cmHGck_ZQP" role="30dEs_" />
-          <node concept="_emDc" id="5cmHGck_ZMj" role="30dEsF">
-            <ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
-          </node>
-        </node>
-        <node concept="1I1voI" id="5cmHGck_ZJK" role="_fkuS" />
-      </node>
-      <node concept="_fkuZ" id="5cmHGck_Zpi" role="_fkp5">
-        <node concept="_fku$" id="5cmHGck_Zpj" role="_fkur" />
-        <node concept="30deu6" id="5cmHGck_ZVu" role="_fkuY">
-          <node concept="_emDc" id="5cmHGck_ZVQ" role="30dEs_">
-            <ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
-          </node>
-          <node concept="2vmpn$" id="5cmHGck_ZVk" role="30dEsF" />
-        </node>
-        <node concept="1I1voI" id="5cmHGck_ZLN" role="_fkuS" />
-      </node>
-      <node concept="_fkuZ" id="5cmHGck_ZqL" role="_fkp5">
-        <node concept="_fku$" id="5cmHGck_ZqM" role="_fkur" />
-        <node concept="30deu6" id="5cmHGckA05$" role="_fkuY">
-          <node concept="2vmpn$" id="5cmHGckA0an" role="30dEs_" />
-          <node concept="_emDc" id="5cmHGck_ZWc" role="30dEsF">
-            <ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
-          </node>
-        </node>
-        <node concept="1I1voI" id="5cmHGck_ZM6" role="_fkuS" />
-      </node>
-      <node concept="_fkuZ" id="5cmHGck_Zso" role="_fkp5">
-        <node concept="_fku$" id="5cmHGck_Zsp" role="_fkur" />
-        <node concept="30deu6" id="5cmHGck_Ztx" role="_fkuY">
-          <node concept="_emDc" id="5cmHGck_Zxx" role="30dEs_">
-            <ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
-          </node>
-          <node concept="_emDc" id="5cmHGck_Zto" role="30dEsF">
-            <ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
-          </node>
-        </node>
-        <node concept="_emDc" id="5cmHGck_Z_$" role="_fkuS">
-          <ref role="_emDf" node="26cjRABTkwo" resolve="nix" />
-        </node>
-      </node>
-    </node>
     <node concept="1Ws0TD" id="58wi_gL$AXA" role="_iOnB">
       <property role="1WsWdv" value="TODO: this should be moved to tuples suite as soon as we support java generation for empty" />
     </node>