diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 734de72f..5a1350bf 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -14563,27 +14563,27 @@
             <node concept="3xSepi" id="5kABJYbW7G_" role="3xSepv">
               <node concept="3Aq9E8" id="5kABJYbW7GA" role="3xSepj">
                 <node concept="3I6sU6" id="5kABJYbW7GB" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="5kABJYbW7GG" role="3I6sU7">
-                    <node concept="3Aqt3T" id="5kABJYbW7GH" role="3I6s78">
-                      <ref role="3AqCNq" node="2UZNLvp9$ae" resolve="binBoolPromote" />
-                      <node concept="a7P8L" id="5kABJYbY8uI" role="3AunhB">
-                        <ref role="a7OzE" node="5kABJYbY8sX" resolve="BoolT" />
+                  <node concept="3I6s7M" id="5kABJYbW7Hs" role="3I6sU7">
+                    <node concept="3Aqt3T" id="5kABJYbW7Ht" role="3I6s78">
+                      <ref role="3AqCNq" node="6GdDF7xafVj" resolve="binNumPromoteFine" />
+                      <node concept="a7P8L" id="5kABJYbW7Hu" role="3AunhB">
+                        <ref role="a7OzE" node="5kABJYbW7Hj" resolve="PromT" />
                       </node>
-                      <node concept="a7P8L" id="5kABJYbW7GJ" role="3AunhB">
+                      <node concept="a7P8L" id="5kABJYbW7Hv" role="3AunhB">
                         <ref role="a7OzE" node="5kABJYbW7Hh" resolve="T1" />
                       </node>
-                      <node concept="a7P8L" id="5kABJYbW7GK" role="3AunhB">
+                      <node concept="a7P8L" id="5kABJYbW7Hw" role="3AunhB">
                         <ref role="a7OzE" node="5kABJYbW7Hi" resolve="T2" />
                       </node>
                     </node>
                   </node>
-                  <node concept="3I6s7M" id="5kABJYbW7GL" role="3I6sU7">
-                    <node concept="3A8Hvi" id="5kABJYbWajl" role="3I6s78">
-                      <node concept="a7P8L" id="5kABJYbWaju" role="3A8wtg">
+                  <node concept="3I6s7M" id="5kABJYbWajX" role="3I6sU7">
+                    <node concept="3A8Hvi" id="5kABJYbWajY" role="3I6s78">
+                      <node concept="a7P8L" id="5kABJYbWajZ" role="3A8wtg">
                         <ref role="a7OzE" node="5kABJYbW7Hg" resolve="ResultT" />
                       </node>
-                      <node concept="a7P8L" id="5kABJYbY8vd" role="3A8w4Q">
-                        <ref role="a7OzE" node="5kABJYbY8sX" resolve="BoolT" />
+                      <node concept="a7P8L" id="5kABJYbWak0" role="3A8w4Q">
+                        <ref role="a7OzE" node="5kABJYbW7Hj" resolve="PromT" />
                       </node>
                     </node>
                   </node>
@@ -14634,27 +14634,27 @@
             <node concept="3xSepi" id="5kABJYbW7Hl" role="3xSepv">
               <node concept="3Aq9E8" id="5kABJYbW7Hm" role="3xSepj">
                 <node concept="3I6sU6" id="5kABJYbW7Hn" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="5kABJYbW7Hs" role="3I6sU7">
-                    <node concept="3Aqt3T" id="5kABJYbW7Ht" role="3I6s78">
-                      <ref role="3AqCNq" node="6GdDF7xafVj" resolve="binNumPromoteFine" />
-                      <node concept="a7P8L" id="5kABJYbW7Hu" role="3AunhB">
-                        <ref role="a7OzE" node="5kABJYbW7Hj" resolve="PromT" />
+                  <node concept="3I6s7M" id="5kABJYbW7GG" role="3I6sU7">
+                    <node concept="3Aqt3T" id="5kABJYbW7GH" role="3I6s78">
+                      <ref role="3AqCNq" node="2UZNLvp9$ae" resolve="binBoolPromote" />
+                      <node concept="a7P8L" id="5kABJYbY8uI" role="3AunhB">
+                        <ref role="a7OzE" node="5kABJYbY8sX" resolve="BoolT" />
                       </node>
-                      <node concept="a7P8L" id="5kABJYbW7Hv" role="3AunhB">
+                      <node concept="a7P8L" id="5kABJYbW7GJ" role="3AunhB">
                         <ref role="a7OzE" node="5kABJYbW7Hh" resolve="T1" />
                       </node>
-                      <node concept="a7P8L" id="5kABJYbW7Hw" role="3AunhB">
+                      <node concept="a7P8L" id="5kABJYbW7GK" role="3AunhB">
                         <ref role="a7OzE" node="5kABJYbW7Hi" resolve="T2" />
                       </node>
                     </node>
                   </node>
-                  <node concept="3I6s7M" id="5kABJYbWajX" role="3I6sU7">
-                    <node concept="3A8Hvi" id="5kABJYbWajY" role="3I6s78">
-                      <node concept="a7P8L" id="5kABJYbWajZ" role="3A8wtg">
+                  <node concept="3I6s7M" id="5kABJYbW7GL" role="3I6sU7">
+                    <node concept="3A8Hvi" id="5kABJYbWajl" role="3I6s78">
+                      <node concept="a7P8L" id="5kABJYbWaju" role="3A8wtg">
                         <ref role="a7OzE" node="5kABJYbW7Hg" resolve="ResultT" />
                       </node>
-                      <node concept="a7P8L" id="5kABJYbWak0" role="3A8w4Q">
-                        <ref role="a7OzE" node="5kABJYbW7Hj" resolve="PromT" />
+                      <node concept="a7P8L" id="5kABJYbY8vd" role="3A8w4Q">
+                        <ref role="a7OzE" node="5kABJYbY8sX" resolve="BoolT" />
                       </node>
                     </node>
                   </node>
@@ -14669,27 +14669,27 @@
             <node concept="3xSepi" id="5kABJYbWanM" role="3xSepv">
               <node concept="3Aq9E8" id="5kABJYbWanN" role="3xSepj">
                 <node concept="3I6sU6" id="5kABJYbWanO" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="5kABJYbWanP" role="3I6sU7">
-                    <node concept="3Aqt3T" id="5kABJYbWanQ" role="3I6s78">
-                      <ref role="3AqCNq" node="2UZNLvp9$ae" resolve="binBoolPromote" />
-                      <node concept="a7P8L" id="5kABJYbY8xJ" role="3AunhB">
-                        <ref role="a7OzE" node="5kABJYbY8vY" resolve="BoolT" />
+                  <node concept="3I6s7M" id="5kABJYbWaoe" role="3I6sU7">
+                    <node concept="3Aqt3T" id="5kABJYbWaof" role="3I6s78">
+                      <ref role="3AqCNq" node="6GdDF7xafVj" resolve="binNumPromoteFine" />
+                      <node concept="a7P8L" id="5kABJYbWaog" role="3AunhB">
+                        <ref role="a7OzE" node="5kABJYbWao9" resolve="PromT" />
                       </node>
-                      <node concept="a7P8L" id="5kABJYbWanS" role="3AunhB">
+                      <node concept="a7P8L" id="5kABJYbWaoh" role="3AunhB">
                         <ref role="a7OzE" node="5kABJYbWao7" resolve="T1" />
                       </node>
-                      <node concept="a7P8L" id="5kABJYbWanT" role="3AunhB">
+                      <node concept="a7P8L" id="5kABJYbWaoi" role="3AunhB">
                         <ref role="a7OzE" node="5kABJYbWao8" resolve="T2" />
                       </node>
                     </node>
                   </node>
-                  <node concept="3I6s7M" id="5kABJYbWanU" role="3I6sU7">
-                    <node concept="3A8Hvi" id="5kABJYbWanV" role="3I6s78">
-                      <node concept="a7P8L" id="5kABJYbWanW" role="3A8wtg">
+                  <node concept="3I6s7M" id="5kABJYbWaoj" role="3I6sU7">
+                    <node concept="3A8Hvi" id="5kABJYbWaok" role="3I6s78">
+                      <node concept="a7P8L" id="5kABJYbWaol" role="3A8wtg">
                         <ref role="a7OzE" node="5kABJYbWao6" resolve="ResultT" />
                       </node>
-                      <node concept="a7P8L" id="5kABJYbY8ym" role="3A8w4Q">
-                        <ref role="a7OzE" node="5kABJYbY8vY" resolve="BoolT" />
+                      <node concept="a7P8L" id="5kABJYbWaom" role="3A8w4Q">
+                        <ref role="a7OzE" node="5kABJYbWao9" resolve="PromT" />
                       </node>
                     </node>
                   </node>
@@ -14740,27 +14740,27 @@
             <node concept="3xSepi" id="5kABJYbWaob" role="3xSepv">
               <node concept="3Aq9E8" id="5kABJYbWaoc" role="3xSepj">
                 <node concept="3I6sU6" id="5kABJYbWaod" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="5kABJYbWaoe" role="3I6sU7">
-                    <node concept="3Aqt3T" id="5kABJYbWaof" role="3I6s78">
-                      <ref role="3AqCNq" node="6GdDF7xafVj" resolve="binNumPromoteFine" />
-                      <node concept="a7P8L" id="5kABJYbWaog" role="3AunhB">
-                        <ref role="a7OzE" node="5kABJYbWao9" resolve="PromT" />
+                  <node concept="3I6s7M" id="5kABJYbWanP" role="3I6sU7">
+                    <node concept="3Aqt3T" id="5kABJYbWanQ" role="3I6s78">
+                      <ref role="3AqCNq" node="2UZNLvp9$ae" resolve="binBoolPromote" />
+                      <node concept="a7P8L" id="5kABJYbY8xJ" role="3AunhB">
+                        <ref role="a7OzE" node="5kABJYbY8vY" resolve="BoolT" />
                       </node>
-                      <node concept="a7P8L" id="5kABJYbWaoh" role="3AunhB">
+                      <node concept="a7P8L" id="5kABJYbWanS" role="3AunhB">
                         <ref role="a7OzE" node="5kABJYbWao7" resolve="T1" />
                       </node>
-                      <node concept="a7P8L" id="5kABJYbWaoi" role="3AunhB">
+                      <node concept="a7P8L" id="5kABJYbWanT" role="3AunhB">
                         <ref role="a7OzE" node="5kABJYbWao8" resolve="T2" />
                       </node>
                     </node>
                   </node>
-                  <node concept="3I6s7M" id="5kABJYbWaoj" role="3I6sU7">
-                    <node concept="3A8Hvi" id="5kABJYbWaok" role="3I6s78">
-                      <node concept="a7P8L" id="5kABJYbWaol" role="3A8wtg">
+                  <node concept="3I6s7M" id="5kABJYbWanU" role="3I6sU7">
+                    <node concept="3A8Hvi" id="5kABJYbWanV" role="3I6s78">
+                      <node concept="a7P8L" id="5kABJYbWanW" role="3A8wtg">
                         <ref role="a7OzE" node="5kABJYbWao6" resolve="ResultT" />
                       </node>
-                      <node concept="a7P8L" id="5kABJYbWaom" role="3A8w4Q">
-                        <ref role="a7OzE" node="5kABJYbWao9" resolve="PromT" />
+                      <node concept="a7P8L" id="5kABJYbY8ym" role="3A8w4Q">
+                        <ref role="a7OzE" node="5kABJYbY8vY" resolve="BoolT" />
                       </node>
                     </node>
                   </node>
@@ -21992,6 +21992,21 @@
         </node>
       </node>
     </node>
+    <node concept="3AqmO8" id="21RRLIuqRAW" role="8PkJo">
+      <property role="TrG5h" value="primEqual" />
+      <property role="3AqDzJ" value="2" />
+      <node concept="1zAUYm" id="21RRLIuqRAX" role="1zAUyy">
+        <property role="TrG5h" value="PrimSubtype" />
+      </node>
+      <node concept="1zAUYm" id="21RRLIuqRAY" role="1zAUyy">
+        <property role="TrG5h" value="PrimSupertype" />
+      </node>
+      <node concept="1zAsnw" id="21RRLIuqRAZ" role="lGtFl">
+        <node concept="3SKdUq" id="21RRLIuqRB0" role="27qylF">
+          <property role="3SKdUp" value="primitive type equality relation: prim types are equal if they're subtypes of one another" />
+        </node>
+      </node>
+    </node>
     <node concept="3AqmO8" id="7AyqXCdDQnv" role="8PkJo">
       <property role="TrG5h" value="primSubtypeBoxed" />
       <property role="3AqDzJ" value="2" />
@@ -22007,6 +22022,109 @@
         </node>
       </node>
     </node>
+    <node concept="1nLNMY" id="21RRLIuqRkz" role="1nK1Vg">
+      <property role="TrG5h" value="primitive_equality" />
+      <node concept="3clFbS" id="21RRLIuqRk$" role="1nLNMH">
+        <node concept="1nLNNL" id="21RRLIuqSb4" role="3cqZAp">
+          <node concept="1nLNMm" id="21RRLIuqSb5" role="1nLNNK">
+            <node concept="3Aq93q" id="21RRLIuqSb6" role="1nLNMb">
+              <node concept="3I6sU6" id="21RRLIuqSb7" role="3Ip0Jz">
+                <node concept="3I6s7M" id="21RRLIuqSb8" role="3I6sU7">
+                  <node concept="3Aqt3T" id="21RRLIuqSb9" role="3I6s78">
+                    <ref role="3AqCNq" node="21RRLIuqRAW" resolve="primEqual" />
+                    <node concept="a7P8L" id="21RRLIuqSba" role="3AunhB">
+                      <ref role="a7OzE" node="21RRLIuqSbd" resolve="T" />
+                    </node>
+                    <node concept="a7P8L" id="21RRLIuqSfg" role="3AunhB">
+                      <ref role="a7OzE" node="21RRLIuqSbd" resolve="T" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="21RRLIuqSbc" role="0Rg$4">
+              <node concept="aZer4" id="21RRLIuqSbd" role="3XD1gS">
+                <property role="TrG5h" value="T" />
+              </node>
+              <node concept="32pEOW" id="21RRLIuqSbf" role="3vLBG7" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="21RRLIuqSag" role="3cqZAp" />
+        <node concept="3SKdUt" id="21RRLIuqSjy" role="3cqZAp">
+          <node concept="1PaTwC" id="21RRLIuqSjz" role="3ndbpf">
+            <node concept="3oM_SD" id="21RRLIuqSs5" role="1PaTwD">
+              <property role="3oM_SC" value="inner" />
+            </node>
+            <node concept="3oM_SD" id="21RRLIuqSpT" role="1PaTwD">
+              <property role="3oM_SC" value="values" />
+            </node>
+            <node concept="3oM_SD" id="21RRLIuqSr9" role="1PaTwD">
+              <property role="3oM_SC" value="may" />
+            </node>
+            <node concept="3oM_SD" id="21RRLIuqSoy" role="1PaTwD">
+              <property role="3oM_SC" value="differ" />
+            </node>
+          </node>
+        </node>
+        <node concept="1nLNNL" id="21RRLIuqRRl" role="3cqZAp">
+          <node concept="1nLNMm" id="21RRLIuqRRm" role="1nLNNK">
+            <node concept="3Aq93q" id="21RRLIuqRX1" role="1nLNMb">
+              <node concept="3I6sU6" id="21RRLIuqRX2" role="3Ip0Jz">
+                <node concept="3I6s7M" id="21RRLIuqRXx" role="3I6sU7">
+                  <node concept="3Aqt3T" id="21RRLIuqRXw" role="3I6s78">
+                    <ref role="3AqCNq" node="21RRLIuqRAW" resolve="primEqual" />
+                    <node concept="a7P8L" id="21RRLIuqRYO" role="3AunhB">
+                      <ref role="a7OzE" node="21RRLIuqRRQ" resolve="L" />
+                    </node>
+                    <node concept="a7P8L" id="21RRLIuqRZn" role="3AunhB">
+                      <ref role="a7OzE" node="21RRLIuqRWe" resolve="R" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="21RRLIuqRRP" role="0Rg$4">
+              <node concept="aZer4" id="21RRLIuqRRQ" role="3XD1gS">
+                <property role="TrG5h" value="L" />
+              </node>
+              <node concept="aZer4" id="21RRLIuqRWe" role="3XD1gS">
+                <property role="TrG5h" value="R" />
+              </node>
+              <node concept="32pEOW" id="21RRLIuqRUT" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="21RRLIuqS0m" role="3xSepv">
+              <node concept="3Aq9E8" id="21RRLIuqS0n" role="3xSepj">
+                <node concept="3I6sU6" id="21RRLIuqS0o" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="21RRLIuqQZl" role="3I6sU7">
+                    <node concept="3Aqt3T" id="21RRLIuqQZj" role="3I6s78">
+                      <ref role="3AqCNq" node="ohf6zGDp2e" resolve="primSubtype" />
+                      <node concept="a7P8L" id="21RRLIuqR0G" role="3AunhB">
+                        <ref role="a7OzE" node="21RRLIuqRRQ" resolve="L" />
+                      </node>
+                      <node concept="a7P8L" id="21RRLIuqR2w" role="3AunhB">
+                        <ref role="a7OzE" node="21RRLIuqRWe" resolve="R" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="21RRLIuqR3Z" role="3I6sU7">
+                    <node concept="3Aqt3T" id="21RRLIuqR3X" role="3I6s78">
+                      <ref role="3AqCNq" node="ohf6zGDp2e" resolve="primSubtype" />
+                      <node concept="a7P8L" id="21RRLIuqR55" role="3AunhB">
+                        <ref role="a7OzE" node="21RRLIuqRWe" resolve="R" />
+                      </node>
+                      <node concept="a7P8L" id="21RRLIuqR5X" role="3AunhB">
+                        <ref role="a7OzE" node="21RRLIuqRRQ" resolve="L" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="12QmIo_7skD" role="1nK1Vg">
       <property role="TrG5h" value="primitive_subtype_reflexive" />
       <node concept="3clFbS" id="12QmIo_7skE" role="1nLNMH">
@@ -34061,11 +34179,21 @@
                     <node concept="a7P8L" id="6GdDF7xafWs" role="3AunhB">
                       <ref role="a7OzE" node="6GdDF7xafWw" resolve="Out" />
                     </node>
-                    <node concept="a7P8L" id="6GdDF7xafWt" role="3AunhB">
-                      <ref role="a7OzE" node="6GdDF7xafWx" resolve="InS" />
+                    <node concept="1HFMs5" id="21RRLIuqRhL" role="3AunhB">
+                      <node concept="a7P8L" id="6GdDF7xafWt" role="1uarlU">
+                        <ref role="a7OzE" node="6GdDF7xafWx" resolve="InS" />
+                      </node>
+                      <node concept="ns1u0" id="21RRLIuqRix" role="1uarlW">
+                        <ref role="ns1xF" node="JOGAOsVt2A" resolve="prim" />
+                      </node>
                     </node>
-                    <node concept="a7P8L" id="6GdDF7xafWu" role="3AunhB">
-                      <ref role="a7OzE" node="6GdDF7xafWy" resolve="InT" />
+                    <node concept="1HFMs5" id="21RRLIuqRiZ" role="3AunhB">
+                      <node concept="a7P8L" id="6GdDF7xafWu" role="1uarlU">
+                        <ref role="a7OzE" node="6GdDF7xafWy" resolve="InT" />
+                      </node>
+                      <node concept="ns1u0" id="21RRLIuqRk6" role="1uarlW">
+                        <ref role="ns1xF" node="JOGAOsVt2A" resolve="prim" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -34081,50 +34209,105 @@
               <node concept="aZer4" id="6GdDF7xafWy" role="3XD1gS">
                 <property role="TrG5h" value="InT" />
               </node>
-              <node concept="aZer4" id="6GdDF7xafWz" role="3XD1gS">
-                <property role="TrG5h" value="UnboxedS" />
-              </node>
-              <node concept="aZer4" id="6GdDF7xafW$" role="3XD1gS">
-                <property role="TrG5h" value="UnboxedT" />
-              </node>
               <node concept="32pEOW" id="6GdDF7xafW_" role="3vLBG7" />
             </node>
             <node concept="3xSepi" id="6GdDF7xafWA" role="3xSepv">
               <node concept="3Aq9E8" id="6GdDF7xafWB" role="3xSepj">
                 <node concept="3I6sU6" id="6GdDF7xafWC" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="6GdDF7xafWD" role="3I6sU7">
-                    <node concept="3Aqt3T" id="6GdDF7xafWE" role="3I6s78">
-                      <ref role="3AqCNq" node="35YJGAK4DH_" resolve="unbox" />
-                      <node concept="a7P8L" id="6GdDF7xafWF" role="3AunhB">
-                        <ref role="a7OzE" node="6GdDF7xafWz" resolve="UnboxedS" />
-                      </node>
-                      <node concept="a7P8L" id="6GdDF7xafWG" role="3AunhB">
-                        <ref role="a7OzE" node="6GdDF7xafWx" resolve="InS" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3I6s7M" id="6GdDF7xafWH" role="3I6sU7">
-                    <node concept="3Aqt3T" id="6GdDF7xafWI" role="3I6s78">
-                      <ref role="3AqCNq" node="35YJGAK4DH_" resolve="unbox" />
-                      <node concept="a7P8L" id="6GdDF7xafWJ" role="3AunhB">
-                        <ref role="a7OzE" node="6GdDF7xafW$" resolve="UnboxedT" />
-                      </node>
-                      <node concept="a7P8L" id="6GdDF7xafWK" role="3AunhB">
-                        <ref role="a7OzE" node="6GdDF7xafWy" resolve="InT" />
-                      </node>
-                    </node>
-                  </node>
                   <node concept="3I6s7M" id="6GdDF7xafWL" role="3I6sU7">
                     <node concept="3Aqt3T" id="6GdDF7xafWM" role="3I6s78">
                       <ref role="3AqCNq" node="6GdDF7xagZ$" resolve="binNumPromoteFinePrim" />
                       <node concept="a7P8L" id="6GdDF7xafWN" role="3AunhB">
                         <ref role="a7OzE" node="6GdDF7xafWw" resolve="Out" />
                       </node>
-                      <node concept="a7P8L" id="6GdDF7xafWO" role="3AunhB">
-                        <ref role="a7OzE" node="6GdDF7xafWz" resolve="UnboxedS" />
+                      <node concept="a7P8L" id="21RRLIuuUjj" role="3AunhB">
+                        <ref role="a7OzE" node="6GdDF7xafWx" resolve="InS" />
                       </node>
-                      <node concept="a7P8L" id="6GdDF7xafWP" role="3AunhB">
-                        <ref role="a7OzE" node="6GdDF7xafW$" resolve="UnboxedT" />
+                      <node concept="a7P8L" id="21RRLIuuUkc" role="3AunhB">
+                        <ref role="a7OzE" node="6GdDF7xafWy" resolve="InT" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="21RRLIuqRb0" role="3cqZAp" />
+        <node concept="1nLNNL" id="21RRLIuqR6w" role="3cqZAp">
+          <node concept="1nLNMm" id="21RRLIuqR6x" role="1nLNNK">
+            <node concept="3Aq93q" id="21RRLIuqR6y" role="1nLNMb">
+              <node concept="3I6sU6" id="21RRLIuqR6z" role="3Ip0Jz">
+                <node concept="3I6s7M" id="21RRLIuqR6$" role="3I6sU7">
+                  <node concept="3Aqt3T" id="21RRLIuqR6_" role="3I6s78">
+                    <ref role="3AqCNq" node="6GdDF7xafVj" resolve="binNumPromoteFine" />
+                    <node concept="a7P8L" id="21RRLIuqR6A" role="3AunhB">
+                      <ref role="a7OzE" node="21RRLIuqR6E" resolve="Out" />
+                    </node>
+                    <node concept="a7P8L" id="21RRLIuqR6B" role="3AunhB">
+                      <ref role="a7OzE" node="21RRLIuqR6F" resolve="InS" />
+                    </node>
+                    <node concept="a7P8L" id="21RRLIuqR6C" role="3AunhB">
+                      <ref role="a7OzE" node="21RRLIuqR6G" resolve="InT" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="21RRLIuqR6D" role="0Rg$4">
+              <node concept="aZer4" id="21RRLIuqR6E" role="3XD1gS">
+                <property role="TrG5h" value="Out" />
+              </node>
+              <node concept="aZer4" id="21RRLIuqR6F" role="3XD1gS">
+                <property role="TrG5h" value="InS" />
+              </node>
+              <node concept="aZer4" id="21RRLIuqR6G" role="3XD1gS">
+                <property role="TrG5h" value="InT" />
+              </node>
+              <node concept="aZer4" id="21RRLIuqR6H" role="3XD1gS">
+                <property role="TrG5h" value="UnboxedS" />
+              </node>
+              <node concept="aZer4" id="21RRLIuqR6I" role="3XD1gS">
+                <property role="TrG5h" value="UnboxedT" />
+              </node>
+              <node concept="32pEOW" id="21RRLIuqR6J" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="21RRLIuqR6K" role="3xSepv">
+              <node concept="3Aq9E8" id="21RRLIuqR6L" role="3xSepj">
+                <node concept="3I6sU6" id="21RRLIuqR6M" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="21RRLIuqR6N" role="3I6sU7">
+                    <node concept="3Aqt3T" id="21RRLIuqR6O" role="3I6s78">
+                      <ref role="3AqCNq" node="35YJGAK4DH_" resolve="unbox" />
+                      <node concept="a7P8L" id="21RRLIuqR6P" role="3AunhB">
+                        <ref role="a7OzE" node="21RRLIuqR6H" resolve="UnboxedS" />
+                      </node>
+                      <node concept="a7P8L" id="21RRLIuqR6Q" role="3AunhB">
+                        <ref role="a7OzE" node="21RRLIuqR6F" resolve="InS" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="21RRLIuqR6R" role="3I6sU7">
+                    <node concept="3Aqt3T" id="21RRLIuqR6S" role="3I6s78">
+                      <ref role="3AqCNq" node="35YJGAK4DH_" resolve="unbox" />
+                      <node concept="a7P8L" id="21RRLIuqR6T" role="3AunhB">
+                        <ref role="a7OzE" node="21RRLIuqR6I" resolve="UnboxedT" />
+                      </node>
+                      <node concept="a7P8L" id="21RRLIuqR6U" role="3AunhB">
+                        <ref role="a7OzE" node="21RRLIuqR6G" resolve="InT" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="21RRLIuqR6V" role="3I6sU7">
+                    <node concept="3Aqt3T" id="21RRLIuqR6W" role="3I6s78">
+                      <ref role="3AqCNq" node="6GdDF7xagZ$" resolve="binNumPromoteFinePrim" />
+                      <node concept="a7P8L" id="21RRLIuqR6X" role="3AunhB">
+                        <ref role="a7OzE" node="21RRLIuqR6E" resolve="Out" />
+                      </node>
+                      <node concept="a7P8L" id="21RRLIuqR6Y" role="3AunhB">
+                        <ref role="a7OzE" node="21RRLIuqR6H" resolve="UnboxedS" />
+                      </node>
+                      <node concept="a7P8L" id="21RRLIuqR6Z" role="3AunhB">
+                        <ref role="a7OzE" node="21RRLIuqR6I" resolve="UnboxedT" />
                       </node>
                     </node>
                   </node>
@@ -34139,12 +34322,13 @@
             <node concept="3xSepi" id="7MFi2qBl6th" role="3xSepv">
               <node concept="3Aq9E8" id="7MFi2qBl6ti" role="3xSepj">
                 <node concept="3I6sU6" id="7MFi2qBl6tj" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="7MFi2qBl6tk" role="3I6sU7">
-                    <node concept="3A8Hvi" id="7MFi2qBl6tl" role="3I6s78">
-                      <node concept="a7P8L" id="7MFi2qBl6tm" role="3A8wtg">
+                  <node concept="3I6s7M" id="21RRLIuqS55" role="3I6sU7">
+                    <node concept="3Aqt3T" id="21RRLIuqS53" role="3I6s78">
+                      <ref role="3AqCNq" node="21RRLIuqRAW" resolve="primEqual" />
+                      <node concept="a7P8L" id="21RRLIuqS6s" role="3AunhB">
                         <ref role="a7OzE" node="7MFi2qBl6tD" resolve="InS" />
                       </node>
-                      <node concept="a7P8L" id="7MFi2qBl6tn" role="3A8w4Q">
+                      <node concept="a7P8L" id="21RRLIuqS6Z" role="3AunhB">
                         <ref role="a7OzE" node="7MFi2qBl6tE" resolve="InT" />
                       </node>
                     </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps
index a5cc509c..e714a9a7 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps
@@ -185,6 +185,9 @@
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <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="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
@@ -13713,6 +13716,63 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="21RRLIumYpz" role="3cqZAp" />
+        <node concept="3cpWs8" id="21RRLIun17U" role="3cqZAp">
+          <node concept="3cpWsn" id="21RRLIun17X" role="3cpWs9">
+            <property role="TrG5h" value="i3" />
+            <node concept="10Oyi0" id="21RRLIun17S" role="1tU5fm" />
+            <node concept="3K4zz7" id="21RRLIun20h" role="33vP2m">
+              <node concept="3cmrfG" id="21RRLIun2bt" role="3K4E3e">
+                <property role="3cmrfH" value="0" />
+              </node>
+              <node concept="3cmrfG" id="21RRLIun2ci" role="3K4GZi">
+                <property role="3cmrfH" value="1" />
+              </node>
+              <node concept="37vLTw" id="21RRLIunavV" role="3K4Cdx">
+                <ref role="3cqZAo" node="2UZNLvp9sEc" resolve="bool" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="21RRLIuqHSt" role="3cqZAp">
+          <node concept="3cpWsn" id="21RRLIuqHSw" role="3cpWs9">
+            <property role="TrG5h" value="c3" />
+            <node concept="10Pfzv" id="21RRLIuqHSs" role="1tU5fm" />
+            <node concept="3K4zz7" id="3489cc5$ppj" role="33vP2m">
+              <node concept="1eOMI4" id="3489cc5$ppg" role="3K4Cdx">
+                <node concept="3clFbC" id="3489cc5$ppd" role="1eOMHV">
+                  <node concept="37vLTw" id="21RRLIuqI1d" role="3uHU7B">
+                    <ref role="3cqZAo" node="6GdDF7xa5wz" resolve="cc" />
+                  </node>
+                  <node concept="1Xhbcc" id="3489cc5$ppf" role="3uHU7w">
+                    <property role="1XhdNS" value="n" />
+                  </node>
+                </node>
+              </node>
+              <node concept="1Xhbcc" id="3489cc5$pph" role="3K4E3e">
+                <property role="1XhdNS" value="y" />
+              </node>
+              <node concept="1Xhbcc" id="3489cc5$ppi" role="3K4GZi">
+                <property role="1XhdNS" value="r" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="21RRLIusQvn" role="3cqZAp">
+          <node concept="3cpWsn" id="21RRLIusQvq" role="3cpWs9">
+            <property role="TrG5h" value="bb3" />
+            <node concept="10P_77" id="21RRLIusQvm" role="1tU5fm" />
+            <node concept="3K4zz7" id="21RRLIusQRC" role="33vP2m">
+              <node concept="3clFbT" id="21RRLIusQZ4" role="3K4E3e">
+                <property role="3clFbU" value="true" />
+              </node>
+              <node concept="3clFbT" id="21RRLIusR0k" role="3K4GZi" />
+              <node concept="37vLTw" id="21RRLIusQlp" role="3K4Cdx">
+                <ref role="3cqZAo" node="2UZNLvp9sEc" resolve="bool" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="6GdDF7xavWY" role="3cqZAp" />
         <node concept="3clFbF" id="7MFi2qBiMdP" role="3cqZAp">
           <node concept="37vLTI" id="7MFi2qBiMdQ" role="3clFbG">